From 49f27b4f31f344f5af5ccf0171075cd843ab9f53 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Fri, 3 Dec 2021 11:37:25 -0600 Subject: [PATCH 1/2] Update kops upgrade jobs to latest k8s patch versions --- config/jobs/kubernetes/kops/build_jobs.py | 14 ++++++------ .../kops/kops-periodics-upgrades.yaml | 22 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index dde9f4cb98ff..5f5a17dd3f9b 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -733,13 +733,13 @@ def generate_network_plugins(): def generate_upgrades(): versions_list = [ # kops k8s kops k8s - (('1.21', 'v1.21.0'), ('latest', 'latest')), - (('1.22', 'v1.22.0'), ('latest', 'latest')), - (('1.21', 'v1.21.0'), ('1.22', 'v1.22.0')), - (('1.20', 'v1.20.7'), ('1.21', 'v1.21.0')), - (('latest', 'v1.20.6'), ('latest', 'v1.21.0')), - (('latest', 'v1.18.6'), ('latest', 'v1.19.0')), - (('1.20', 'v1.20.6'), ('latest', 'v1.21.0')), + (('1.21', 'v1.21.7'), ('latest', 'latest')), + (('1.22', 'v1.22.7'), ('latest', 'latest')), + (('1.21', 'v1.21.7'), ('1.22', 'v1.22.4')), + (('1.20', 'v1.20.13'), ('1.21', 'v1.21.7')), + (('latest', 'v1.20.6'), ('latest', 'v1.21.7')), + (('latest', 'v1.18.20'), ('latest', 'v1.19.16')), + (('1.20', 'v1.20.13'), ('latest', 'v1.21.7')), ] def shorten(version): version = re.sub(r'^v', '', version) diff --git a/config/jobs/kubernetes/kops/kops-periodics-upgrades.yaml b/config/jobs/kubernetes/kops/kops-periodics-upgrades.yaml index 9f0c1e5e3c28..d33a433723d3 100644 --- a/config/jobs/kubernetes/kops/kops-periodics-upgrades.yaml +++ b/config/jobs/kubernetes/kops/kops-periodics-upgrades.yaml @@ -31,7 +31,7 @@ periodics: - name: KOPS_VERSION_A value: "1.21" - name: K8S_VERSION_A - value: "v1.21.0" + value: "v1.21.7" - name: KOPS_VERSION_B value: "latest" - name: K8S_VERSION_B @@ -95,7 +95,7 @@ periodics: - name: KOPS_VERSION_A value: "1.22" - name: K8S_VERSION_A - value: "v1.22.0" + value: "v1.22.7" - name: KOPS_VERSION_B value: "latest" - name: K8S_VERSION_B @@ -161,11 +161,11 @@ periodics: - name: KOPS_VERSION_A value: "1.21" - name: K8S_VERSION_A - value: "v1.21.0" + value: "v1.21.7" - name: KOPS_VERSION_B value: "1.22" - name: K8S_VERSION_B - value: "v1.22.0" + value: "v1.22.4" - name: CLOUD_PROVIDER value: "aws" - name: CLUSTER_NAME @@ -225,11 +225,11 @@ periodics: - name: KOPS_VERSION_A value: "1.20" - name: K8S_VERSION_A - value: "v1.20.7" + value: "v1.20.13" - name: KOPS_VERSION_B value: "1.21" - name: K8S_VERSION_B - value: "v1.21.0" + value: "v1.21.7" - name: CLOUD_PROVIDER value: "aws" - name: CLUSTER_NAME @@ -293,7 +293,7 @@ periodics: - name: KOPS_VERSION_B value: "latest" - name: K8S_VERSION_B - value: "v1.21.0" + value: "v1.21.7" - name: CLOUD_PROVIDER value: "aws" - name: CLUSTER_NAME @@ -353,11 +353,11 @@ periodics: - name: KOPS_VERSION_A value: "latest" - name: K8S_VERSION_A - value: "v1.18.6" + value: "v1.18.20" - name: KOPS_VERSION_B value: "latest" - name: K8S_VERSION_B - value: "v1.19.0" + value: "v1.19.16" - name: CLOUD_PROVIDER value: "aws" - name: CLUSTER_NAME @@ -417,11 +417,11 @@ periodics: - name: KOPS_VERSION_A value: "1.20" - name: K8S_VERSION_A - value: "v1.20.6" + value: "v1.20.13" - name: KOPS_VERSION_B value: "latest" - name: K8S_VERSION_B - value: "v1.21.0" + value: "v1.21.7" - name: CLOUD_PROVIDER value: "aws" - name: CLUSTER_NAME From e42831b305508fad8344f2c3df494e9483677a61 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Fri, 3 Dec 2021 11:37:46 -0600 Subject: [PATCH 2/2] Update AMIs --- config/jobs/kubernetes/kops/kops-periodics-distros.yaml | 2 +- config/jobs/kubernetes/kops/kops-periodics-misc2.yaml | 2 +- config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml index 64d5dcc65c34..37e6eb902b1c 100644 --- a/config/jobs/kubernetes/kops/kops-periodics-distros.yaml +++ b/config/jobs/kubernetes/kops/kops-periodics-distros.yaml @@ -415,7 +415,7 @@ periodics: -v 2 \ --up --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-server-20211201' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--image='099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-server-20211203' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \ --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \ --test=kops \ diff --git a/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml b/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml index 1e7c3d3c5550..111a56c9c727 100644 --- a/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml +++ b/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml @@ -95,7 +95,7 @@ periodics: -v 2 \ --up --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-server-20211201' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --zones=us-west-2a --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--image='099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-server-20211203' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --zones=us-west-2a --discovery-store=s3://k8s-kops-prow/discovery" \ --env=KOPS_FEATURE_FLAGS=AWSIPv6 \ --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \ --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \ diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml index 657fb3b798ab..77bd315eb1be 100644 --- a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml +++ b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml @@ -371,7 +371,7 @@ presubmits: -v 2 \ --up --build --down \ --cloud-provider=aws \ - --create-args="--image='099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-server-20211201' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ + --create-args="--image='099720109477/ubuntu/images-testing/hvm-ssd/ubuntu-jammy-daily-amd64-server-20211203' --channel=alpha --networking=calico --container-runtime=containerd --discovery-store=s3://k8s-kops-prow/discovery" \ --kubernetes-version=https://storage.googleapis.com/kubernetes-release/release/stable.txt \ --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \ --test=kops \