diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 258ea3124f8cffde8471803535840b6f3d4b2f60..63a57bb695133e35fd9aba72934c6a1592b9b620 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -152,7 +152,7 @@ deploy_rec: script: - find k8s/ -name '*.yml' -exec sed -i "s/{{NS}}/$NAMESPACE/g" {} \; - - oc create secret -n $NAMESPACE docker-registry llle-project --docker-server=$CI_REGISTRY --docker-username=llle-project --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/secrets - oc apply -f k8s/deployments @@ -184,7 +184,7 @@ deploy_prod: script: - find k8s/ -name '*.yml' -exec sed -i "s/{{NS}}/$NAMESPACE/g" {} \; - - oc create secret -n $NAMESPACE docker-registry llle-project --docker-server=$CI_REGISTRY --docker-username=llle-project --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/secrets - oc apply -f k8s/deployments diff --git a/k8s/README.md b/k8s/README.md index abd3f1822ce46cb8e4d98b7cb35409cfa2d3deec..948896b4754f4b7dc0bed0471daeff47d3415e5a 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -31,10 +31,10 @@ Configuration: - Depuis la console Web, se rendre dans la section "Workloads > Secrets" - Cliquer sur le bouton bleu "Create" puis "Image pull secret" - Donner les informations : - - Secret name : llle-project + - Secret name : forge-secret - Authentification type : Image registry credentials - Registry server address : registry.forge.grandlyon.com - - Username: llle-project + - Username: read_registry - Password: demander le password - Cliquer sur Create diff --git a/k8s/deployments/ecolyo-agent-server-deployment.yml b/k8s/deployments/ecolyo-agent-server-deployment.yml index 2b733b8b3e045a2a7c9adeccbfb8bfebcd50db3d..c37c1cb5c748def2985cd26dafa9c11c181c0ff0 100644 --- a/k8s/deployments/ecolyo-agent-server-deployment.yml +++ b/k8s/deployments/ecolyo-agent-server-deployment.yml @@ -54,4 +54,4 @@ spec: cpu: 100m memory: 64Mi imagePullSecrets: - - name: llle-project + - name: forge-secret