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

🌱 [WIP][Do not review] Experiment on backporting k8s support #10166

Closed
wants to merge 2 commits into from
Closed

🌱 [WIP][Do not review] Experiment on backporting k8s support #10166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98c764
Experiment on back porting k8s official support to older releases
fabriziopandini Feb 16, 2024
5f2d400
Temporarily add conformance tests to PR-Informing
fabriziopandini Feb 16, 2024
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
2 changes: 1 addition & 1 deletion test/e2e/cluster_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"k8s.io/utils/pointer"
)

var _ = Describe("When upgrading a workload cluster using ClusterClass and testing K8S conformance [Conformance] [K8s-Upgrade] [ClusterClass]", func() {
var _ = Describe("When upgrading a workload cluster using ClusterClass and testing K8S conformance [PR-Informing] [K8s-Upgrade] [ClusterClass]", func() {
ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
return ClusterUpgradeConformanceSpecInput{
E2EConfig: e2eConfig,
Expand Down
22 changes: 13 additions & 9 deletions test/e2e/config/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ providers:
files:
- sourcePath: "../data/shared/v1.3/metadata.yaml"
- name: v1.4.99 # next; use manifest from source files
value: ../../../config/default
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/core-components.yaml"
type: "url"
replacements:
- old: --metrics-bind-addr=localhost:8080
new: "--metrics-bind-addr=:8080\n - --logging-format=json"
Expand Down Expand Up @@ -133,7 +134,8 @@ providers:
files:
- sourcePath: "../data/shared/v1.3/metadata.yaml"
- name: v1.4.99 # next; use manifest from source files
value: ../../../bootstrap/kubeadm/config/default
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/bootstrap-components.yaml"
type: "url"
replacements:
- old: --metrics-bind-addr=localhost:8080
new: "--metrics-bind-addr=:8080\n - --logging-format=json"
Expand Down Expand Up @@ -189,7 +191,8 @@ providers:
files:
- sourcePath: "../data/shared/v1.3/metadata.yaml"
- name: v1.4.99 # next; use manifest from source files
value: ../../../controlplane/kubeadm/config/default
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/control-plane-components.yaml"
type: "url"
replacements:
- old: --metrics-bind-addr=localhost:8080
new: "--metrics-bind-addr=:8080\n - --logging-format=json"
Expand Down Expand Up @@ -254,7 +257,8 @@ providers:
- sourcePath: "../data/infrastructure-docker/v1.3/cluster-template-topology.yaml"
- sourcePath: "../data/infrastructure-docker/v1.3/clusterclass-quick-start.yaml"
- name: v1.4.99 # next; use manifest from source files
value: ../../../test/infrastructure/docker/config/default
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.5/infrastructure-components-development.yaml"
type: "url"
replacements:
- old: --metrics-bind-addr=localhost:8080
new: "--metrics-bind-addr=:8080\n - --logging-format=json"
Expand Down Expand Up @@ -290,11 +294,11 @@ variables:
# allowing the same e2e config file to be re-used in different Prow jobs e.g. each one with a K8s version permutation.
# The following Kubernetes versions should be the latest versions with already published kindest/node images.
# This avoids building node images in the default case which improves the test duration significantly.
KUBERNETES_VERSION_MANAGEMENT: "v1.27.3"
KUBERNETES_VERSION: "v1.27.3"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.26.6"
KUBERNETES_VERSION_UPGRADE_TO: "v1.27.3"
ETCD_VERSION_UPGRADE_TO: "3.5.7-0"
KUBERNETES_VERSION_MANAGEMENT: "v1.28.7"
KUBERNETES_VERSION: "v1.28.7"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.10"
KUBERNETES_VERSION_UPGRADE_TO: "v1.28.7"
ETCD_VERSION_UPGRADE_TO: "3.5.10-0"
COREDNS_VERSION_UPGRADE_TO: "v1.10.1"
DOCKER_SERVICE_DOMAIN: "cluster.local"
IP_FAMILY: "IPv4"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/k8s_conformance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo/v2"
)

var _ = Describe("When testing K8S conformance [Conformance]", func() {
var _ = Describe("When testing K8S conformance [PR-Informing]", func() {
K8SConformanceSpec(ctx, func() K8SConformanceSpecInput {
return K8SConformanceSpecInput{
E2EConfig: e2eConfig,
Expand Down
Loading