Merge pull request #118 from dgoodwin/aws-secret-keys

Sync AWS credential secret keys with installer.
openshift · Nov 30, 2018 · eb3cdc7 · eb3cdc7
2 parents 6b31677 + 744c5ef
commit eb3cdc7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/config/templates/cluster-deployment.yaml b/config/templates/cluster-deployment.yaml
@@ -58,8 +58,8 @@ objects:
     name: ${CLUSTER_NAME}-aws-creds
   type: Opaque
   stringData:
-    awsAccessKeyId: ${AWS_ACCESS_KEY_ID}
-    awsSecretAccessKey: ${AWS_SECRET_ACCESS_KEY}
+    aws_access_key_id: ${AWS_ACCESS_KEY_ID}
+    aws_secret_access_key: ${AWS_SECRET_ACCESS_KEY}
 
 - apiVersion: v1
   kind: Secret

diff --git a/pkg/awsclient/client.go b/pkg/awsclient/client.go
@@ -41,8 +41,8 @@ import (
 )
 
 const (
-	awsCredsSecretIDKey     = "awsAccessKeyId"
-	awsCredsSecretAccessKey = "awsSecretAccessKey"
+	awsCredsSecretIDKey     = "aws_access_key_id"
+	awsCredsSecretAccessKey = "aws_secret_access_key"
 )
 
 //go:generate mockgen -source=./client.go -destination=./mock/client_generated.go -package=mock

diff --git a/pkg/install/generate.go b/pkg/install/generate.go
@@ -126,7 +126,7 @@ func GenerateInstallerJob(
 				ValueFrom: &corev1.EnvVarSource{
 					SecretKeyRef: &corev1.SecretKeySelector{
 						LocalObjectReference: cd.Spec.PlatformSecrets.AWS.Credentials,
-						Key:                  "awsAccessKeyId",
+						Key:                  "aws_access_key_id",
 					},
 				},
 			},
@@ -135,7 +135,7 @@ func GenerateInstallerJob(
 				ValueFrom: &corev1.EnvVarSource{
 					SecretKeyRef: &corev1.SecretKeySelector{
 						LocalObjectReference: cd.Spec.PlatformSecrets.AWS.Credentials,
-						Key:                  "awsSecretAccessKey",
+						Key:                  "aws_secret_access_key",
 					},
 				},
 			},