Merge pull request #16821 from rifelpet/scenario-updates

Update versions used in scenario tests
This commit is contained in:
Kubernetes Prow Robot 2024-09-11 19:31:12 +01:00 committed by GitHub
commit d958a4032b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions

View File

@ -28,7 +28,7 @@ function haveds() {
# Start a cluster with an old version of channel
export KOPS_BASE_URL
KOPS_BASE_URL="https://artifacts.k8s.io/binaries/kops/1.26.5"
KOPS_BASE_URL="https://artifacts.k8s.io/binaries/kops/1.29.2"
KOPS=$(kops-download-from-base)
# Start with a cluster running nodeTerminationHandler
@ -37,7 +37,7 @@ ARGS="${ARGS} --set=cluster.spec.cloudProvider.aws.nodeTerminationHandler.enable
${KUBETEST2} \
--up \
--kubernetes-version="1.26.6" \
--kubernetes-version="1.29.8" \
--kops-binary-path="${KOPS}" \
--create-args="$ARGS"

View File

@ -26,7 +26,7 @@ NETWORKING="amazonvpc"
OVERRIDES="${OVERRIDES-} --set=cluster.spec.cloudProvider.aws.loadBalancerController.enabled=true"
OVERRIDES="${OVERRIDES} --set=cluster.spec.certManager.enabled=true"
OVERRIDES="${OVERRIDES} --master-size=t3.medium --node-size=t3.medium" # Use amd64 because LBC's E2E suite uses single-arch amd64 test images
OVERRIDES="${OVERRIDES} --image=${INSTANCE_IMAGE:-099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20231208}"
OVERRIDES="${OVERRIDES} --image=${INSTANCE_IMAGE:-099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20240906}"
# shellcheck disable=SC2034
ZONES="eu-west-1a,eu-west-1b,eu-west-1c"

View File

@ -71,7 +71,7 @@ metadata:
kops.k8s.io/cluster: {{.clusterName}}
spec:
associatePublicIp: true
image: ssm:/aws/service/canonical/ubuntu/server/20.04/stable/current/arm64/hvm/ebs-gp2/ami-id
image: ssm:/aws/service/canonical/ubuntu/server/24.04/stable/current/arm64/hvm/ebs-gp3/ami-id
machineType: t4g.medium
maxSize: 4
minSize: 4
@ -89,7 +89,7 @@ metadata:
kops.k8s.io/cluster: {{.clusterName}}
spec:
associatePublicIp: true
image: ssm:/aws/service/canonical/ubuntu/server/20.04/stable/current/arm64/hvm/ebs-gp2/ami-id
image: ssm:/aws/service/canonical/ubuntu/server/24.04/stable/current/arm64/hvm/ebs-gp3/ami-id
machineType: c6g.large
maxSize: 1
minSize: 1