Skip to content

Updating .gitlab-ci.yml for chart name changes and testing #9079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ConnorPMcCarthy merged 5 commits into from
Aug 25, 2023
Merged

Updating .gitlab-ci.yml for chart name changes and testing #9079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e65dd5d
Updating .gitlab-ci.yml for chart name changes and testing
ConnorPMcCarthy Aug 24, 2023
45d7ec3
Disabling pivcac deploy on helm chart
ConnorPMcCarthy Aug 24, 2023
0e5dbd6
Updating internal helm chart for new eks resource naming
ConnorPMcCarthy Aug 24, 2023
cea1927
Moving gitlab-ci back to internal helm chart
ConnorPMcCarthy Aug 24, 2023
49da00b
changelog: Internal,Review-Apps,Updating Gitlab-CI for resource name …
ConnorPMcCarthy Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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" },
Expand All @@ -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
Expand Down Expand Up @@ -548,4 +548,4 @@ ecr-scan:
paths:
- gl-container-scanning-report.json
reports:
container_scanning: gl-container-scanning-report.json
container_scanning: gl-container-scanning-report.json
2 changes: 1 addition & 1 deletion charts/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions charts/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}

{{/*
Expand Down Expand Up @@ -156,4 +156,4 @@ worker fullname
*/}}
{{- define "identity-idp-chart.worker.fullname" -}}
{{- printf "%s-worker" (include "identity-idp-chart.fullname" .) -}}
{{- end -}}
{{- end -}}
20 changes: 10 additions & 10 deletions charts/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down