K8s-9467 merge upstream v1.58.2 (#54)

* Bump go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc (kubermatic#1731) Bumps [go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.42.0 to 0.46.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@zpages/v0.42.0...zpages/v0.46.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Migrate to dl.k8s.io from kubernetes release bucket (kubermatic#1737) Signed-off-by: Waleed Malik <[email protected]> * Flatcar Support for GCE (kubermatic#1739) * Flatcar Support for GCE Signed-off-by: Waleed Malik <[email protected]> * Update compatibility matrix Signed-off-by: Waleed Malik <[email protected]> --------- Signed-off-by: Waleed Malik <[email protected]> * Update Prow jobs to build image with Go 1.21.5 (kubermatic#1746) * Update Prow jobs to build image with Go 1.21.5 Signed-off-by: Marvin Beckers <[email protected]> * Also update golang images Signed-off-by: Marvin Beckers <[email protected]> * Also update Dockerfile and Makefile Signed-off-by: Marvin Beckers <[email protected]> * Update OSM flags Signed-off-by: Marvin Beckers <[email protected]> * Use fixed build image Signed-off-by: Marvin Beckers <[email protected]> * ??? Signed-off-by: Marvin Beckers <[email protected]> --------- Signed-off-by: Marvin Beckers <[email protected]> * Deprecate sig-virtualization (kubermatic#1749) with merge of sig-virtualization into sig-cluster-management, there is no need for standalone OWNERS hierarchy for kubevirt Signed-off-by: Jan Wozniak <[email protected]> * kubevirt: allow setting storage volume access types (kubermatic#1740) this is important for live migration because only RWX volumes can be live migrated Signed-off-by: Jan Wozniak <[email protected]> * AWS: increase spot instance price (kubermatic#1754) Signed-off-by: Waleed Malik <[email protected]> * Adds field to check if a IP reservation is still valid, (kubermatic#1753) if the IP is no longer valid a new one is requested. This fixes a bug where we use an IP that expired already for a VM, if the VM provisioning failed, which then leads to a race condition. In which we wait for the VM provisioning to finish, but it can't due the IP being no longer useable, but we also never request a new IP in that case. Signed-off-by: Zofia hagenguth <[email protected]> * webhook: refactor to use controller-runtime server (kubermatic#1751) Refactor the webhook to use the controller-runtime provided webhook.Server instead of a plain HTTP server. The biggest benefit this brings, is it automatically loading changed certificate files instead of forever using the ones present when the server was started. This could have been implemented by using the controller-runtime CertWatcher manually, but that would've been more code and aligning machine-controller with the ecosystem-provided standards seems worth it. Signed-off-by: Mara Sophie Grosch <[email protected]> * Support for Kubernetes 1.29 (kubermatic#1755) * Add support for kubernetes v1.29 Signed-off-by: Waleed Malik <[email protected]> * Update dependencies and k8s API to v1.29 Signed-off-by: Waleed Malik <[email protected]> * Enable in-tree providers Signed-off-by: Waleed Malik <[email protected]> * Update fixtures Signed-off-by: Waleed Malik <[email protected]> * Refactored code Signed-off-by: Waleed Malik <[email protected]> --------- Signed-off-by: Waleed Malik <[email protected]> * Upgrade to Go 1.22 (kubermatic#1759) * Upgrade to Go 1.22 Signed-off-by: Waleed Malik <[email protected]> * Upgrade CRDs for OSM Signed-off-by: Waleed Malik <[email protected]> --------- Signed-off-by: Waleed Malik <[email protected]> * Update prow jobs and remove yamllint image (kubermatic#1764) Signed-off-by: Marvin Beckers <[email protected]> * Remove TORCX_BINDIR from containerd binary call (kubermatic#1760) Signed-off-by: Marvin Beckers <[email protected]> * Support Edge Provider in Machine Controller (kubermatic#1765) * support edge provider Signed-off-by: Moath Qasim <[email protected]> Signed-off-by: Moath Qasim <[email protected]> * fix linting Signed-off-by: Moath Qasim <[email protected]> Signed-off-by: Moath Qasim <[email protected]> --------- Signed-off-by: Moath Qasim <[email protected]> * fix syseleven changes * update fixtures * update go version in unit tests github workflow --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Waleed Malik <[email protected]> Signed-off-by: Marvin Beckers <[email protected]> Signed-off-by: Jan Wozniak <[email protected]> Signed-off-by: Zofia hagenguth <[email protected]> Signed-off-by: Mara Sophie Grosch <[email protected]> Signed-off-by: Moath Qasim <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Waleed Malik <[email protected]> Co-authored-by: Marvin Beckers <[email protected]> Co-authored-by: Jan Wozniak <[email protected]> Co-authored-by: Andromeda <[email protected]> Co-authored-by: Mara Sophie Grosch <[email protected]> Co-authored-by: Moath Qasim <[email protected]> Co-authored-by: Robert Nemeti <[email protected]>
syseleven · Feb 21, 2024 · b332154 · b332154
1 parent 9df6c46
commit b332154
Show file tree

Hide file tree

Showing 159 changed files with 6,947 additions and 2,228 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -15,7 +15,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.5
+          go-version-file: go.mod
           cache: true
       -
         name: Run the tests

diff --git a/.prow/e2e-features.yaml b/.prow/e2e-features.yaml
@@ -34,7 +34,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -63,7 +63,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -92,7 +92,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -119,7 +119,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/postsubmits.yaml b/.prow/postsubmits.yaml
@@ -26,7 +26,7 @@ postsubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - /bin/bash
             - -c
@@ -54,7 +54,7 @@ postsubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/upload-gocache.sh"
           resources:

diff --git a/.prow/provider-alibaba.yaml b/.prow/provider-alibaba.yaml
@@ -29,7 +29,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-anexia.yaml b/.prow/provider-anexia.yaml
@@ -31,7 +31,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-aws.yaml b/.prow/provider-aws.yaml
@@ -28,7 +28,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -60,7 +60,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           env:
             - name: OPERATING_SYSTEM_MANAGER
               value: "false"
@@ -93,7 +93,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -124,7 +124,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -156,7 +156,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -187,7 +187,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -218,7 +218,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -249,7 +249,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-azure.yaml b/.prow/provider-azure.yaml
@@ -28,7 +28,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -60,7 +60,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -93,7 +93,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-digitalocean.yaml b/.prow/provider-digitalocean.yaml
@@ -27,7 +27,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-equinix-metal.yaml b/.prow/provider-equinix-metal.yaml
@@ -28,7 +28,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-gcp.yaml b/.prow/provider-gcp.yaml
@@ -28,7 +28,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-hetzner.yaml b/.prow/provider-hetzner.yaml
@@ -26,7 +26,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-kubevirt.yaml b/.prow/provider-kubevirt.yaml
@@ -29,7 +29,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-linode.yaml b/.prow/provider-linode.yaml
@@ -28,7 +28,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-nutanix.yaml b/.prow/provider-nutanix.yaml
@@ -27,7 +27,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-openstack.yaml b/.prow/provider-openstack.yaml
@@ -29,7 +29,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -62,7 +62,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-scaleway.yaml b/.prow/provider-scaleway.yaml
@@ -27,7 +27,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-vmware-cloud-director.yaml b/.prow/provider-vmware-cloud-director.yaml
@@ -29,7 +29,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/provider-vsphere.yaml b/.prow/provider-vsphere.yaml
@@ -28,7 +28,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -60,7 +60,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -92,7 +92,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -124,7 +124,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

diff --git a/.prow/verify.yaml b/.prow/verify.yaml
@@ -21,7 +21,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: golang:1.21.5
+        - image: golang:1.22.0
           command:
             - make
           args:
@@ -42,7 +42,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: golang:1.21.5
+        - image: golang:1.22.0
           command:
             - make
           args:
@@ -63,7 +63,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: golangci/golangci-lint:v1.54.1
+        - image: golangci/golangci-lint:v1.56.0
           command:
             - make
           args:
@@ -83,11 +83,11 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/yamllint:0.1
+        - image: quay.io/kubermatic/build:go-1.22-node-18-3
           command:
-            - "sh"
-            - "-c"
-            - "yamllint -c .yamllint.conf ."
+            - make
+          args:
+            - yamllint
           resources:
             requests:
               memory: 32Mi
@@ -149,7 +149,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
+        - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-3
           command:
             - ./hack/verify-licenses.sh
           resources:
@@ -165,7 +165,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: golang:1.21.5
+        - image: golang:1.22.0
           command:
             - make
           args:

diff --git a/Dockerfile b/Dockerfile
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG GO_VERSION=1.21.5
+ARG GO_VERSION=1.22.0
 FROM docker.io/golang:${GO_VERSION} AS builder
 WORKDIR /go/src/github.com/kubermatic/machine-controller
 COPY . .
 RUN make all
 
-FROM alpine:3.17
+FROM alpine:3.19
 
 RUN apk add --no-cache ca-certificates cdrkit