From bdc57fa6e23e988d016f843c996290b0fefc9b03 Mon Sep 17 00:00:00 2001 From: ArchitectBot <61872893+architectbot@users.noreply.github.com> Date: Thu, 14 Sep 2023 15:01:02 +0200 Subject: [PATCH 1/4] Align files (#1175) Co-authored-by: github-actions <action@github.com> --- .../workflows/zz_generated.check_values_schema.yaml | 2 +- .github/workflows/zz_generated.create_release.yaml | 2 +- .github/workflows/zz_generated.create_release_pr.yaml | 2 +- .github/workflows/zz_generated.gitleaks.yaml | 2 +- Makefile | 2 +- Makefile.gen.app.mk | 2 +- Makefile.gen.go.mk | 2 +- renovate.json | 10 +++------- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index c22e5de9b..c450aeeaa 100644 --- 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 index 784c89ec5..57c5dd5ca 100644 --- 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 index 3dbc0db40..6f07166ea 100644 --- 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 index 860559f96..2c70a482b 100644 --- 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 index f307dee41..6b6025aaa 100644 --- 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 index a3ff3a0b3..0929f9089 100644 --- 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 index e64e87808..bcb0dd23a 100644 --- 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 index 4b53964f4..247af9d58 100644 --- 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" }, { @@ -31,10 +30,6 @@ "matchPackageNames": ["sigs.k8s.io/controller-runtime"], "allowedVersions": "< 0.7.0" }, - { - "matchPackageNames": ["github.com/docker/docker"], - "allowedVersions": "<= v23.0.1+incompatible" - }, { "matchPackagePatterns": ["^github.com/giantswarm/apiextensions*"], "allowedVersions": ">= 4.0.0" @@ -48,9 +43,10 @@ ".github/workflows/pre_commit_*.yaml" ], "ignoreDeps": [ + "actions/setup-go", "architect", - "zricethezav/gitleaks-action", - "actions/setup-go" + "github.com/imdario/mergo", + "zricethezav/gitleaks-action" ], "regexManagers": [ { From b4b72cbd7d1553d767945eebc5fb7df1b82c0dc0 Mon Sep 17 00:00:00 2001 From: Lukasz Jakimczuk <39192420+ljakimczuk@users.noreply.github.com> Date: Thu, 14 Sep 2023 16:25:46 +0200 Subject: [PATCH 2/4] Fixing helmclient (#1177) --- renovate.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/renovate.json b/renovate.json index 247af9d58..deebcf576 100644 --- a/renovate.json +++ b/renovate.json @@ -30,6 +30,10 @@ "matchPackageNames": ["sigs.k8s.io/controller-runtime"], "allowedVersions": "< 0.7.0" }, + { + "matchPackageNames": ["helm.sh/helm/v3"], + "allowedVersions": "<= 3.11.3" + }, { "matchPackagePatterns": ["^github.com/giantswarm/apiextensions*"], "allowedVersions": ">= 4.0.0" From a246dbd320078addb599a7d8f45bebbe0df4a87a Mon Sep 17 00:00:00 2001 From: Lukasz Jakimczuk <39192420+ljakimczuk@users.noreply.github.com> Date: Thu, 14 Sep 2023 16:59:03 +0200 Subject: [PATCH 3/4] Fixing prometheus (#1179) --- renovate.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/renovate.json b/renovate.json index deebcf576..75c86dfdd 100644 --- a/renovate.json +++ b/renovate.json @@ -34,6 +34,10 @@ "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*"], "allowedVersions": ">= 4.0.0" From a97260c48ea001d9459273d404bc1ba3d1b122bc Mon Sep 17 00:00:00 2001 From: ArchitectBot <61872893+architectbot@users.noreply.github.com> Date: Fri, 15 Sep 2023 17:16:19 +0200 Subject: [PATCH 4/4] Align files (#1180) Co-authored-by: github-actions <action@github.com> --- .github/workflows/zz_generated.add-team-labels.yaml | 2 +- .github/workflows/zz_generated.add-to-project-board.yaml | 4 ++-- renovate.json | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/zz_generated.add-team-labels.yaml b/.github/workflows/zz_generated.add-team-labels.yaml index 2d258807c..4a2db906d 100644 --- 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 index a8569831b..ae6b3986f 100644 --- 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/renovate.json b/renovate.json index 75c86dfdd..093d59dff 100644 --- a/renovate.json +++ b/renovate.json @@ -54,6 +54,7 @@ "actions/setup-go", "architect", "github.com/imdario/mergo", + "github.com/docker/distribution", "zricethezav/gitleaks-action" ], "regexManagers": [