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

Cherry pick of #7160 onto release-1.13 #7269

Merged
merged 2 commits into from
Jul 19, 2019
Merged

Cherry pick of #7160 onto release-1.13 #7269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a6f016
add masterPublicName support in kops set cluster
Jun 18, 2019
7c6c405
fixes typo - s/(Spec.)m(asterPublicName)/$1M$2/
Jun 20, 2019
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
5 changes: 2 additions & 3 deletions pkg/commands/set_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ func SetClusterFields(fields []string, cluster *api.Cluster, instanceGroups []*a
cluster.Spec.NodePortAccess = append(cluster.Spec.NodePortAccess, kv[1])
case "spec.kubernetesVersion":
cluster.Spec.KubernetesVersion = kv[1]

case "spec.masterPublicName":
cluster.Spec.MasterPublicName = kv[1]
case "cluster.spec.etcdClusters[*].enableEtcdTLS":
v, err := strconv.ParseBool(kv[1])
if err != nil {
Expand All @@ -102,7 +103,6 @@ func SetClusterFields(fields []string, cluster *api.Cluster, instanceGroups []*a
for _, c := range cluster.Spec.EtcdClusters {
c.EnableEtcdTLS = v
}

case "cluster.spec.etcdClusters[*].enableTLSAuth":
v, err := strconv.ParseBool(kv[1])
if err != nil {
Expand All @@ -111,7 +111,6 @@ func SetClusterFields(fields []string, cluster *api.Cluster, instanceGroups []*a
for _, c := range cluster.Spec.EtcdClusters {
c.EnableTLSAuth = v
}

case "cluster.spec.etcdClusters[*].version":
for _, c := range cluster.Spec.EtcdClusters {
c.Version = kv[1]
Expand Down