diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b554cac92a16c8e3a8d224d40af7846f29bab198..2a71200296489e6463675940d0e6f8a50ebd18d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ deploy_rec: - CRT=$(awk 'NF {sub(/\r/, ""); printf "%s\\\\r\\\\n",$0;}' $APPS_CERT_CRT); - KEY=$(awk 'NF {sub(/\r/, ""); printf "%s\\\\r\\\\n",$0;}' $APPS_TLS_PRIVATE_KEY); - sed -i -e "s|#CA#|$CA|" -e "s|#CRT#|$CRT|" -e "s|#KEY#|$KEY|" ./k8s/route.yml - - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=forge-secret --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - + - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=read_registry --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - - oc apply -f k8s/deployment.yml - oc apply -f k8s/service.yml - oc apply -f k8s/route.yml @@ -69,7 +69,7 @@ deploy_prod: - CRT=$(awk 'NF {sub(/\r/, ""); printf "%s\\\\r\\\\n",$0;}' $APPS_CERT_CRT); - KEY=$(awk 'NF {sub(/\r/, ""); printf "%s\\\\r\\\\n",$0;}' $APPS_TLS_PRIVATE_KEY); - sed -i -e "s|#CA#|$CA|" -e "s|#CRT#|$CRT|" -e "s|#KEY#|$KEY|" ./k8s/route.yml - - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=forge-secret --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - + - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=read_registry --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - - oc apply -f k8s/deployment.yml - oc apply -f k8s/service.yml - oc apply -f k8s/route.yml diff --git a/docs/openshift/cicd.md b/docs/openshift/cicd.md index dd33462933b6ee9b1b65ad50981e03913d88e405..761038ec0aeb479a2c2bbdfc76e282975d1fe8fa 100644 --- a/docs/openshift/cicd.md +++ b/docs/openshift/cicd.md @@ -74,7 +74,7 @@ deploy_master: - NAMESPACE=ns-cpd-p01-syn - export KUBECONFIG=$KUBE_CONFIG_CPD_PROD script: - - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=forge-secret --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - + - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=read_registry --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - - oc apply -f k8s/deployment.yml - oc apply -f k8s/service.yml - oc apply -f k8s/route.yml @@ -151,7 +151,7 @@ deploy_rec: - sed -i "s/{{IMAGE_TAG}}/dev/" ./k8s/deployment.yml - sed -i "s/{{HOSTNAME}}/mespapiers-rec.apps.grandlyon.com/g" ./k8s/route.yml - - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=forge-secret --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - + - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=read_registry --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - - oc apply -f k8s/deployment.yml - oc apply -f k8s/service.yml @@ -173,7 +173,7 @@ deploy_prod: - sed -i "s/{{IMAGE_TAG}}/main/" ./k8s/deployment.yml - sed -i "s/{{HOSTNAME}}/mespapiers.apps.grandlyon.com/g" ./k8s/route.yml - - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=forge-secret --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - + - oc create secret -n $NAMESPACE docker-registry forge-secret --docker-server=$CI_REGISTRY --docker-username=read_registry --docker-password=$READ_REGISTRY_TOKEN --dry-run=client -o yaml | oc apply -f - - oc apply -f k8s/deployment.yml - oc apply -f k8s/service.yml