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

Merge pull request #15674 from justinsb/fix_15559 

kubetest2-kops: rename control-plane-size flag to control-plane-count
This commit is contained in:
Kubernetes Prow Robot 2023-07-20 20:12:06 -07:00 committed by GitHub
parent b5caa76a6e 53385bc0b4
commit 9e2ef12ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 14 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,8 +157,8 @@ func (d *deployer) verifyKopsFlags() error {
return errors.New("missing required --kops-binary-path when --kops-version-marker is not used")
}
if d.ControlPlaneSize == 0 {
d.ControlPlaneSize = 1
if d.ControlPlaneCount == 0 {
d.ControlPlaneCount = 1
}
switch d.CloudProvider {

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

@ -48,14 +48,16 @@ type deployer struct {
KopsBaseURL string `flag:"-"`
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"`
ControlPlaneSize int `flag:"control-plane-size" desc:"Number of control plane instances"`
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"`
Env []string `flag:"env" desc:"Additional env vars to set for kops commands in NAME=VALUE format"`
CreateArgs string `flag:"create-args" desc:"Extra space-separated arguments passed to 'kops create cluster'"`
KopsBinaryPath string `flag:"kops-binary-path" desc:"The path to kops executable used for testing"`
createBucket bool `flag:"-"`
ClusterName string `flag:"cluster-name" desc:"The FQDN to use for the cluster name"`
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"`
Env []string `flag:"env" desc:"Additional env vars to set for kops commands in NAME=VALUE format"`
CreateArgs string `flag:"create-args" desc:"Extra space-separated arguments passed to 'kops create cluster'"`
KopsBinaryPath string `flag:"kops-binary-path" desc:"The path to kops executable used for testing"`
createBucket bool `flag:"-"`
// ControlPlaneCount specifies the number of VMs in the control-plane.
ControlPlaneCount int `flag:"control-plane-count" desc:"Number of control-plane instances"`
ControlPlaneIGOverrides []string `flag:"control-plane-instance-group-overrides" desc:"overrides for the control plane instance groups"`
NodeIGOverrides []string `flag:"node-instance-group-overrides" desc:"overrides for the node instance groups"`
@ -123,6 +125,17 @@ func New(opts types.Options) (types.Deployer, *pflag.FlagSet) {
// register flags for klog
klog.InitFlags(nil)
fs.AddGoFlagSet(flag.CommandLine)
// Map deprecated flag names to their new names
fs.SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {
switch name {
case "control-plane-size":
klog.Warningf("deprecated --control-plane-size specified; please use --control-plane-count instead")
name = "control-plane-count"
}
return pflag.NormalizedName(name)
})
return d, fs
}

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

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

8
tests/e2e/scenarios/lib/common.sh
View File

@ -137,11 +137,17 @@ function kops-up() {
create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
fi
# TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT
if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then
echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead"
KOPS_CONTROL_PLANE_COUNT=${KOPS_CONTROL_PLANE_SIZE}
fi
${KUBETEST2} \
--up \
--kops-binary-path="${KOPS}" \
--kubernetes-version="${K8S_VERSION}" \
--create-args="${create_args}" \
--control-plane-size="${KOPS_CONTROL_PLANE_SIZE:-1}" \
--control-plane-count="${KOPS_CONTROL_PLANE_COUNT:-1}" \
--template-path="${KOPS_TEMPLATE-}"
}

8
tests/e2e/scenarios/upgrade-ab/run-test.sh
View File

@ -83,11 +83,17 @@ if [[ ${KOPS_IRSA-} = true ]]; then
create_args="${create_args} --discovery-store=${DISCOVERY_STORE}/${CLUSTER_NAME}/discovery"
fi
# TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT
if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then
echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead"
KOPS_CONTROL_PLANE_COUNT=${KOPS_CONTROL_PLANE_SIZE}
fi
${KUBETEST2} \
--up \
--kops-binary-path="${KOPS_A}" \
--kubernetes-version="${K8S_VERSION_A}" \
--control-plane-size="${KOPS_CONTROL_PLANE_SIZE:-1}" \
--control-plane-count="${KOPS_CONTROL_PLANE_COUNT:-1}" \
--template-path="${KOPS_TEMPLATE:-}" \
--create-args="--networking calico ${KOPS_EXTRA_FLAGS:-} ${create_args}"