diff --git a/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh b/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh index 6ca14381..2cf12421 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh @@ -2,7 +2,6 @@ source 00_vars.sh - ## get chart version from viya4-deployment repo echo "**** cert-manager ****" CHART_VERSION=$(curl -s https://raw.githubusercontent.com/sassoftware/viya4-deployment/$DEPLOYMENT_VERSION/roles/baseline/defaults/main.yml | yq '.CERT_MANAGER_CHART_VERSION') @@ -17,14 +16,12 @@ IMG_STARTUP=$(helm show values jetstack/cert-manager --version=$CHART_VERSION | echo "controller repo: $IMG_CONTROLLER" && echo "webhook repo: $IMG_WEBHOOK" && echo "cainject repo: $IMG_CAINJECTOR" && echo "startupapicheck repo: $IMG_STARTUP" echo "*********************" - ## pull the images $DOCKER_SUDO docker pull $IMG_CONTROLLER:v$CHART_VERSION $DOCKER_SUDO docker pull $IMG_WEBHOOK:v$CHART_VERSION $DOCKER_SUDO docker pull $IMG_CAINJECTOR:v$CHART_VERSION $DOCKER_SUDO docker pull $IMG_STARTUP:v$CHART_VERSION - # create ECR repos aws ecr create-repository --no-cli-pager --repository-name cert-manager # this repo is used to store the helm chart aws ecr create-repository --no-cli-pager --repository-name $IMG_CONTROLLER diff --git a/viya4-deployment-darksite/baseline-to-ecr/nfs_subdir_external_provisioner.sh b/viya4-deployment-darksite/baseline-to-ecr/nfs_subdir_external_provisioner.sh index 35f17e10..7c837ca9 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/nfs_subdir_external_provisioner.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/nfs_subdir_external_provisioner.sh @@ -15,7 +15,6 @@ echo "*****************************************" ## pull the image $DOCKER_SUDO docker pull $REPOSITORY:$TAG - # create ECR repo aws ecr create-repository --no-cli-pager --repository-name nfs-subdir-external-provisioner @@ -28,11 +27,9 @@ aws ecr get-login-password \ helm push nfs-subdir-external-provisioner-$CHART_VERSION.tgz oci://$AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/ rm nfs-subdir-external-provisioner-$CHART_VERSION.tgz - # ## update local image tag appropriately $DOCKER_SUDO docker tag $REPOSITORY:$TAG $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/nfs-subdir-external-provisioner:$TAG - # # ## auth local $DOCKER_SUDO docker to ecr aws ecr get-login-password --region $AWS_REGION | $DOCKER_SUDO docker login --username AWS --password-stdin $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com