From 46394f506175baa552eb81461126f1895bcf42fa Mon Sep 17 00:00:00 2001
From: Daniel Spangenberg <daniel.spangenberg@redhat.com>
Date: Tue, 23 Oct 2018 15:19:32 +0200
Subject: [PATCH] Rename ClusterName to ClusterID

---
 examples/machine-api-operator-config-aws.yaml | 1 -
 pkg/render/config.go                          | 3 +--
 pkg/render/render_test.go                     | 2 +-
 tests/e2e/main.go                             | 5 ++---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/examples/machine-api-operator-config-aws.yaml b/examples/machine-api-operator-config-aws.yaml
index 3376093a4a..2fcb964d9e 100644
--- a/examples/machine-api-operator-config-aws.yaml
+++ b/examples/machine-api-operator-config-aws.yaml
@@ -22,7 +22,6 @@ apiServiceCA: |
   -----END CERTIFICATE-----
 provider: aws
 aws:
-  clusterName: meh
   clusterID: b302cf66-f5ff-4d5d-1cc1-0ab2755d2065
   image: ami-0e502f54daeb8686e
   region: eu-west-1
diff --git a/pkg/render/config.go b/pkg/render/config.go
index ce3664ca08..54cd2deac2 100644
--- a/pkg/render/config.go
+++ b/pkg/render/config.go
@@ -26,13 +26,12 @@ type LibvirtConfig struct {
 	URI         string `json:"uri"`
 	NetworkName string `json:"networkName"`
 	IPRange     string `json:"ipRange"`
-	ClusterName string `json:"clusterName"`
+	ClusterID   string `json:"clusterID"`
 	Replicas    string `json:"replicas"`
 }
 
 // AWSConfig contains specific config for AWS
 type AWSConfig struct {
-	ClusterName           string `json:"clusterName"`
 	ClusterID             string `json:"clusterID"`
 	Region                string `json:"region"`
 	AvailabilityZone      string `json:"availabilityZone"`
diff --git a/pkg/render/render_test.go b/pkg/render/render_test.go
index 36a11af900..65a4d5734e 100644
--- a/pkg/render/render_test.go
+++ b/pkg/render/render_test.go
@@ -42,7 +42,7 @@ func TestClusterapiControllerManifest(t *testing.T) {
 			NetworkName: "testNet",
 			IPRange:     "192.168.124.0/24",
 			Replicas:    "2",
-			ClusterName: "test",
+			ClusterID:   "test",
 		},
 		Images: &Images{
 			ClusterAPIControllerManagerLibvirt: "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
diff --git a/tests/e2e/main.go b/tests/e2e/main.go
index f79cbfc1b9..f41f3c4f47 100644
--- a/tests/e2e/main.go
+++ b/tests/e2e/main.go
@@ -261,9 +261,8 @@ var rootCmd = &cobra.Command{
 		}
 		configValues := &render.OperatorConfig{
 			AWS: &render.AWSConfig{
-				ClusterID:   clusterID,
-				ClusterName: clusterID,
-				Region:      region,
+				ClusterID: clusterID,
+				Region:    region,
 			},
 		}
 		maoConfigPopulatedData, err := render.Manifests(configValues, maoConfigTemplateData)