Skip to content

Commit

Permalink
Remove extra lines
Browse files Browse the repository at this point in the history
  • Loading branch information
dhoucgitter committed May 9, 2024
1 parent d2a893b commit 0390ea1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
3 changes: 0 additions & 3 deletions viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit 0390ea1

Please sign in to comment.