Skip to content

Commit

Permalink
Fix mismatch with aws-*-credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
imnasnainaec committed Oct 16, 2024
1 parent 6a9de6e commit 1714201
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion deploy/ansible/group_vars/nuc/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# one of k3s or none.
k8s_engine: k3s

image_pull_secret: aws-login-credentials
image_pull_secret: aws-ecr-credentials
use_airgap_images: false

# k8s namespaces
Expand Down
2 changes: 1 addition & 1 deletion deploy/ansible/group_vars/server/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# Configure Kubernetes cluster
################################################

image_pull_secret: aws-login-credentials
image_pull_secret: aws-ecr-credentials
use_airgap_images: false

create_namespaces: []
Expand Down
2 changes: 1 addition & 1 deletion deploy/ansible/host_vars/localhost/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Configure Kubernetes cluster
################################################

image_pull_secret: aws-login-credentials
image_pull_secret: aws-ecr-credentials
use_airgap_images: true

# k8s namespaces
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/aws-login/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ global:
awsDefaultRegion: "Override"
awsAccessKeyId: "Override"
awsSecretAccessKey: "Override"
pullSecretName: aws-login-credentials
pullSecretName: aws-ecr-credentials

awsEcr:
configName: aws-ecr-config
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/cert-proxy-client/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

global:
serverName: localhost
pullSecretName: aws-login-credentials
pullSecretName: aws-ecr-credentials
awsS3Access: aws-s3-credentials
# Update strategy should be "Recreate" or "Rolling Update"
updateStrategy: Recreate
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/cert-proxy-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Release:
Namespace: thecombine

global:
pullSecretName: aws-login-credentials
pullSecretName: aws-ecr-credentials
awsS3Access: aws-s3-credentials
# Update strategy should be "Recreate" or "Rolling Update"
updateStrategy: Recreate
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/create-admin-user/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ global:
combineJwtSecretKey: "Override"
combineSmtpUsername: "Override"
combineSmtpPassword: "Override"
pullSecretName: aws-login-credentials
pullSecretName: aws-ecr-credentials
imageTag: "latest"
imagePullPolicy: IfNotPresent
# Define the type of image registry to use, awsEcr or local
Expand Down
2 changes: 1 addition & 1 deletion docs/deploy/kubernetes_design/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ The specialized Docker images that are used to deploy the combine, `combine_fron
from AWS ECR; the credentials are valid for 12 hours. In order to accommodate this requirement, when the Kubernetes
resources are installed or reconfigured, the following jobs are created:

- `ecr-cred-helper` is a one-time Job that is run to create the `aws-login-credentials` Secret. The Secret type is
- `ecr-cred-helper` is a one-time Job that is run to create the `aws-ecr-credentials` Secret. The Secret type is
`kubernetes.io/dockerconfigjson` and can be used by the deployments to pull the required images from AWS ECR.
- `ecr-cred-helper-cron` refreshes the `aws-logon-credentials` periodically. The current configuration refreshes them
every 8 hours.
Expand Down

0 comments on commit 1714201

Please sign in to comment.