From d2a893b2e35b8ab473e9e6319a2780f29df279c8 Mon Sep 17 00:00:00 2001 From: "David.Houck" Date: Thu, 9 May 2024 10:42:44 -0400 Subject: [PATCH] Fix line ending issues --- viya4-deployment-darksite/baseline-to-ecr/00_vars.sh | 2 +- viya4-deployment-darksite/baseline-to-ecr/01_run_all.sh | 2 +- viya4-deployment-darksite/baseline-to-ecr/auto_scaler.sh | 6 +++--- viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh | 2 +- viya4-deployment-darksite/baseline-to-ecr/ingress_nginx.sh | 2 +- viya4-deployment-darksite/baseline-to-ecr/metrics_server.sh | 2 +- .../baseline-to-ecr/nfs_subdir_external_provisioner.sh | 2 +- viya4-deployment-darksite/baseline-to-ecr/openldap.sh | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/viya4-deployment-darksite/baseline-to-ecr/00_vars.sh b/viya4-deployment-darksite/baseline-to-ecr/00_vars.sh index 6e4fe534..330e48e0 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/00_vars.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/00_vars.sh @@ -7,4 +7,4 @@ AWS_REGION= K8S_minor_version=25 # K8s v1.22.X minor would be 22 ... K8s v1.21.X minor version would be 21. This must match your deployment! DEPLOYMENT_VERSION=main # main will pull latest release of viya4-deployment. But this can be set to a specific version if needed, example: 5.2.0 -DOCKER_SUDO= # put sudo here, if you require sudo docker commands... else leave blank \ No newline at end of file +DOCKER_SUDO= # put sudo here, if you require sudo docker commands... else leave blank diff --git a/viya4-deployment-darksite/baseline-to-ecr/01_run_all.sh b/viya4-deployment-darksite/baseline-to-ecr/01_run_all.sh index 62a9c736..e3213af9 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/01_run_all.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/01_run_all.sh @@ -8,4 +8,4 @@ source 00_vars.sh . metrics_server.sh . nfs_subdir_external_provisioner.sh . openldap.sh -. ebs_driver.sh \ No newline at end of file +. ebs_driver.sh diff --git a/viya4-deployment-darksite/baseline-to-ecr/auto_scaler.sh b/viya4-deployment-darksite/baseline-to-ecr/auto_scaler.sh index 272df9c7..719531fd 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/auto_scaler.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/auto_scaler.sh @@ -4,9 +4,9 @@ source 00_vars.sh # account for v6.3.0+ changes - autoscaler now supports k8s 1.25 DV=$(echo $DEPLOYMENT_VERSION | sed 's/\.//g') -if [ $DEPLOYMENT_VERSION == "main" ] && [ $K8S_minor_version -ge 25 ]; then +if [ $DEPLOYMENT_VERSION == "main" ] && [ $K8S_minor_version -ge 25 ]; then CHART_VERSION=$(curl -s https://raw.githubusercontent.com/sassoftware/viya4-deployment/$DEPLOYMENT_VERSION/roles/baseline/defaults/main.yml | yq '.autoscalerVersions.PDBv1Support.api.chartVersion') -elif [ $DEPLOYMENT_VERSION == "main" ] && [ $K8S_minor_version -le 24 ]; then +elif [ $DEPLOYMENT_VERSION == "main" ] && [ $K8S_minor_version -le 24 ]; then CHART_VERSION=$(curl -s https://raw.githubusercontent.com/sassoftware/viya4-deployment/$DEPLOYMENT_VERSION/roles/baseline/defaults/main.yml | yq '.autoscalerVersions.PDBv1beta1Support.api.chartVersion') elif [ $DV -ge 630 ] && [ $K8S_minor_version -ge 25 ]; then CHART_VERSION=$(curl -s https://raw.githubusercontent.com/sassoftware/viya4-deployment/$DEPLOYMENT_VERSION/roles/baseline/defaults/main.yml | yq '.autoscalerVersions.PDBv1Support.api.chartVersion') @@ -51,4 +51,4 @@ $DOCKER_SUDO docker tag $IMG_REPO:$TAG $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaw 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 # # ## puch local image to ecr -$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/cluster-autoscaler:$TAG \ No newline at end of file +$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/cluster-autoscaler:$TAG diff --git a/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh b/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh index 57f34626..6ca14381 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/cert_manager.sh @@ -54,4 +54,4 @@ aws ecr get-login-password --region $AWS_REGION | $DOCKER_SUDO docker login --u $DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMG_CONTROLLER:v$CHART_VERSION $DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMG_WEBHOOK:v$CHART_VERSION $DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMG_CAINJECTOR:v$CHART_VERSION -$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMG_STARTUP:v$CHART_VERSION \ No newline at end of file +$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMG_STARTUP:v$CHART_VERSION diff --git a/viya4-deployment-darksite/baseline-to-ecr/ingress_nginx.sh b/viya4-deployment-darksite/baseline-to-ecr/ingress_nginx.sh index 4e578c17..08d2a5b6 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/ingress_nginx.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/ingress_nginx.sh @@ -59,4 +59,4 @@ aws ecr get-login-password --region $AWS_REGION | $DOCKER_SUDO docker login --u # # ## puch local image to ecr $DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$CONTROLLER_IMAGE:$CONTROLLER_TAG -$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$WEBHOOKS_IMAGE:$WEBHOOKS_TAG \ No newline at end of file +$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$WEBHOOKS_IMAGE:$WEBHOOKS_TAG diff --git a/viya4-deployment-darksite/baseline-to-ecr/metrics_server.sh b/viya4-deployment-darksite/baseline-to-ecr/metrics_server.sh index abeb0262..c1e12ffb 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/metrics_server.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/metrics_server.sh @@ -38,4 +38,4 @@ $DOCKER_SUDO docker tag $REGISTRY/$IMAGE:$TAG $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.a 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 # # ## puch local image to ecr -$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/metrics-server:$TAG \ No newline at end of file +$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/metrics-server:$TAG 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 7d3408f8..35f17e10 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 @@ -37,4 +37,4 @@ $DOCKER_SUDO docker tag $REPOSITORY:$TAG $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazon 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 # # ## puch local image to ecr -$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/nfs-subdir-external-provisioner:$TAG \ No newline at end of file +$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/nfs-subdir-external-provisioner:$TAG diff --git a/viya4-deployment-darksite/baseline-to-ecr/openldap.sh b/viya4-deployment-darksite/baseline-to-ecr/openldap.sh index 88a86c2a..bf96f5cb 100644 --- a/viya4-deployment-darksite/baseline-to-ecr/openldap.sh +++ b/viya4-deployment-darksite/baseline-to-ecr/openldap.sh @@ -23,4 +23,4 @@ $DOCKER_SUDO docker tag $IMAGE $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$I aws ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com # # ## puch local image to ecr -$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMAGE \ No newline at end of file +$DOCKER_SUDO docker push $AWS_ACCT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$IMAGE