diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b31986a963..d7a8ef3cc5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -312,18 +312,18 @@ review-app: [ {"name": "POSTGRES_SSLMODE", "value": "prefer"}, {"name": "POSTGRES_NAME", "value": "idp"}, - {"name": "POSTGRES_HOST","value": "$CI_ENVIRONMENT_SLUG-identity-idp-chart-postgres.review-apps"}, + {"name": "POSTGRES_HOST","value": "$CI_ENVIRONMENT_SLUG-login-chart-pg.review-apps"}, {"name": "POSTGRES_USERNAME", "value": "postgres"}, {"name": "POSTGRES_PASSWORD", "value": "postgres"}, {"name": "POSTGRES_WORKER_SSLMODE", "value": "prefer"}, {"name": "POSTGRES_WORKER_NAME", "value": "idp-worker-jobs"}, - {"name": "POSTGRES_WORKER_HOST", "value": "$CI_ENVIRONMENT_SLUG-identity-idp-chart-postgres.review-apps"}, + {"name": "POSTGRES_WORKER_HOST", "value": "$CI_ENVIRONMENT_SLUG-login-chart-pg.review-apps"}, {"name": "POSTGRES_WORKER_USERNAME", "value": "postgres"}, {"name": "POSTGRES_WORKER_PASSWORD", "value": "postgres"}, {"name": "RAILS_OFFLINE", "value": "true"}, - {"name": "REDIS_IRS_ATTEMPTS_API_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/2"}, - {"name": "REDIS_THROTTLE_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/1"}, - {"name": "REDIS_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379"}, + {"name": "REDIS_IRS_ATTEMPTS_API_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-login-chart-redis.review-apps:6379/2"}, + {"name": "REDIS_THROTTLE_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-login-chart-redis.review-apps:6379/1"}, + {"name": "REDIS_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-login-chart-redis.review-apps:6379"}, {"name": "ASSET_HOST", "value": "https://$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, {"name": "DOMAIN_NAME", "value": "$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, {"name": "LOGIN_DATACENTER", "value": "true" }, @@ -339,18 +339,18 @@ review-app: [ {"name": "POSTGRES_SSLMODE", "value": "prefer"}, {"name": "POSTGRES_NAME", "value": "idp"}, - {"name": "POSTGRES_HOST", "value": "$CI_ENVIRONMENT_SLUG-identity-idp-chart-postgres.review-apps"}, + {"name": "POSTGRES_HOST", "value": "$CI_ENVIRONMENT_SLUG-login-chart-pg.review-apps"}, {"name": "POSTGRES_USERNAME", "value": "postgres"}, {"name": "POSTGRES_PASSWORD", "value": "postgres"}, {"name": "POSTGRES_WORKER_SSLMODE", "value": "prefer"}, {"name": "POSTGRES_WORKER_NAME", "value": "idp-worker-jobs"}, - {"name": "POSTGRES_WORKER_HOST", "value": "$CI_ENVIRONMENT_SLUG-identity-idp-chart-postgres.review-apps"}, + {"name": "POSTGRES_WORKER_HOST", "value": "$CI_ENVIRONMENT_SLUG-login-chart-pg.review-apps"}, {"name": "POSTGRES_WORKER_USERNAME", "value": "postgres"}, {"name": "POSTGRES_WORKER_PASSWORD", "value": "postgres"}, {"name": "RAILS_OFFLINE", "value": "true"}, - {"name": "REDIS_IRS_ATTEMPTS_API_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/2"}, - {"name": "REDIS_THROTTLE_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379/1"}, - {"name": "REDIS_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-identity-idp-chart-redis.review-apps:6379"}, + {"name": "REDIS_IRS_ATTEMPTS_API_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-login-chart-redis.review-apps:6379/2"}, + {"name": "REDIS_THROTTLE_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-login-chart-redis.review-apps:6379/1"}, + {"name": "REDIS_URL", "value": "redis://$CI_ENVIRONMENT_SLUG-login-chart-redis.review-apps:6379"}, {"name": "ASSET_HOST", "value": "https://$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, {"name": "DOMAIN_NAME", "value": "$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov"}, {"name": "LOGIN_DATACENTER", "value": "true" }, @@ -375,7 +375,7 @@ review-app: $CI_ENVIRONMENT_SLUG ./charts - 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 review_app'" - - echo "Then run aws-vault exec sandbox-power -- kubectl exec -it service/$CI_ENVIRONMENT_SLUG-identity-idp-chart-idp -n review-apps -- /app/bin/rails console" + - 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" environment: name: review/$CI_COMMIT_REF_NAME url: https://$CI_ENVIRONMENT_SLUG.review-app.identitysandbox.gov @@ -548,4 +548,4 @@ ecr-scan: paths: - gl-container-scanning-report.json reports: - container_scanning: gl-container-scanning-report.json \ No newline at end of file + container_scanning: gl-container-scanning-report.json diff --git a/charts/Chart.yaml b/charts/Chart.yaml index a8e4602c88d..b6395c48903 100644 --- a/charts/Chart.yaml +++ b/charts/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: identity-idp-chart +name: login-chart description: A Helm chart for Kubernetes # A chart can be either an 'application' or a 'library' chart. diff --git a/charts/templates/_helpers.tpl b/charts/templates/_helpers.tpl index e42075e0000..a6554a16e74 100644 --- a/charts/templates/_helpers.tpl +++ b/charts/templates/_helpers.tpl @@ -99,7 +99,7 @@ app.kubernetes.io/name: redis Postgres fullname */}} {{- define "identity-idp-chart.postgres.fullname" -}} -{{- printf "%s-postgres" (include "identity-idp-chart.fullname" .) -}} +{{- printf "%s-pg" (include "identity-idp-chart.fullname" .) -}} {{- end -}} {{/* @@ -156,4 +156,4 @@ worker fullname */}} {{- define "identity-idp-chart.worker.fullname" -}} {{- printf "%s-worker" (include "identity-idp-chart.fullname" .) -}} -{{- end -}} \ No newline at end of file +{{- end -}} diff --git a/charts/values.yaml b/charts/values.yaml index 10d00309b22..f6453b88ad3 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -9,7 +9,7 @@ idp: - name: POSTGRES_NAME value: "idp" - name: POSTGRES_HOST - value: "rails-app-test-identity-idp-chart-postgres.review-apps" + value: "rails-app-test-login-chart-pg.review-apps" - name: POSTGRES_USERNAME value: "postgres" - name: POSTGRES_PASSWORD @@ -19,7 +19,7 @@ idp: - name: POSTGRES_WORKER_NAME value: "idp-worker-jobs" - name: POSTGRES_WORKER_HOST - value: "rails-app-test-identity-idp-chart-postgres.review-apps" + value: "rails-app-test-login-chart-pg.review-apps" - name: POSTGRES_WORKER_USERNAME value: "postgres" - name: POSTGRES_WORKER_PASSWORD @@ -29,11 +29,11 @@ idp: - name: RAILS_OFFLINE value: "true" - name: REDIS_IRS_ATTEMPTS_API_URL - value: redis://rails-app-test-identity-idp-chart-redis.review-apps:6379/2 + value: redis://rails-app-test-login-chart-redis.review-apps:6379/2 - name: REDIS_THROTTLE_URL - value: redis://rails-app-test-identity-idp-chart-redis.review-apps:6379/1 + value: redis://rails-app-test-login-chart-redis.review-apps:6379/1 - name: REDIS_URL - value: redis://rails-app-test-identity-idp-chart-redis.review-apps:6379 + value: redis://rails-app-test-login-chart-redis.review-apps:6379 - name: ASSET_HOST value: https://test.review-app.identitysandbox.gov - name: DOMAIN_NAME @@ -129,7 +129,7 @@ worker: - name: POSTGRES_NAME value: "idp" - name: POSTGRES_HOST - value: "rails-app-test-identity-idp-chart-postgres.review-apps" + value: "rails-app-test-login-chart-pg.review-apps" - name: POSTGRES_USERNAME value: "postgres" - name: POSTGRES_PASSWORD @@ -139,7 +139,7 @@ worker: - name: POSTGRES_WORKER_NAME value: "idp-worker-jobs" - name: POSTGRES_WORKER_HOST - value: "rails-app-test-identity-idp-chart-postgres.review-apps" + value: "rails-app-test-login-chart-pg.review-apps" - name: POSTGRES_WORKER_USERNAME value: "postgres" - name: POSTGRES_WORKER_PASSWORD @@ -149,11 +149,11 @@ worker: - name: RAILS_OFFLINE value: "true" - name: REDIS_IRS_ATTEMPTS_API_URL - value: redis://rails-app-test-identity-idp-chart-redis.review-apps:6379/2 + value: redis://rails-app-test-login-chart-redis.review-apps:6379/2 - name: REDIS_THROTTLE_URL - value: redis://rails-app-test-identity-idp-chart-redis.review-apps:6379/1 + value: redis://rails-app-test-login-chart-redis.review-apps:6379/1 - name: REDIS_URL - value: redis://rails-app-test-identity-idp-chart-redis.review-apps:6379 + value: redis://rails-app-test-login-chart-redis.review-apps:6379 replicaCount: 1 image: #repository: stephenshelton/identity-idp