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

Add kubetest2 deployer option for the control plane size

This commit is contained in:
Ole Markus With 2022-06-18 15:51:56 +02:00
parent bbb6e67fed
commit bc67d458be
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/e2e/kubetest2-kops/deployer/common.go
View File

@ -157,6 +157,10 @@ func (d *deployer) verifyKopsFlags() error {
return errors.New("missing required --kops-binary-path when --kops-version-marker is not used") return errors.New("missing required --kops-binary-path when --kops-version-marker is not used")
} }
if d.ControlPlaneSize == 0 {
d.ControlPlaneSize = 1
}
switch d.CloudProvider { switch d.CloudProvider {
case "aws": case "aws":
case "gce": case "gce":

1
tests/e2e/kubetest2-kops/deployer/deployer.go
View File

@ -49,6 +49,7 @@ type deployer struct {
PublishVersionMarker string `flag:"publish-version-marker" desc:"The GCS path to which the --kops-version-marker is uploaded if the tests pass"` PublishVersionMarker string `flag:"publish-version-marker" desc:"The GCS path to which the --kops-version-marker is uploaded if the tests pass"`
ClusterName string `flag:"cluster-name" desc:"The FQDN to use for the cluster name"` ClusterName string `flag:"cluster-name" desc:"The FQDN to use for the cluster name"`
ControlPlaneSize int `flag:"control-plane-size" desc:"Number of control plane instances"`
CloudProvider string `flag:"cloud-provider" desc:"Which cloud provider to use"` CloudProvider string `flag:"cloud-provider" desc:"Which cloud provider to use"`
GCPProject string `flag:"gcp-project" desc:"Which GCP Project to use when --cloud-provider=gce"` GCPProject string `flag:"gcp-project" desc:"Which GCP Project to use when --cloud-provider=gce"`
Env []string `flag:"env" desc:"Additional env vars to set for kops commands in NAME=VALUE format"` Env []string `flag:"env" desc:"Additional env vars to set for kops commands in NAME=VALUE format"`

4
tests/e2e/kubetest2-kops/deployer/up.go
View File

@ -127,7 +127,7 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
args = append(args, createArgs...) args = append(args, createArgs...)
} }
args = appendIfUnset(args, "--admin-access", adminAccess) args = appendIfUnset(args, "--admin-access", adminAccess)
args = appendIfUnset(args, "--master-count", "1") args = appendIfUnset(args, "--master-count", fmt.Sprintf("%d", d.ControlPlaneSize))
args = appendIfUnset(args, "--master-volume-size", "48") args = appendIfUnset(args, "--master-volume-size", "48")
args = appendIfUnset(args, "--node-count", "4") args = appendIfUnset(args, "--node-count", "4")
args = appendIfUnset(args, "--node-volume-size", "48") args = appendIfUnset(args, "--node-volume-size", "48")
@ -273,7 +273,7 @@ func (d *deployer) verifyUpFlags() error {
func (d *deployer) zones() ([]string, error) { func (d *deployer) zones() ([]string, error) {
switch d.CloudProvider { switch d.CloudProvider {
case "aws": case "aws":
return aws.RandomZones(1) return aws.RandomZones(d.ControlPlaneSize)
case "gce": case "gce":
return gce.RandomZones(1) return gce.RandomZones(1)
case "digitalocean": case "digitalocean":