From 171420100d43b62c0c5a85ff98d35050dcf6211b Mon Sep 17 00:00:00 2001
From: Danny Rorabaugh <imnasnainaec@gmail.com>
Date: Wed, 16 Oct 2024 17:12:46 -0400
Subject: [PATCH] Fix mismatch with aws-*-credentials

---
 deploy/ansible/group_vars/nuc/main.yml      | 2 +-
 deploy/ansible/group_vars/server/main.yml   | 2 +-
 deploy/ansible/host_vars/localhost/main.yml | 2 +-
 deploy/helm/aws-login/values.yaml           | 2 +-
 deploy/helm/cert-proxy-client/values.yaml   | 2 +-
 deploy/helm/cert-proxy-server/values.yaml   | 2 +-
 deploy/helm/create-admin-user/values.yaml   | 2 +-
 docs/deploy/kubernetes_design/README.md     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/deploy/ansible/group_vars/nuc/main.yml b/deploy/ansible/group_vars/nuc/main.yml
index be45ba5490..bd3a53e381 100644
--- a/deploy/ansible/group_vars/nuc/main.yml
+++ b/deploy/ansible/group_vars/nuc/main.yml
@@ -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
diff --git a/deploy/ansible/group_vars/server/main.yml b/deploy/ansible/group_vars/server/main.yml
index 1d883ad2e5..a50671ad29 100644
--- a/deploy/ansible/group_vars/server/main.yml
+++ b/deploy/ansible/group_vars/server/main.yml
@@ -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: []
diff --git a/deploy/ansible/host_vars/localhost/main.yml b/deploy/ansible/host_vars/localhost/main.yml
index d1d6186be3..a2f66c0308 100644
--- a/deploy/ansible/host_vars/localhost/main.yml
+++ b/deploy/ansible/host_vars/localhost/main.yml
@@ -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
diff --git a/deploy/helm/aws-login/values.yaml b/deploy/helm/aws-login/values.yaml
index 2d81c4601a..80ba121dfe 100644
--- a/deploy/helm/aws-login/values.yaml
+++ b/deploy/helm/aws-login/values.yaml
@@ -14,7 +14,7 @@ global:
   awsDefaultRegion: "Override"
   awsAccessKeyId: "Override"
   awsSecretAccessKey: "Override"
-  pullSecretName: aws-login-credentials
+  pullSecretName: aws-ecr-credentials
 
 awsEcr:
   configName: aws-ecr-config
diff --git a/deploy/helm/cert-proxy-client/values.yaml b/deploy/helm/cert-proxy-client/values.yaml
index 3cd7fc9de4..28f5c1fffc 100644
--- a/deploy/helm/cert-proxy-client/values.yaml
+++ b/deploy/helm/cert-proxy-client/values.yaml
@@ -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
diff --git a/deploy/helm/cert-proxy-server/values.yaml b/deploy/helm/cert-proxy-server/values.yaml
index 1069b2b921..be090b3b38 100644
--- a/deploy/helm/cert-proxy-server/values.yaml
+++ b/deploy/helm/cert-proxy-server/values.yaml
@@ -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
diff --git a/deploy/helm/create-admin-user/values.yaml b/deploy/helm/create-admin-user/values.yaml
index cd61cf01a7..7511e7add8 100644
--- a/deploy/helm/create-admin-user/values.yaml
+++ b/deploy/helm/create-admin-user/values.yaml
@@ -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
diff --git a/docs/deploy/kubernetes_design/README.md b/docs/deploy/kubernetes_design/README.md
index 7339f4b1a9..2b47a6e635 100644
--- a/docs/deploy/kubernetes_design/README.md
+++ b/docs/deploy/kubernetes_design/README.md
@@ -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.