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

Merge pull request #14887 from zetaab/fixoscreate 

set loadbalancer configs before initializing the OS clients
This commit is contained in:
Kubernetes Prow Robot 2022-12-29 23:27:36 -08:00 committed by GitHub
parent 50fe61338c 829fda49e6
commit e85051b709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,9 @@ metadata:
creationTimestamp: "2017-01-01T00:00:00Z" creationTimestamp: "2017-01-01T00:00:00Z"
name: minimal.k8s.local name: minimal.k8s.local
spec: spec:
api:
loadBalancer:
type: Public
authorization: authorization:
rbac: {} rbac: {}
channel: stable channel: stable

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

@ -333,6 +333,7 @@ func NewCluster(opt *NewClusterOptions, clientset simple.Clientset) (*NewCluster
MaxRetries: fi.PtrTo(3), MaxRetries: fi.PtrTo(3),
}, },
} }
initializeOpenstackAPI(opt, cluster)
osCloud, err := openstack.NewOpenstackCloud(cluster, "openstackmodel") osCloud, err := openstack.NewOpenstackCloud(cluster, "openstackmodel")
if err != nil { if err != nil {
return nil, err return nil, err
@ -1324,9 +1325,7 @@ func setupTopology(opt *NewClusterOptions, cluster *api.Cluster, allZones sets.S
func setupAPI(opt *NewClusterOptions, cluster *api.Cluster) error { func setupAPI(opt *NewClusterOptions, cluster *api.Cluster) error {
// Populate the API access, so that it can be discoverable // Populate the API access, so that it can be discoverable
klog.Infof("Cloud Provider ID: %q", cluster.Spec.GetCloudProvider()) klog.Infof("Cloud Provider ID: %q", cluster.Spec.GetCloudProvider())
if cluster.Spec.GetCloudProvider() == api.CloudProviderOpenstack { if cluster.Spec.GetCloudProvider() == api.CloudProviderAzure {
initializeOpenstackAPI(opt, cluster)
} else if cluster.Spec.GetCloudProvider() == api.CloudProviderAzure {
// Do nothing to disable the use of loadbalancer for the k8s API server. // Do nothing to disable the use of loadbalancer for the k8s API server.
// TODO(kenji): Remove this condition once we support the loadbalancer // TODO(kenji): Remove this condition once we support the loadbalancer
// in pkg/model/azuremodel/api_loadbalancer.go. // in pkg/model/azuremodel/api_loadbalancer.go.

13
upup/pkg/fi/cloudup/openstack/cloud.go
View File

@ -363,12 +363,15 @@ func NewOpenstackCloud(cluster *kops.Cluster, uagent string) (OpenstackCloud, er
return nil, fmt.Errorf("error building openstack authenticated client: %v", err) return nil, fmt.Errorf("error building openstack authenticated client: %v", err)
} }
tags := map[string]string{ if cluster != nil {
TagClusterName: cluster.Name, hasDNS := !cluster.IsGossip() && !cluster.UsesNoneDNS()
tags := map[string]string{
TagClusterName: cluster.Name,
}
return buildClients(provider, tags, cluster.Spec.CloudProvider.Openstack, config, region, hasDNS)
} }
// used by protokube
hasDNS := !cluster.IsGossip() && !cluster.UsesNoneDNS() return buildClients(provider, nil, nil, config, region, false)
return buildClients(provider, tags, cluster.Spec.CloudProvider.Openstack, config, region, hasDNS)
} }
func buildClients(provider *gophercloud.ProviderClient, tags map[string]string, spec *kops.OpenstackSpec, config vfs.OpenstackConfig, region string, hasDNS bool) (OpenstackCloud, error) { func buildClients(provider *gophercloud.ProviderClient, tags map[string]string, spec *kops.OpenstackSpec, config vfs.OpenstackConfig, region string, hasDNS bool) (OpenstackCloud, error) {