Skip to content

Commit

Permalink
Support for Kubernetes v1.27 (kubermatic#1623)
Browse files Browse the repository at this point in the history
* Support for Kubernetes v1.27

Signed-off-by: Waleed Malik <[email protected]>

* Update build image

Signed-off-by: Waleed Malik <[email protected]>

* Update go dependencies and re-generate fixture data

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

* Skip unsupported in-tree tests for AWS and OpenStack

Signed-off-by: Waleed Malik <[email protected]>

* Refactored code

Signed-off-by: Waleed Malik <[email protected]>

* Adjust spot pricing and tests

Signed-off-by: Waleed Malik <[email protected]>

---------

Signed-off-by: Waleed Malik <[email protected]>
  • Loading branch information
ahmedwaleedmalik authored and eiabea committed May 8, 2023
1 parent 29c1971 commit 53896bd
Show file tree
Hide file tree
Showing 113 changed files with 3,334 additions and 260 deletions.
8 changes: 4 additions & 4 deletions .prow/e2e-features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -63,7 +63,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -91,7 +91,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand All @@ -118,7 +118,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
4 changes: 2 additions & 2 deletions .prow/postsubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ postsubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- /bin/bash
- -c
Expand Down Expand Up @@ -54,7 +54,7 @@ postsubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/upload-gocache.sh"
resources:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-alibaba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-anexia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
16 changes: 8 additions & 8 deletions .prow/provider-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
env:
- name: OPERATING_SYSTEM_MANAGER
value: "false"
Expand Down Expand Up @@ -93,7 +93,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -124,7 +124,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -156,7 +156,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -187,7 +187,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -218,7 +218,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -249,7 +249,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
6 changes: 3 additions & 3 deletions .prow/provider-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -93,7 +93,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-digitalocean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-equinix-metal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-hetzner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-kubevirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-linode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-nutanix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
8 changes: 2 additions & 6 deletions .prow/provider-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
presubmits:
- name: pull-machine-controller-e2e-openstack
run_if_changed: "(pkg/cloudprovider/provider/openstack/|pkg/userdata)"
# We've made the E2E tests for OpenStack optional since in-tree cloud provider for OpenStack was removed with k8s v1.26. Since MC depends on the in-tree cloud provider
# the tests on k8s v1.26+ will fail.
# TODO: These tests shouldn't be marked as optional.
optional: true
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
Expand All @@ -32,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -64,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-scaleway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
4 changes: 2 additions & 2 deletions .prow/provider-vmware-cloud-director.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ presubmits:
always_run: false
decorate: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
run_if_changed: "(pkg/cloudprovider/provider/vmwareclouddirector/|pkg/userdata)"
run_if_changed: "(pkg/cloudprovider/provider/vmwareclouddirector/)"
labels:
preset-vcloud-director: "true"
preset-hetzner: "true"
Expand All @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
6 changes: 3 additions & 3 deletions .prow/provider-vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -92,7 +92,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.17-4
- image: quay.io/kubermatic/build:go-1.20-node-18-kind-0.18-1
command:
- ./hack/verify-licenses.sh
resources:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ machine-controller tries to follow the Kubernetes version

Currently supported K8S versions are:

- 1.27
- 1.26
- 1.25
- 1.24
Expand Down
Loading

0 comments on commit 53896bd

Please sign in to comment.