Merge branch 'main' into kr/helm-sync

Signed-off-by: Jan Schoone <[email protected]>

Author: jschoone

.builder-image-version.txt

@@ -1 +1 @@
-1.1.19
+1.1.22

.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.22
       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.22
       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$

.yamllint.yaml

@@ -17,13 +17,18 @@ rules:
     min-spaces-from-content: 1
 
 yaml-files:
-  - '*.yaml'
-  - '*.yml'
+  - "*.yaml"
+  - "*.yml"
 
 ignore:
-  - '**/vendor/**'
-  - '.cache'
+  - "**/vendor/**"
+  - ".cache"
   - _artifacts
   - config/crd/**/*.yaml
   - config/rbac/**/*.yaml
   - config/webhook/**/*.yaml
+  - test/releases/**
+  - test/cluster-stacks/**
+  - .release/**
+  - .cluster.yaml
+  - .clusterstack.yaml