From da9cefb14805b2b56b3b710d54521e7fc182a2b8 Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Tue, 11 Jun 2024 09:46:40 -0400 Subject: [PATCH 1/5] changelog: CI, Internal, Cutover review-apps to new cluster --- .gitlab-ci.yml | 58 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f2b52fae84..0cf3f6749a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -450,7 +450,7 @@ trigger_devops: name: dtzar/helm-kubectl:latest script: - kubectl config get-contexts - - export CONTEXT=$(kubectl config get-contexts | grep review-apps | awk '{print $1}' | head -1) + - export CONTEXT=$(kubectl config get-contexts | grep reviewapp | awk '{print $1}' | head -1) - kubectl config use-context "$CONTEXT" - |- export IDP_CONFIG=$(cat < Date: Tue, 11 Jun 2024 11:19:13 -0400 Subject: [PATCH 2/5] Updating branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cf3f6749a7..fef39ba97cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -550,7 +550,7 @@ trigger_devops: } EOF ) - - git clone -b main --single-branch https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.login.gov/lg-public/identity-idp-helm-chart.git + - git clone -b sshelton/update-certs --single-branch https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.login.gov/lg-public/identity-idp-helm-chart.git - >- helm upgrade --install --namespace review-apps --debug From c4c8273c53c9dd4d407447a42edd3589f0bd2c70 Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Tue, 11 Jun 2024 12:43:39 -0400 Subject: [PATCH 3/5] Trying out a new domain name --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fef39ba97cb..5e5ad32f61b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -478,8 +478,8 @@ trigger_devops: "loginEnv": "$CI_ENVIRONMENT_SLUG", "loginHostRole": "idp", "loginSkipRemoteConfig": "true", - "pivcacServiceUrl": "https://$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov/", - "pivcacVerifyTokenUrl": "https://$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov/", + "pivcacServiceUrl": "https://$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov/", + "pivcacVerifyTokenUrl": "https://$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov/", "dashboardUrl": "https://$CI_ENVIRONMENT_SLUG-dashboard.reviewapp.identitysandbox.gov" } EOF @@ -510,8 +510,8 @@ trigger_devops: "loginEnv": "$CI_ENVIRONMENT_SLUG", "loginHostRole": "worker", "loginSkipRemoteConfig": "true", - "pivcacServiceUrl": "https://$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov/", - "pivcacVerifyTokenUrl": "https://$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov/" + "pivcacServiceUrl": "https://$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov/", + "pivcacVerifyTokenUrl": "https://$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov/" } EOF ) @@ -526,7 +526,7 @@ trigger_devops: "host": "$CI_ENVIRONMENT_SLUG-login-chart-pivcac-pg.review-apps" }, "idpHost": "$CI_ENVIRONMENT_SLUG.reviewapp.identitysandbox.gov", - "domainName": "$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov" + "domainName": "$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov" } EOF ) @@ -571,7 +571,7 @@ trigger_devops: --set-json worker.config="$WORKER_CONFIG" --set-json pivcac.config="$PIVCAC_CONFIG" --set-json idp.ingress.hosts="[{\"host\": \"$CI_ENVIRONMENT_SLUG.reviewapp.identitysandbox.gov\", \"paths\": [{\"path\": \"/\", \"pathType\": \"Prefix\"}]}]" - --set-json pivcac.ingress.hosts="[{\"host\": \"$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov\", \"paths\": [{\"path\": \"/\", \"pathType\": \"Prefix\"}]}]" + --set-json pivcac.ingress.hosts="[{\"host\": \"$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov\", \"paths\": [{\"path\": \"/\", \"pathType\": \"Prefix\"}]}]" --set-json dashboard.ingress.hosts="[{\"host\": \"$CI_ENVIRONMENT_SLUG-dashboard.reviewapp.identitysandbox.gov\", \"paths\": [{\"path\": \"/\", \"pathType\": \"Prefix\"}]}]" $CI_ENVIRONMENT_SLUG ./identity-idp-helm-chart - echo "DNS may take a while to propagate, so be patient if it doesn't show up right away" @@ -580,7 +580,7 @@ trigger_devops: - echo "Address of IDP review app:" - echo https://$CI_ENVIRONMENT_SLUG.reviewapp.identitysandbox.gov - echo "Address of PIVCAC review app:" - - echo https://$CI_ENVIRONMENT_SLUG.reviewapp.pivcac.identitysandbox.gov + - echo https://$CI_ENVIRONMENT_SLUG.pivcac.reviewapp.identitysandbox.gov - echo "Address of Dashboard review app:" - echo https://$CI_ENVIRONMENT_SLUG-dashboard.reviewapp.identitysandbox.gov From e458704eae674d06dff5ef7a7650cb41e6365905 Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Tue, 11 Jun 2024 13:36:49 -0400 Subject: [PATCH 4/5] changelog: Internal, CI, Swapping reviewapp clusters --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e5ad32f61b..dedec11c954 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -519,7 +519,7 @@ trigger_devops: export PIVCAC_CONFIG=$(cat <- helm upgrade --install --namespace review-apps --debug - --set env="reviewapps-$CI_ENVIRONMENT_SLUG" + --set env="reviewapp-$CI_ENVIRONMENT_SLUG" --set idp.image.repository="${ECR_REGISTRY}/identity-idp/review" --set idp.image.tag="${CI_COMMIT_SHA}" --set worker.image.repository="${ECR_REGISTRY}/identity-idp/review" @@ -575,7 +575,7 @@ trigger_devops: --set-json dashboard.ingress.hosts="[{\"host\": \"$CI_ENVIRONMENT_SLUG-dashboard.reviewapp.identitysandbox.gov\", \"paths\": [{\"path\": \"/\", \"pathType\": \"Prefix\"}]}]" $CI_ENVIRONMENT_SLUG ./identity-idp-helm-chart - echo "DNS may take a while to propagate, so be patient if it doesn't show up right away" - - echo "To access the rails console, first run 'aws-vault exec sandbox-power -- aws eks update-kubeconfig --name reviewapps'" + - echo "To access the rails console, first run 'aws-vault exec sandbox-power -- aws eks update-kubeconfig --name reviewapp'" - echo "Then run aws-vault exec sandbox-power -- kubectl exec -it service/$CI_ENVIRONMENT_SLUG-login-chart-idp -n review-apps -- /app/bin/rails console" - echo "Address of IDP review app:" - echo https://$CI_ENVIRONMENT_SLUG.reviewapp.identitysandbox.gov From cccea4e88ebd573918ee40eb79af56ab701ab60d Mon Sep 17 00:00:00 2001 From: Stephen Shelton Date: Fri, 14 Jun 2024 15:55:42 -0400 Subject: [PATCH 5/5] changelog: Internal, CI, Cutting over cluster --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dedec11c954..1d66592ec06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -550,7 +550,7 @@ trigger_devops: } EOF ) - - git clone -b sshelton/update-certs --single-branch https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.login.gov/lg-public/identity-idp-helm-chart.git + - git clone -b main --single-branch https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.login.gov/lg-public/identity-idp-helm-chart.git - >- helm upgrade --install --namespace review-apps --debug