Revert to named script from sillsdev/aws-kubectl

sillsdev · Oct 23, 2024 · 1447459 · 1447459
1 parent eb272b6
commit 1447459
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml b/deploy/helm/aws-login/templates/aws-ecr-login-cronjob.yaml
@@ -22,20 +22,7 @@ spec:
             imagePullPolicy: IfNotPresent
             name: {{ .Values.awsEcr.cronJobName }}
             command:
-            - /bin/sh
-            - -c
-            - |-
-              TOKEN=`aws ecr get-login --region ${AWS_DEFAULT_REGION} --registry-ids ${AWS_ACCOUNT} | cut -d' ' -f6`
-              echo "ENV variables setup done."
-              kubectl -n ${NAMESPACES} delete secret --ignore-not-found ${PULL_SECRET_NAME}
-              kubectl -n ${NAMESPACES} create secret docker-registry ${PULL_SECRET_NAME} \
-              --docker-server=https://${AWS_ACCOUNT}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com \
-              --docker-username=AWS \
-              --docker-password="${TOKEN}" \
-              --docker-email="${DOCKER_EMAIL}"
-              echo "Secret created by name: $PULL_SECRET_NAME"
-              kubectl -n ${NAMESPACES} patch serviceaccount default -p '{"imagePullSecrets":[{"name":"'$PULL_SECRET_NAME'"}]}'   # custom script | update the default service account
-              echo "All done."
+              - ecr-get-login.sh
             env:
             - name: AWS_DEFAULT_REGION
               valueFrom:

diff --git a/deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml b/deploy/helm/aws-login/templates/aws-ecr-login-oneshot.yaml
@@ -22,20 +22,7 @@ spec:
         imagePullPolicy: IfNotPresent
         name: "{{ .Values.awsEcr.jobName }}"
         command:
-        - /bin/sh
-        - -c
-        - |-
-          TOKEN=`aws ecr get-login --region ${AWS_DEFAULT_REGION} --registry-ids ${AWS_ACCOUNT} | cut -d' ' -f6`
-          echo "ENV variables setup done."
-          kubectl -n ${NAMESPACES} delete secret --ignore-not-found ${PULL_SECRET_NAME}
-          kubectl -n ${NAMESPACES} create secret docker-registry ${PULL_SECRET_NAME} \
-          --docker-server=https://${AWS_ACCOUNT}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com \
-          --docker-username=AWS \
-          --docker-password="${TOKEN}" \
-          --docker-email="${DOCKER_EMAIL}"
-          echo "Secret created by name: $PULL_SECRET_NAME"
-          kubectl -n ${NAMESPACES} patch serviceaccount default -p '{"imagePullSecrets":[{"name":"'$PULL_SECRET_NAME'"}]}'   # custom script | update the default service account
-          echo "All done."
+          - ecr-get-login.sh
         env:
         - name: AWS_DEFAULT_REGION
           valueFrom: