pull changes from upstream main

.gimps.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This is the configuration for https://github.com/xrstf/gimps.
+# This is the configuration for https://codeberg.org/xrstf/gimps.
 
 importOrder: [std, external, kubermatic, kubernetes]
 sets:

.gitignore

@@ -15,4 +15,5 @@ examples/*.srl
 /vendor
 .vscode
 .gitpod.yml
-cmd/machine-controller/__debug_bin
+cmd/machine-controller/__debug_bin*
+!pkg

.golangci.yml

@@ -1,28 +1,21 @@
+version: "2"
 run:
-  deadline: 20m
   build-tags:
     - e2e
-  skip-dirs:
-    - pkg/client
-    - pkg/machines
-
 linters:
+  default: none
   enable:
     - asciicheck
     - bidichk
     - bodyclose
-    - deadcode
     - depguard
     - durationcheck
     - errcheck
     - errname
     - errorlint
-    - exportloopref
     - goconst
     - gocyclo
     - godot
-    - gofmt
-    - gosimple
     - govet
     - importas
     - ineffassign
@@ -33,29 +26,92 @@ linters:
     - nosprintfhostport
     - predeclared
     - promlinter
-    - revive
     - staticcheck
-    - structcheck
-    - tenv
     - unconvert
     - unused
-    - varcheck
     - wastedassign
     - whitespace
-  disable-all: true
-
+  settings:
+    depguard:
+      rules:
+        main:
+          deny:
+            - pkg: io/ioutil
+              desc: https://go.dev/doc/go1.16#ioutil
+            - pkg: github.com/ghodss/yaml
+              desc: use sigs.k8s.io/yaml instead
+    govet:
+      enable:
+        - nilness # find tautologies / impossible conditions
+    importas:
+      alias:
+        # Machine Controller
+        - pkg: k8c.io/machine-controller/sdk/apis/(\w+)/(v[\w\d]+)
+          alias: $1$2
+        # Kubernetes
+        - pkg: k8s.io/api/(\w+)/(v[\w\d]+)
+          alias: $1$2
+        - pkg: k8s.io/apimachinery/pkg/apis/meta/v1
+          alias: metav1
+        - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
+          alias: apiextensionsv1
+        - pkg: k8s.io/apimachinery/pkg/api/errors
+          alias: apierrors
+        - pkg: k8s.io/apimachinery/pkg/util/errors
+          alias: kerrors
+        # Controller Runtime
+        - pkg: sigs.k8s.io/controller-runtime/pkg/client
+          alias: ctrlruntimeclient
+        # Other Kube APIs
+        - pkg: go.anx.io/go-anxcloud/pkg/apis/(\w+)/(v[\w\d]+)
+          alias: anx$1$2
+        - pkg: github.com/tinkerbell/tink/api/(v[\w\d]+)
+          alias: tink$1
+        - pkg: kubevirt.io/api/(\w+)/(v[\w\d]+)
+          alias: kubevirt$1$2
+        - pkg: kubevirt.io/containerized-data-importer-api/pkg/apis/(\w+)/(v[\w\d]+)
+          alias: cdi$1$2
+      no-unaliased: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - path: (.+)\.go$
+        text: func Convert_MachinesV1alpha1Machine_To_ClusterV1alpha1Machine should be ConvertMachinesV1alpha1MachineToClusterV1alpha1Machine
+      - path: (.+)\.go$
+        text: func Convert_MachineDeployment_ProviderConfig_To_ProviderSpec should be ConvertMachineDeploymentProviderConfigToProviderSpec
+      - path: (.+)\.go$
+        text: func Convert_MachineSet_ProviderConfig_To_ProviderSpec should be ConvertMachineSetProviderConfigToProviderSpec
+      - path: (.+)\.go$
+        text: func Convert_Machine_ProviderConfig_To_ProviderSpec should be ConvertMachineProviderConfigToProviderSpec
+      - path: (.+)\.go$
+        text: cyclomatic complexity [0-9]+ of func `\(\*provider\)\.Create` is high
+      - path: (.+)\.go$
+        text: cyclomatic complexity [0-9]+ of func `\(\*provider\)\.Validate` is high
+      - path: (.+)\.go$
+        text: cyclomatic complexity [0-9]+ of func `\(\*provider\)\.getConfig` is high
+      - path: (.+)\.go$
+        text: 'SA1019: s.server.IPv6 is deprecated'
+      - path: (.+)\.go$
+        text: 'SA1019: mgr.GetEventRecorderFor is deprecated'
+    paths:
+      - apis/machines
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  exclude:
-    - should have comment or be unexported
-    - should have comment \\(or a comment on this block\\) or be unexported
-    - func Convert_MachinesV1alpha1Machine_To_ClusterV1alpha1Machine should be ConvertMachinesV1alpha1MachineToClusterV1alpha1Machine
-    - func Convert_MachineDeployment_ProviderConfig_To_ProviderSpec should be ConvertMachineDeploymentProviderConfigToProviderSpec
-    - func Convert_MachineSet_ProviderConfig_To_ProviderSpec should be ConvertMachineSetProviderConfigToProviderSpec
-    - func Convert_Machine_ProviderConfig_To_ProviderSpec should be ConvertMachineProviderConfigToProviderSpec
-    - 'counter\.Set is deprecated: Use NewConstMetric'
-    - 'eviction\.go:221:4: the surrounding loop is unconditionally terminated'
-    - "cyclomatic complexity 31 of func `verifyMigrateUID` is high"
-    - "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 33 of func `\(\*provider\)\.Create` is high'
+  max-same-issues: 0
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - apis/machines
+      - third_party$
+      - builtin$
+      - examples$

.prow/e2e-features.yaml

@@ -17,6 +17,7 @@ presubmits:
     always_run: true
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     labels:
       preset-aws: "true"
       preset-azure: "true"
@@ -34,7 +35,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -52,6 +53,7 @@ presubmits:
     always_run: true
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     labels:
       preset-openstack: "true"
       preset-hetzner: "true"
@@ -63,7 +65,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -78,9 +80,11 @@ presubmits:
               memory: 7Gi
 
   - name: pull-machine-controller-e2e-ubuntu-upgrade
-    always_run: true
+    # In-tree CCM is not supported for openstack starting from k8s 1.26. Please see https://github.com/kubermatic/machine-controller/issues/1626 for updates.
+    # run_if_changed: "(pkg/cloudprovider/provider/openstack/|pkg/userdata)"
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     labels:
       preset-openstack: "true"
       preset-hetzner: "true"
@@ -91,7 +95,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:
@@ -109,6 +113,7 @@ presubmits:
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     labels:
       preset-hetzner: "true"
       preset-e2e-ssh: "true"
@@ -118,7 +123,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

.prow/postsubmits.yaml

@@ -17,6 +17,7 @@ postsubmits:
     always_run: true
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     branches:
       - ^main$
       # Match on tags
@@ -26,7 +27,7 @@ postsubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - /bin/bash
             - -c
@@ -48,13 +49,14 @@ postsubmits:
     always_run: true
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     branches:
       - ^main$
     labels:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - "./hack/ci/upload-gocache.sh"
           resources:

.prow/provider-alibaba.yaml

@@ -18,6 +18,7 @@ presubmits:
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     max_concurrency: 1
     labels:
       preset-alibaba: "true"
@@ -29,7 +30,7 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           command:
             - "./hack/ci/run-e2e-tests.sh"
           args:

.prow/provider-anexia.yaml

@@ -14,9 +14,14 @@
 
 presubmits:
   - name: pull-machine-controller-e2e-anexia
+    # We've made the E2E tests for Anexia optional since it doesn't support k8s v1.26 at the moment.
+    # the tests on k8s v1.26+ will fail.
+    # TODO: These tests shouldn't be marked as optional.
+    optional: true
     always_run: false
     decorate: true
     clone_uri: "ssh://git@github.com/kubermatic/machine-controller.git"
+    path_alias: k8c.io/machine-controller
     labels:
       preset-hetzner: "true"
       preset-e2e-ssh: "true"
@@ -27,15 +32,12 @@ presubmits:
       preset-kubeconfig-ci: "true"
     spec:
       containers:
-        - image: quay.io/kubermatic/build:go-1.19-node-18-kind-0.17-5
+        - image: quay.io/kubermatic/build:go-1.25-node-22-kind-0.30-8
           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: