From 744c5ef9a34f40266e3496f4ae68280b5e90396b Mon Sep 17 00:00:00 2001
From: Devan Goodwin <dgoodwin@redhat.com>
Date: Thu, 29 Nov 2018 15:28:48 -0400
Subject: [PATCH] Sync AWS credential secret keys with installer.

Installer was using this format instead, it's more consistent with
~/.aws/credentials and we're soon to have code that will need to read
both, preferably we should sync on the format.
---
 config/templates/cluster-deployment.yaml | 4 ++--
 pkg/awsclient/client.go                  | 4 ++--
 pkg/install/generate.go                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/templates/cluster-deployment.yaml b/config/templates/cluster-deployment.yaml
index 52ab3a0fefb..7dcd9e13b71 100644
--- 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
index bda796c211e..3bacf35b9bd 100644
--- 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
index dfff3e29d70..ba75f946bff 100644
--- 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",
 					},
 				},
 			},