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

Merge pull request #15266 from infonova/os-implement-etcd-manager-networkcidr 

OpenStack: Add network-cidr config for etcd-manager
This commit is contained in:
Kubernetes Prow Robot 2023-04-13 02:48:36 -07:00 committed by GitHub
parent 8f2789bb60 3ccb8746cf
commit 69691eea23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/components/etcdmanager/model.go
View File

@ -478,6 +478,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
fmt.Sprintf("%s=%s", openstack.TagClusterName, b.Cluster.Name), fmt.Sprintf("%s=%s", openstack.TagClusterName, b.Cluster.Name),
} }
config.VolumeNameTag = openstack.TagNameEtcdClusterPrefix + etcdCluster.Name config.VolumeNameTag = openstack.TagNameEtcdClusterPrefix + etcdCluster.Name
config.NetworkCIDR = fi.PtrTo(b.Cluster.Spec.Networking.NetworkCIDR)
case kops.CloudProviderScaleway: case kops.CloudProviderScaleway:
config.VolumeProvider = "scaleway" config.VolumeProvider = "scaleway"
@ -589,6 +590,7 @@ type config struct {
VolumeTag []string `flag:"volume-tag,repeat"` VolumeTag []string `flag:"volume-tag,repeat"`
VolumeNameTag string `flag:"volume-name-tag"` VolumeNameTag string `flag:"volume-name-tag"`
DNSSuffix string `flag:"dns-suffix"` DNSSuffix string `flag:"dns-suffix"`
NetworkCIDR *string `flag:"network-cidr"`
} }
// SelectorForCluster returns the selector that should be used to select our pods (from services) // SelectorForCluster returns the selector that should be used to select our pods (from services)