Skip to content

Commit d417119

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17939 from rifelpet/deprecated-flags
Replace deprecated kops CLI flags
2 parents 6fd3389 + 6a73aef commit d417119

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎tests/e2e/kubetest2-kops/deployer/up.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
200200
}
201201
args = appendIfUnset(args, "--admin-access", adminAccess)
202202

203-
// Dont set --master-count if either --control-plane-count or --master-count
203+
// Dont set --control-plane-count if either --control-plane-count or --master-count
204204
// has been provided in --create-args
205205
foundCPCount := false
206206
for _, existingArg := range args {
@@ -211,27 +211,27 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
211211
}
212212
}
213213
if !foundCPCount {
214-
args = appendIfUnset(args, "--master-count", fmt.Sprintf("%d", d.ControlPlaneCount))
214+
args = appendIfUnset(args, "--control-plane-count", fmt.Sprintf("%d", d.ControlPlaneCount))
215215
}
216216

217217
switch d.CloudProvider {
218218
case "aws":
219219
if isArm {
220-
args = appendIfUnset(args, "--master-size", "c6g.large")
220+
args = appendIfUnset(args, "--control-plane-size", "c6g.large")
221221
args = appendIfUnset(args, "--node-size", "c6g.large")
222222
} else {
223-
args = appendIfUnset(args, "--master-size", "c5.large")
223+
args = appendIfUnset(args, "--control-plane-size", "c5.large")
224224
}
225225
case "azure":
226226
// Use SKUs for which there is enough quota
227227
args = appendIfUnset(args, "--control-plane-size", "Standard_D4s_v3")
228228
args = appendIfUnset(args, "--node-size", "Standard_D2s_v3")
229229
case "gce":
230230
if isArm {
231-
args = appendIfUnset(args, "--master-size", "t2a-standard-2")
231+
args = appendIfUnset(args, "--control-plane-size", "t2a-standard-2")
232232
args = appendIfUnset(args, "--node-size", "t2a-standard-2")
233233
} else {
234-
args = appendIfUnset(args, "--master-size", "e2-standard-2")
234+
args = appendIfUnset(args, "--control-plane-size", "e2-standard-2")
235235
args = appendIfUnset(args, "--node-size", "e2-standard-2")
236236
}
237237
if d.GCPProject != "" {
@@ -244,11 +244,11 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
244244
// We used to set the --vpc flag to split clusters into different networks, this is now the default.
245245
// args = appendIfUnset(args, "--vpc", strings.Split(d.ClusterName, ".")[0])
246246
case "digitalocean":
247-
args = appendIfUnset(args, "--master-size", "c2-16vcpu-32gb")
247+
args = appendIfUnset(args, "--control-plane-size", "c2-16vcpu-32gb")
248248
args = appendIfUnset(args, "--node-size", "c2-16vcpu-32gb")
249249
}
250250

251-
args = appendIfUnset(args, "--master-volume-size", "48")
251+
args = appendIfUnset(args, "--control-plane-volume-size", "48")
252252
args = appendIfUnset(args, "--node-count", "4")
253253
args = appendIfUnset(args, "--node-volume-size", "48")
254254
args = appendIfUnset(args, "--zones", strings.Join(zones, ","))

‎tests/e2e/scenarios/aws-ebs-csi/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ kops-acquire-latest
2222
OVERRIDES="${OVERRIDES-} --set=cluster.spec.cloudProvider.aws.ebsCSIDriver.enabled=true"
2323
OVERRIDES="$OVERRIDES --set=cluster.spec.snapshotController.enabled=true"
2424
OVERRIDES="$OVERRIDES --set=cluster.spec.certManager.enabled=true"
25-
OVERRIDES="$OVERRIDES --master-size=t3.medium --node-size=c5.large"
25+
OVERRIDES="$OVERRIDES --control-plane-size=t3.medium --node-size=c5.large"
2626

2727
kops-up
2828

‎tests/e2e/scenarios/aws-lb-controller/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fi
3232
CREATE_ARGS="--networking amazonvpc"
3333
CREATE_ARGS="${CREATE_ARGS} --set=cluster.spec.cloudProvider.aws.loadBalancerController.enabled=true"
3434
CREATE_ARGS="${CREATE_ARGS} --set=cluster.spec.certManager.enabled=true"
35-
CREATE_ARGS="${CREATE_ARGS} --master-size=t3.medium --node-size=t3.medium"
35+
CREATE_ARGS="${CREATE_ARGS} --control-plane-size=t3.medium --node-size=t3.medium"
3636
CREATE_ARGS="${CREATE_ARGS} --image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/server/24.04/stable/current/amd64/hvm/ebs-gp3/ami-id}"
3737
CREATE_ARGS="${CREATE_ARGS} --zones=eu-west-1a,eu-west-1b,eu-west-1c"
3838

‎tests/e2e/scenarios/keypair-rotation/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source "${REPO_ROOT}"/tests/e2e/scenarios/lib/common.sh
1919

2020
kops-acquire-latest
2121

22-
OVERRIDES="${OVERRIDES-} --master-size=t4g.medium --node-size=t4g.medium"
22+
OVERRIDES="${OVERRIDES-} --control-plane-size=t4g.medium --node-size=t4g.medium"
2323

2424
kops-up
2525

‎tests/e2e/scenarios/metrics-server/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ kubetest2 kops \
3232
--up --down \
3333
"${KUBETEST2_ARGS[@]}" \
3434
--cloud-provider=aws \
35-
--create-args="--set=cluster.spec.metricsServer.enabled=true --set=cluster.spec.certManager.enabled=true --master-size=m6g.large --node-size=m6g.large" \
35+
--create-args="--set=cluster.spec.metricsServer.enabled=true --set=cluster.spec.certManager.enabled=true --control-plane-size=m6g.large --node-size=m6g.large" \
3636
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
3737
--test=exec -- "${REPO_ROOT}/tests/e2e/scenarios/metrics-server/test.sh"

‎tests/e2e/scenarios/scalability/run-test.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if [[ "${CLOUD_PROVIDER}" == "aws" ]]; then
5656
create_args+=("--network-cidr=10.0.0.0/16,10.1.0.0/16,10.2.0.0/16,10.3.0.0/16,10.4.0.0/16,10.5.0.0/16,10.6.0.0/16,10.7.0.0/16,10.8.0.0/16,10.9.0.0/16,10.10.0.0/16,10.11.0.0/16,10.12.0.0/16")
5757
create_args+=("--node-size=${NODE_SIZE:-t3a.medium,t3.medium,t3a.large,c5a.large,t3.large,c5.large,m5a.large,m6a.large,m5.large,c7a.large,r5a.large,r6a.large,m7a.large}")
5858
create_args+=("--node-volume-size=20")
59-
create_args+=("--master-volume-size=500")
59+
create_args+=("--control-plane-volume-size=500")
6060
create_args+=("--zones=us-east-2a,us-east-2b,us-east-2c")
6161
create_args+=("--image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/server/24.04/stable/current/amd64/hvm/ebs-gp3/ami-id}")
6262
# TODO: track failures of tests (HostPort & OIDC) when using `--dns=none`
@@ -66,7 +66,7 @@ if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
6666
create_args+=("--zones=us-east1-b,us-east1-c,us-east1-d")
6767
create_args+=("--node-size=${NODE_SIZE:-e2-medium}")
6868
create_args+=("--node-volume-size=30")
69-
create_args+=("--master-volume-size=1000")
69+
create_args+=("--control-plane-volume-size=1000")
7070
create_args+=("--gce-service-account=default")
7171
create_args+=("--topology=private")
7272
create_args+=("--image=${INSTANCE_IMAGE:-ubuntu-os-cloud/ubuntu-2404-noble-amd64-v20251001}")
@@ -119,7 +119,7 @@ create_args+=("--set spec.kubeProxy.proxyMode=${KUBE_PROXY_MODE:-iptables}")
119119
create_args+=("--set spec.kubeProxy.metricsBindAddress=0.0.0.0:10249")
120120
create_args+=("--node-count=${KUBE_NODE_COUNT:-100}")
121121
create_args+=("--control-plane-count=${CONTROL_PLANE_COUNT:-1}")
122-
create_args+=("--master-size=${CONTROL_PLANE_SIZE:-c5.2xlarge}")
122+
create_args+=("--control-plane-size=${CONTROL_PLANE_SIZE:-c5.2xlarge}")
123123

124124
# Enable HTTP for events etcd to reduce TLS overhead in scale tests
125125
KOPS_FEATURE_FLAGS="EtcdEventsHTTP,${KOPS_FEATURE_FLAGS:-}"

0 commit comments

Comments
 (0)