Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump cluster-api jobs for v1.25/v1.26 #27421

Merged
merged 1 commit into from
Sep 8, 2022
Merged

Bump cluster-api jobs for v1.25/v1.26 #27421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 51 additions & 4 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main-upgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ periodics:
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-24-latest-main
- name: periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-main
interval: 24h
decorate: true
decoration_config:
Expand Down Expand Up @@ -310,9 +310,9 @@ periodics:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.24"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.25"
value: "stable-1.25"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.3-0"
value: "3.5.4-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
- name: GINKGO_FOCUS
Expand All @@ -325,6 +325,53 @@ periodics:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
testgrid-tab-name: capi-e2e-main-1-24-latest
testgrid-tab-name: capi-e2e-main-1-24-1-25
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-25-latest-main
interval: 24h
decorate: true
decoration_config:
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
labels:
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: main
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
serviceAccountName: prowjob-default-sa
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220903-da891f21aa-1.25
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.25"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.26"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.4-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
- name: GINKGO_FOCUS
value: "\\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
resources:
requests:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
testgrid-tab-name: capi-e2e-main-1-25-latest
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"
4 changes: 2 additions & 2 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ periodics:
- name: GINKGO_FOCUS
value: "\\[clusterctl-Upgrade\\]"
- name: INIT_WITH_BINARY
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/clusterctl-{OS}-{ARCH}
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/clusterctl-{OS}-{ARCH}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would keep this up-to-date on a best effort basis. So I just bumped it because I saw it. Similar in the 1-2 job yaml

- name: INIT_WITH_PROVIDERS_CONTRACT
value: v1beta1
- name: INIT_WITH_KUBERNETES_VERSION
value: v1.24.0
value: v1.25.0

# we need privileged mode in order to do docker in docker
securityContext:
Expand Down
55 changes: 51 additions & 4 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2-upgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ periodics:
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-24-latest-release-1-2
- name: periodic-cluster-api-e2e-workload-upgrade-1-24-1-25-release-1-2
interval: 24h
decorate: true
decoration_config:
Expand Down Expand Up @@ -310,9 +310,9 @@ periodics:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.24"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.25"
value: "stable-1.25"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.3-0"
value: "3.5.4-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
- name: GINKGO_FOCUS
Expand All @@ -325,6 +325,53 @@ periodics:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2
testgrid-tab-name: capi-e2e-release-1-2-1-24-latest
testgrid-tab-name: capi-e2e-release-1-2-1-24-1-25
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-25-latest-release-1-2
interval: 24h
decorate: true
decoration_config:
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
labels:
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.2
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
serviceAccountName: prowjob-default-sa
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220903-da891f21aa-1.24
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: should this be

Suggested change
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220903-da891f21aa-1.24
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220903-da891f21aa-1.25

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should stay on 1.24 as release-1.2 is using 1.24 dependencies + the go version used in v1.24 (1.18)

args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.25"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.26"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.4-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
- name: GINKGO_FOCUS
value: "\\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
resources:
requests:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2
testgrid-tab-name: capi-e2e-release-1-2-1-25-latest
testgrid-alert-email: sig-cluster-lifecycle-cluster-api-alerts@kubernetes.io
testgrid-num-failures-to-alert: "4"
4 changes: 2 additions & 2 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ periodics:
- name: GINKGO_FOCUS
value: "\\[clusterctl-Upgrade\\]"
- name: INIT_WITH_BINARY
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-{OS}-{ARCH}
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.5/clusterctl-{OS}-{ARCH}
- name: INIT_WITH_PROVIDERS_CONTRACT
value: v1beta1
- name: INIT_WITH_KUBERNETES_VERSION
value: v1.24.0
value: v1.25.0

# we need privileged mode in order to do docker in docker
securityContext:
Expand Down
55 changes: 5 additions & 50 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ presubmits:
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
testgrid-tab-name: capi-pr-e2e-full-main
- name: pull-cluster-api-e2e-workload-upgrade-1-24-latest-main
- name: pull-cluster-api-e2e-workload-upgrade-1-25-latest-main
labels:
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
Expand All @@ -281,11 +281,11 @@ presubmits:
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.24"
value: "stable-1.25"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.25"
value: "ci/latest-1.26"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.3-0"
value: "3.5.4-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
- name: GINKGO_FOCUS
Expand All @@ -298,49 +298,4 @@ presubmits:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
testgrid-tab-name: capi-pr-e2e-main-1-24-latest
- name: pull-cluster-api-e2e-workload-upgrade-1-21-1-22-main
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We introduced this a while back to specifically test the CoreDNS/ RBAC thing on PRs. We don't need that anymore so I cleaned it up

labels:
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
decorate: true
decoration_config:
gcs_credentials_secret: "" # Use workload identity for uploading artifacts
optional: true
always_run: false
branches:
# The script this job runs is not in all branches.
- ^main$
path_alias: sigs.k8s.io/cluster-api
extra_refs:
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
serviceAccountName: prowjob-default-sa
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20220903-da891f21aa-1.25
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.21"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.22"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.3-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.8.4"
- name: GINKGO_FOCUS
value: "\\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
resources:
requests:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api
testgrid-tab-name: capi-pr-e2e-main-1-21-1-22
testgrid-tab-name: capi-pr-e2e-main-1-25-latest
10 changes: 5 additions & 5 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-presubmits-release-1-2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ presubmits:
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2
testgrid-tab-name: capi-pr-e2e-full-release-1-2
- name: pull-cluster-api-e2e-workload-upgrade-1-24-latest-release-1-2
- name: pull-cluster-api-e2e-workload-upgrade-1-25-latest-release-1-2
labels:
preset-dind-enabled: "true"
preset-kind-volume-mounts: "true"
Expand All @@ -277,11 +277,11 @@ presubmits:
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.24"
value: "stable-1.25"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.25"
value: "ci/latest-1.26"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.3-0"
value: "3.5.4-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
- name: GINKGO_FOCUS
Expand All @@ -294,4 +294,4 @@ presubmits:
cpu: 7300m
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.2
testgrid-tab-name: capi-pr-e2e-release-1-2-1-24-latest
testgrid-tab-name: capi-pr-e2e-release-1-2-1-25-latest