-
Notifications
You must be signed in to change notification settings - Fork 2.7k
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.
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
Cluster API: Bump CAPI jobs for k8s 1.27 #29295
Merged
k8s-ci-robot
merged 1 commit into
kubernetes:master
from
furkatgofurov7:bump-capi-jobs-for-1-27
Apr 14, 2023
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,5 @@ | ||
| periodics: | ||
|
|
||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-21-1-22-main | ||
| interval: 24h | ||
| decorate: true | ||
| decoration_config: | ||
| gcs_credentials_secret: "" # Use workload identity for uploading artifacts | ||
| rerun_auth_config: | ||
| github_team_slugs: | ||
| - org: kubernetes-sigs | ||
| slug: cluster-api-maintainers | ||
| 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:v20230406-23cb1879e3-1.26 | ||
| 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-e2e-main-1-21-1-22 | ||
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
|
|
||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-22-1-23-main | ||
| interval: 24h | ||
| decorate: true | ||
|
|
@@ -255,7 +204,7 @@ periodics: | |
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
|
|
||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-26-latest-main | ||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-26-1-27-main | ||
| interval: 24h | ||
| decorate: true | ||
| decoration_config: | ||
|
|
@@ -287,7 +236,7 @@ periodics: | |
| - name: KUBERNETES_VERSION_UPGRADE_FROM | ||
| value: "stable-1.26" | ||
| - name: KUBERNETES_VERSION_UPGRADE_TO | ||
| value: "ci/latest-1.27" | ||
| value: "stable-1.27" | ||
| - name: ETCD_VERSION_UPGRADE_TO | ||
| value: "3.5.6-0" | ||
| - name: COREDNS_VERSION_UPGRADE_TO | ||
|
|
@@ -302,6 +251,57 @@ periodics: | |
| cpu: 7300m | ||
| annotations: | ||
| testgrid-dashboards: sig-cluster-lifecycle-cluster-api | ||
| testgrid-tab-name: capi-e2e-main-1-26-latest | ||
| testgrid-tab-name: capi-e2e-main-1-26-1-27 | ||
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
|
|
||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-27-latest-main | ||
| interval: 24h | ||
| decorate: true | ||
| decoration_config: | ||
| gcs_credentials_secret: "" # Use workload identity for uploading artifacts | ||
| rerun_auth_config: | ||
| github_team_slugs: | ||
| - org: kubernetes-sigs | ||
| slug: cluster-api-maintainers | ||
| 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:v20230406-23cb1879e3-1.26 | ||
| args: | ||
| - runner.sh | ||
| - "./scripts/ci-e2e.sh" | ||
| env: | ||
| - name: KUBERNETES_VERSION_UPGRADE_FROM | ||
| value: "stable-1.27" | ||
| - name: KUBERNETES_VERSION_UPGRADE_TO | ||
| value: "ci/latest-1.28" | ||
| - name: ETCD_VERSION_UPGRADE_TO | ||
| value: "3.5.7-0" | ||
| - name: COREDNS_VERSION_UPGRADE_TO | ||
| value: "v1.10.1" | ||
| - 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-27-latest | ||
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -254,7 +254,7 @@ periodics: | |
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
|
|
||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-26-latest-release-1-4 | ||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-26-1-27-release-1-4 | ||
| interval: 24h | ||
| decorate: true | ||
| decoration_config: | ||
|
|
@@ -286,7 +286,7 @@ periodics: | |
| - name: KUBERNETES_VERSION_UPGRADE_FROM | ||
| value: "stable-1.26" | ||
| - name: KUBERNETES_VERSION_UPGRADE_TO | ||
| value: "ci/latest-1.27" | ||
| value: "stable-1.27" | ||
| - name: ETCD_VERSION_UPGRADE_TO | ||
| value: "3.5.6-0" | ||
| - name: COREDNS_VERSION_UPGRADE_TO | ||
|
|
@@ -301,6 +301,57 @@ periodics: | |
| cpu: 7300m | ||
| annotations: | ||
| testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.4 | ||
| testgrid-tab-name: capi-e2e-release-1-4-1-26-latest | ||
| testgrid-tab-name: capi-e2e-release-1-4-1-26-1-27 | ||
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
|
|
||
| - name: periodic-cluster-api-e2e-workload-upgrade-1-27-latest-release-1-4 | ||
| interval: 24h | ||
| decorate: true | ||
| decoration_config: | ||
| gcs_credentials_secret: "" # Use workload identity for uploading artifacts | ||
| rerun_auth_config: | ||
| github_team_slugs: | ||
| - org: kubernetes-sigs | ||
| slug: cluster-api-maintainers | ||
| labels: | ||
| preset-dind-enabled: "true" | ||
| preset-kind-volume-mounts: "true" | ||
| extra_refs: | ||
| - org: kubernetes-sigs | ||
| repo: cluster-api | ||
| base_ref: release-1.4 | ||
| 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:v20230406-23cb1879e3-1.26 | ||
| args: | ||
| - runner.sh | ||
| - "./scripts/ci-e2e.sh" | ||
| env: | ||
| - name: KUBERNETES_VERSION_UPGRADE_FROM | ||
| value: "stable-1.27" | ||
| - name: KUBERNETES_VERSION_UPGRADE_TO | ||
| value: "ci/latest-1.28" | ||
| - name: ETCD_VERSION_UPGRADE_TO | ||
| value: "3.5.7-0" | ||
| - name: COREDNS_VERSION_UPGRADE_TO | ||
| value: "v1.10.1" | ||
| - 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.4 | ||
| testgrid-tab-name: capi-e2e-release-1-4-1-27-latest | ||
| testgrid-alert-email: [email protected] | ||
| testgrid-num-failures-to-alert: "4" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the following is missing:
For the main branch:
Explanation:
With this PR we are supporting a new Kubernetes version v1.27. This moves our entire support range on the main branch up by one.
So KUBEBUILDER_ENVTEST_KUBERNETES_VERSION should be set to: v1.24.2
(we probably should improve the comment above the KUBEBUILDER_ENVTEST_KUBERNETES_VERSION env var here)
KUBERNETES_VERSION_MANAGEMENT should be set to "stable-1.24"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sbueringer thanks a lot for detailed explanation and review, I should have addressed all your comments in the last commit(ff2c96a). PTAL.
I will squash all commits once reviewers are happy with the state of the patch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks perfect, thank you!
Sounds reasonable :)