Merge branch 'master' into master#release#v6.8.1

giantswarm · Sep 19, 2023 · 6580329 · 6580329
2 parents 9a95e0f + a97260c
commit 6580329
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/zz_generated.add-team-labels.yaml b/.github/workflows/zz_generated.add-team-labels.yaml
@@ -45,7 +45,7 @@ jobs:
         done
         echo "EOF" >> $GITHUB_ENV
     - name: Apply label to issue
-      if: ${{ env.LABEL != '' }}
+      if: ${{ env.LABEL != '' && env.LABEL != 'null' && env.LABEL != null }}
       uses: actions-ecosystem/action-add-labels@v1
       with:
         github_token: ${{ secrets.ISSUE_AUTOMATION }}

diff --git a/.github/workflows/zz_generated.add-to-project-board.yaml b/.github/workflows/zz_generated.add-to-project-board.yaml
@@ -56,7 +56,7 @@ jobs:
 
         echo "BOARD=${BOARD}" >> $GITHUB_ENV
     - name: Add issue to personal board
-      if: ${{ env.BOARD != 'null' && env.BOARD != '' }}
+      if: ${{ env.BOARD != 'null' && env.BOARD != ''  && env.BOARD != null }}
       uses: actions/add-to-project@main
       with:
         project-url: ${{ env.BOARD }}
@@ -82,7 +82,7 @@ jobs:
 
         echo "BOARD=${BOARD}" >> $GITHUB_ENV
     - name: Add issue to team board
-      if: ${{ env.BOARD != 'null' && env.BOARD != '' }}
+      if: ${{ env.BOARD != 'null' && env.BOARD != '' && env.BOARD != null }}
       uses: actions/add-to-project@main
       with:
         project-url: ${{ env.BOARD }}

diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 name: 'Values and schema'
 on:

diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 name: Create Release
 on:

diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 name: Create Release PR
 on:

diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 name: gitleaks
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 
 include Makefile.*.mk

diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 
 ##@ App

diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk
@@ -1,6 +1,6 @@
 # DO NOT EDIT. Generated with:
 #
-#    devctl@6.7.0
+#    devctl@6.9.0
 #
 
 APPLICATION    := $(shell go list -m | cut -d '/' -f 3)

diff --git a/renovate.json b/renovate.json
@@ -19,7 +19,6 @@
     },
     {
       "excludePackagePatterns": [".*giantswarm.*" ,"^k8s.io", "^sigs.k8s.io"],
-      "excludePackageNames": ["github.com/imdario/mergo"],
       "groupName": "misc modules"
     },
     {
@@ -32,8 +31,12 @@
       "allowedVersions": "< 0.7.0"
     },
     {
-      "matchPackageNames": ["github.com/docker/docker"],
-      "allowedVersions": "<= v23.0.1+incompatible"
+      "matchPackageNames": ["helm.sh/helm/v3"],
+      "allowedVersions": "<= 3.11.3"
+    },
+    {
+      "matchPackageNames": ["github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring"],
+      "allowedVersions": "<= v0.64.0"
     },
     {
       "matchPackagePatterns": ["^github.com/giantswarm/apiextensions*"],
@@ -48,9 +51,11 @@
     ".github/workflows/pre_commit_*.yaml"
   ],
   "ignoreDeps": [
+    "actions/setup-go",
     "architect",
-    "zricethezav/gitleaks-action",
-    "actions/setup-go"
+    "github.com/imdario/mergo",
+    "github.com/docker/distribution",
+    "zricethezav/gitleaks-action"
   ],
   "regexManagers": [
     {