Bubble ClusterName to top level so that its easily discoverable (stil…

…l keep metadata) Signed-off-by: Rajat Chopra <rchopra@redhat.com>
openshift · Sep 13, 2018 · 5567d3c · 5567d3c
1 parent 533c4e5
commit 5567d3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/asset/installconfig/installconfig.go b/pkg/asset/installconfig/installconfig.go
@@ -6,8 +6,6 @@ import (
 
 	"github.com/ghodss/yaml"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/openshift/installer/pkg/asset"
 	"github.com/openshift/installer/pkg/types"
 )
@@ -49,7 +47,8 @@ func (a *installConfig) Generate(dependencies map[asset.Asset]*asset.State) (*as
 		ObjectMeta: metav1.ObjectMeta{
 			Name: clusterName,
 		},
-		ClusterID: clusterID,
+		ClusterName: clusterName,
+		ClusterID:   clusterID,
 		Admin: types.Admin{
 			Email:    emailAddress,
 			Password: password,

diff --git a/pkg/types/installconfig.go b/pkg/types/installconfig.go
@@ -12,8 +12,12 @@ type InstallConfig struct {
 	// +optional
 	metav1.TypeMeta `json:",inline"`
 
+	// +optional
 	metav1.ObjectMeta `json:"metadata"`
 
+	// ClusterName is the name of the cluster.
+	ClusterName string `json:"clusterName"`
+
 	// ClusterID is the ID of the cluster.
 	ClusterID string `json:"clusterID"`