BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit a1f878b8 by Mayra Cabrera
Options

Resolve conflict for secret management on Auto-DevOps

parent 49dfcd0c
Showing with 0 additions and 3 deletions
vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
......@@ -462,11 +462,8 @@ production:
}
function create_secret() {
<<<<<<< HEAD
=======
echo "Create secret..."
>>>>>>> ea14c1e6963... Merge branch 'vendor-10-4-auto-devops-template' into 'master'
kubectl create secret -n "$KUBE_NAMESPACE" \
docker-registry gitlab-registry \
--docker-server="$CI_REGISTRY" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment