Merge branch 'kubermatic:main' into main

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,30 @@
 **What this PR does / why we need it**:
 
-**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>` format, will close the issue(s) when PR gets merged)*:
+**Which issue(s) this PR fixes**:
+<!--optional, in `fixes #<issue number>` format, will close the issue(s) when PR gets merged-->
 Fixes #
 
+**What type of PR is this?**
+<!--
+Add one of the following kinds:
+/kind bug
+/kind cleanup
+/kind documentation
+/kind feature
+/kind design
+
+Optionally add one or more of the following kinds if applicable:
+/kind api-change
+/kind deprecation
+/kind failing-test
+/kind flake
+/kind regression
+/kind chore
+-->
+
 **Special notes for your reviewer**:
 
-**Optional Release Note**:
+**Does this PR introduce a user-facing change? Then add your Release Note here**:
 <!--
 Write your release note:
 1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string "action required".
@@ -14,3 +33,16 @@ Write your release note:
 ```release-note
 
 ```
+
+**Documentation**:
+<!--
+Please do one of the following options:
+- Add a link to the existing documentation
+- Add a link to the kubermatic/docs pull request
+- If no documentation change is applicable then add:
+  - TBD (documentation will be added later)
+  - NONE (no documentation needed for this PR)
+-->
+```documentation
+
+```

.golangci.yml

@@ -58,9 +58,4 @@ issues:
     - "cyclomatic complexity 31 of func `main` is high"
     - 'cyclomatic complexity 34 of func `\(\*provider\)\.getConfig` is high'
     - 'cyclomatic complexity 31 of func `\(\*provider\)\.Validate` is high'
-    - 'cyclomatic complexity 31 of func `\(\*provider\)\.Create` is high'
-    # SA1019: node.Spec.ConfigSource is deprecated: Previously used to specify the source of the node's configuration for the DynamicKubeletConfig feature.
-    # This feature is removed from Kubelets as of 1.24 and will be fully removed in 1.26. +optional
-    # We still support setting dynamic kubelet config feature in machine-controller. Hence, ignoring this error.
-    # TODO: remove this once we remove support for the feature in 1.23
-    - "SA1019: node.Spec.ConfigSource is deprecated"
+    - 'cyclomatic complexity 33 of func `\(\*provider\)\.Create` is high'

.prow/e2e-features.yaml

@@ -34,7 +34,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -43,10 +43,10 @@ presubmits:
             privileged: true
           resources:
             requests:
-              memory: 6Gi
+              memory: 7Gi
               cpu: 2
             limits:
-              memory: 6Gi
+              memory: 7Gi
 
   - name: pull-machine-controller-e2e-custom-ca
     always_run: true
@@ -63,7 +63,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -72,10 +72,10 @@ presubmits:
             privileged: true
           resources:
             requests:
-              memory: 6Gi
+              memory: 7Gi
               cpu: 2
             limits:
-              memory: 6Gi
+              memory: 7Gi
 
   - name: pull-machine-controller-e2e-ubuntu-upgrade
     always_run: true
@@ -91,7 +91,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -100,13 +100,13 @@ presubmits:
             privileged: true
           resources:
             requests:
-              memory: 6Gi
+              memory: 7Gi
               cpu: 2
             limits:
-              memory: 6Gi
+              memory: 7Gi
 
   - name: pull-machine-controller-e2e-deployment-upgrade
-    always_run: true
+    always_run: false
     decorate: true
     clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
     labels:
@@ -118,7 +118,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -127,7 +127,7 @@ presubmits:
             privileged: true
           resources:
             requests:
-              memory: 6Gi
+              memory: 7Gi
               cpu: 2
             limits:
-              memory: 6Gi
+              memory: 7Gi

.prow/postsubmits.yaml

@@ -18,15 +18,15 @@ postsubmits:
     decorate: true
     clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
     branches:
-      - ^master$
+      - ^main$
       # Match on tags
       - ^v\d+\.\d+\.\d+.*
     labels:
       preset-docker-push: "true"
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - /bin/bash
             - -c
@@ -49,12 +49,12 @@ postsubmits:
     decorate: true
     clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
     branches:
-      - ^master$
+      - ^main$
     labels:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/upload-gocache.sh"
           resources:

.prow/provider-alibaba.yaml

@@ -29,16 +29,19 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
             - "TestAlibabaProvisioningE2E"
+          env:
+            - name: CLOUD_PROVIDER
+              value: alibaba
           securityContext:
             privileged: true
           resources:
             requests:
-              memory: 6Gi
+              memory: 7Gi
               cpu: 2
             limits:
-              memory: 6Gi
+              memory: 7Gi

.prow/provider-anexia.yaml

@@ -27,16 +27,22 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.18-node-16-kind-0.14-9
+        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
             - "TestAnexiaProvisioningE2E"
+          env:
+            # OperatingSystemManager does not yet support Anexia
+            - name: OPERATING_SYSTEM_MANAGER
+              value: "false"
+            - name: CLOUD_PROVIDER
+              value: anexia
           securityContext:
             privileged: true
           resources:
             requests:
-              memory: 6Gi
+              memory: 7Gi
               cpu: 2
             limits:
-              memory: 6Gi
+              memory: 7Gi