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

Cluster API: adjust jobs to new support policy #28842

Merged
merged 1 commit into from
Feb 24, 2023
+3 −241
Merged

Cluster API: adjust jobs to new support policy #28842

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 0 additions & 141 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
@@ -1,146 +1,5 @@
periodics:

- name: periodic-cluster-api-e2e-workload-upgrade-1-18-1-19-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.

Dropped 1.18 => 1.19 until 1.20 => 1.21

As main (upcoming v1.4) now only supports v1.21+ (xref: https://main.cluster-api.sigs.k8s.io/reference/versions.html)

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:v20230207-192d5afee3-1.26
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.18"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.19"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.4.13-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "1.7.0"
- 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-18-1-19
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-19-1-20-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:v20230207-192d5afee3-1.26
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.19"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.20"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.4.13-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "1.7.0"
- 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-19-1-20
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-20-1-21-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:v20230207-192d5afee3-1.26
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.20"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.21"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.4.13-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.8.0"
- 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-20-1-21
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-21-1-22-main
interval: 24h
decorate: true
Expand Down
9 changes: 3 additions & 6 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 @@ -48,7 +48,7 @@ periodics:
# To check the available envtest in Kubebuilder, please
# refer to https://github.com/kubernetes-sigs/kubebuilder/tree/tools-releases.
- name: KUBEBUILDER_ENVTEST_KUBERNETES_VERSION
Copy link
Member Author

Choose a reason for hiding this comment

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

Bumped mgmt cluster version of test-mink8s to v1.23 as new minimum mgmt cluster version is v1.23 now

value: "1.20.2"
value: "1.23.5"
resources:
requests:
cpu: 7300m
Expand Down Expand Up @@ -121,14 +121,11 @@ periodics:
- "./scripts/ci-e2e.sh"
env:
- name: GINKGO_SKIP
Copy link
Member Author

Choose a reason for hiding this comment

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

Bumped mgmt cluster version of e2e-mink8s to v1.23 as new minimum mgmt cluster version is v1.23 now

This also means we don't have to skip ClusterClass tests anymore as ClusterClass is supported on v1.23

Copy link
Member

@furkatgofurov7 furkatgofurov7 Feb 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Was wondering about ClusterClass change, found the answer here )

value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]|\\[ClusterClass\\]"
value: "\\[Conformance\\] \\[K8s-Upgrade\\]|\\[IPv6\\]"
# This value determines the minimum Kubernetes
# supported version for Cluster API management cluster.
- name: KUBERNETES_VERSION_MANAGEMENT
value: "stable-1.20"
# CAPI does not work with v1.20 if ClusterClass is enabled, so we have to disable it.
- name: CLUSTER_TOPOLOGY
value: "false"
value: "stable-1.23"
# we need privileged mode in order to do docker in docker
securityContext:
privileged: true
Expand Down
47 changes: 0 additions & 47 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 @@ -377,50 +377,3 @@ periodics:
testgrid-tab-name: capi-e2e-release-1-2-1-25-1-26
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-26-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:v20230207-192d5afee3-1.24
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.26"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.27"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.6-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-26-latest
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"
47 changes: 0 additions & 47 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-periodics-release-1-3-upgrades.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,50 +375,3 @@ periodics:
testgrid-tab-name: capi-e2e-release-1-3-1-25-1-26
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-workload-upgrade-1-26-latest-release-1-3
Copy link
Member Author

@sbueringer sbueringer Feb 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The Kubernetes 1.27 release is ~ 3 weeks after the v1.4 Cluster API release.

Because of that support for Kubernetes 1.27 will likely be backported to v1.4 but definitely not to v1.3

This means we don't have to aim for compatibility between Cluster API v1.3 and Kubernetes 1.27. It's enough to test main (upcoming v1.4) against Kubernetes latest (upcoming 1.27)

Copy link
Member Author

Choose a reason for hiding this comment

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

Same for v1.2 below

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.3
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:v20230207-192d5afee3-1.25
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.26"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "ci/latest-1.27"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.6-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.3
testgrid-tab-name: capi-e2e-release-1-3-1-26-latest
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"