kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15139 from zetaab/clusternameoccm 

Add cluster name to OCCM opts
This commit is contained in:
Kubernetes Prow Robot 2023-02-12 08:15:31 -08:00 committed by GitHub
parent 553270a06a dca3b8c832
commit 9e49b37d9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/create_cluster/ha_openstack/expected-v1alpha2.yaml
View File

@ -21,6 +21,8 @@ spec:
timeout: 10s timeout: 10s
router: router:
externalNetwork: "" externalNetwork: ""
cloudControllerManager:
clusterName: minimal.k8s.local
cloudProvider: openstack cloudProvider: openstack
configBase: memfs://tests/minimal.k8s.local configBase: memfs://tests/minimal.k8s.local
etcdClusters: etcdClusters:

2
tests/integration/create_cluster/ha_openstack_nodns/expected-v1alpha2.yaml
View File

@ -29,6 +29,8 @@ spec:
dnsServers: 1.1.1.1 dnsServers: 1.1.1.1
externalNetwork: vlan1 externalNetwork: vlan1
externalSubnet: vlan1subnet externalSubnet: vlan1subnet
cloudControllerManager:
clusterName: ha.example.com
cloudProvider: openstack cloudProvider: openstack
configBase: memfs://tests/ha.example.com configBase: memfs://tests/ha.example.com
etcdClusters: etcdClusters:

2
tests/integration/create_cluster/ha_openstack_octavia/expected-v1alpha2.yaml
View File

@ -27,6 +27,8 @@ spec:
router: router:
dnsServers: 1.1.1.1 dnsServers: 1.1.1.1
externalNetwork: vlan1 externalNetwork: vlan1
cloudControllerManager:
clusterName: minimal.k8s.local
cloudProvider: openstack cloudProvider: openstack
configBase: memfs://tests/minimal.k8s.local configBase: memfs://tests/minimal.k8s.local
etcdClusters: etcdClusters:

5
upup/pkg/fi/cloudup/new_cluster.go
View File

@ -1438,6 +1438,11 @@ func initializeOpenstack(opt *NewClusterOptions, cluster *api.Cluster) {
cluster.Spec.Networking.Topology.DNS = api.DNSTypeNone cluster.Spec.Networking.Topology.DNS = api.DNSTypeNone
} }
} }
if cluster.Spec.ExternalCloudControllerManager == nil {
cluster.Spec.ExternalCloudControllerManager = &api.CloudControllerManagerConfig{}
}
cluster.Spec.ExternalCloudControllerManager.ClusterName = opt.ClusterName
} }
func createEtcdCluster(etcdCluster string, controlPlanes []*api.InstanceGroup, encryptEtcdStorage bool, etcdStorageType string) api.EtcdClusterSpec { func createEtcdCluster(etcdCluster string, controlPlanes []*api.InstanceGroup, encryptEtcdStorage bool, etcdStorageType string) api.EtcdClusterSpec {