Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bubble ClusterName to top level so that its easily discoverable #209

Closed
wants to merge 1 commit into from
Closed

Bubble ClusterName to top level so that its easily discoverable #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/asset/installconfig/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ 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"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

// installConfig generates the install-config.yml file.
Expand Down Expand Up @@ -49,7 +48,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,
Expand Down
4 changes: 4 additions & 0 deletions pkg/types/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down