Merge remote-tracking branch 'origin/main' into fix-latest-release

Author: guettli

.builder-image-version.txt

@@ -1 +1 @@
-1.1.19
+1.1.20

.github/actions/setup-go/action.yaml

@@ -6,6 +6,7 @@ runs:
     - name: Install go
       uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
+        go-version: "1.22"
         go-version-file: "go.mod"
         cache: true
         cache-dependency-path: go.sum

.github/renovate/golang.json5

@@ -4,7 +4,7 @@
   },
   // https://docs.renovatebot.com/configuration-options/#constraints
   "constraints": {
-    "go": "1.21"
+    "go": "1.22"
   },
   packageRules: [
     {

.github/workflows/pr-lint.yml

@@ -21,7 +21,7 @@ jobs:
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.19
+      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.20
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}
@@ -31,6 +31,8 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - uses: ./.github/actions/setup-go
+
       - name: Fixup git permissions
         # https://github.com/actions/checkout/issues/766
         shell: bash

.github/workflows/release.yml

@@ -139,12 +139,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install go
-        uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
-        with:
-          go-version-file: "go.mod"
-          cache: true
-          cache-dependency-path: go.sum
+
+      - uses: ./.github/actions/setup-go
 
       - name: install kustomize
         run: |

.github/workflows/schedule-scan-image.yml

@@ -9,7 +9,7 @@ jobs:
     name: Trivy
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.19
+      image: ghcr.io/sovereigncloudstack/cso-builder:1.1.20
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}

.github/workflows/test.yml

@@ -69,3 +69,19 @@ jobs:
           GO111MODULE: "on"
           GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
         run: make test-integration-workloadcluster
+
+      - name: Running integration tests github
+        env:
+          GIT_PROVIDER: github
+          GIT_ORG_NAME: SovereignCloudStack
+          GIT_REPOSITORY_NAME: cluster-stacks
+          GO111MODULE: "on"
+          GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
+        run: make test-integration-github
+
+      # - name: Running integration tests oci
+      #   env:
+      #     OCI_REGISTRY: registry.scs.community
+      #     OCI_REPOSITORY: registry.scs.community/csctl-oci/docker
+      #     GO111MODULE: "on"
+      #   run: make test-integration-oci

.gitignore

@@ -82,3 +82,6 @@ main
 *.tgz.yaml
 *.build.yaml
 .release
+
+# .config/go/telemetry/local/
+.config

.golangci.yaml

@@ -12,7 +12,7 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
+    - copyloopvar
     - forcetypeassert
     - gci
     - goconst
@@ -86,10 +86,7 @@ linters-settings:
     allow-unused: false
     allow-leading-space: false
     require-specific: true
-  staticcheck:
-    go: "1.21"
   stylecheck:
-    go: "1.21"
     checks: ["all", "-ST1006"]
     dot-import-whitelist:
       - "github.com/onsi/gomega"
@@ -101,6 +98,9 @@ linters-settings:
       - performance
       - experimental
       - opinionated
+    settings:
+      hugeParam:
+        sizeThreshold: 120
   revive:
     enable-all-rules: true
     rules:
@@ -223,8 +223,6 @@ linters-settings:
       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#struct-tag
       - name: struct-tag
         disabled: true
-  unused:
-    go: "1.21"
   usestdlibvars:
     # Suggest the use of http.MethodXX.
     # Default: true
@@ -247,9 +245,6 @@ linters-settings:
     # Suggest the use of rpc.DefaultXXPath.
     # Default: false
     default-rpc-path: true
-    # Suggest the use of os.DevNull.
-    # Default: false
-    os-dev-null: true
     # Suggest the use of sql.LevelXX.String().
     # Default: false
     sql-isolation-level: true
@@ -259,9 +254,6 @@ linters-settings:
     # Suggest the use of constant.Kind.String().
     # Default: false
     constant-kind: true
-    # Suggest the use of syslog.Priority.
-    # Default: false
-    syslog-priority: true
   wrapcheck:
     ignoreSigs:
       - status.Error(
@@ -285,11 +277,10 @@ issues:
     - linters:
         - wrapcheck
       path: _test\.go
+  exclude-dirs:
+    - vendor$
 run:
   timeout: 10m
-  go: "1.21"
+  go: "1.22"
   allow-parallel-runners: true
   modules-download-mode: vendor
-  skip-dirs:
-    - vendor$
-    - test/vendor$

Makefile

@@ -81,7 +81,7 @@ MGT_CLUSTER_KUBECONFIG ?= ".mgt-cluster-kubeconfig.yaml"
 
 # Kubebuilder.
 export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.3
-# versions 
+# versions
 CTLPTL_VERSION := 0.8.25
 
 ##@ Binaries
@@ -91,7 +91,7 @@ CTLPTL_VERSION := 0.8.25
 # need in CI for releasing
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/controller-gen)
 $(CONTROLLER_GEN): # Build controller-gen from tools folder.
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.2
 
 # need this in CI for releasing
 KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/kustomize)
@@ -304,7 +304,7 @@ $(WORKER_CLUSTER_KUBECONFIG):
 KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env --bin-dir $(abspath $(TOOLS_BIN_DIR)) -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
 
 .PHONY: test-integration
-test-integration: test-integration-workloadcluster  test-integration-github
+test-integration: test-integration-workloadcluster test-integration-github test-integration-oci
 	echo done
 
 .PHONY: test-unit
@@ -325,6 +325,12 @@ test-integration-github: $(SETUP_ENVTEST) $(GOTESTSUM)
 	CREATE_KIND_CLUSTER=false KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" $(GOTESTSUM) --junitfile=.coverage/junit.xml --format testname -- -mod=vendor \
 	-covermode=atomic -coverprofile=.coverage/cover.out -p=1  ./internal/test/integration/github/...
 
+.PHONY: test-integration-oci
+test-integration-oci: $(SETUP_ENVTEST) $(GOTESTSUM)
+	@mkdir -p $(shell pwd)/.coverage
+	CREATE_KIND_CLUSTER=false KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" $(GOTESTSUM) --junitfile=.coverage/junit.xml --format testname -- -mod=vendor \
+	-covermode=atomic -coverprofile=.coverage/cover.out -p=1  ./internal/test/integration/oci/...
+
 ##@ Verify
 ##########
 # Verify #
@@ -445,7 +451,7 @@ ifeq ($(BUILD_IN_CONTAINER),true)
 else
 	go version
 	golangci-lint version
-	GO111MODULE=on golangci-lint run -v --out-format=github-actions
+	GO111MODULE=on golangci-lint run -v --out-format=colored-line-number
 endif
 
 .PHONY: lint-yaml