From 8a49ffc9e4545c423b2de34d592116229b171f36 Mon Sep 17 00:00:00 2001 From: ArchitectBot <61872893+architectbot@users.noreply.github.com> Date: Mon, 23 Oct 2023 12:38:01 +0200 Subject: [PATCH] Align files (#1727) Co-authored-by: github-actions --- .circleci/config.yml | 2 +- .../zz_generated.add-team-labels.yaml | 4 +- .../zz_generated.add-to-project-board.yaml | 8 +-- .../zz_generated.check_values_schema.yaml | 10 +++- .../zz_generated.create_release.yaml | 22 +++---- .../zz_generated.create_release_pr.yaml | 12 ++-- .github/workflows/zz_generated.gitleaks.yaml | 6 +- .pre-commit-config.yaml | 2 +- Makefile | 4 +- Makefile.gen.app.mk | 2 +- Makefile.gen.go.mk | 2 +- renovate.json | 59 ------------------- renovate.json5 | 8 +++ 13 files changed, 48 insertions(+), 93 deletions(-) delete mode 100644 renovate.json create mode 100644 renovate.json5 diff --git a/.circleci/config.yml b/.circleci/config.yml index 2313c3c6e2..c669bccbee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,5 @@ orbs: - architect: giantswarm/architect@4.29.0 + architect: giantswarm/architect@4.33.0 version: 2.1 workflows: diff --git a/.github/workflows/zz_generated.add-team-labels.yaml b/.github/workflows/zz_generated.add-team-labels.yaml index 9e96e1d5d8..4a2db906d5 100644 --- a/.github/workflows/zz_generated.add-team-labels.yaml +++ b/.github/workflows/zz_generated.add-team-labels.yaml @@ -14,7 +14,7 @@ jobs: mkdir -p artifacts wget --header "Authorization: token ${{ secrets.ISSUE_AUTOMATION }}" \ -O artifacts/users.yaml \ - https://raw.githubusercontent.com/giantswarm/github/master/tools/issue-automation/user-mapping.yaml + https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -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 0392ed51f3..ae6b3986fa 100644 --- a/.github/workflows/zz_generated.add-to-project-board.yaml +++ b/.github/workflows/zz_generated.add-to-project-board.yaml @@ -16,7 +16,7 @@ jobs: mkdir -p artifacts wget --header "Authorization: token ${{ secrets.ISSUE_AUTOMATION }}" \ -O artifacts/users.yaml \ - https://raw.githubusercontent.com/giantswarm/github/master/tools/issue-automation/user-mapping.yaml + https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/user-mapping.yaml - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -28,7 +28,7 @@ jobs: mkdir -p artifacts wget --header "Authorization: token ${{ secrets.ISSUE_AUTOMATION }}" \ -O artifacts/labels.yaml \ - https://raw.githubusercontent.com/giantswarm/github/master/tools/issue-automation/label-mapping.yaml + https://raw.githubusercontent.com/giantswarm/github/main/tools/issue-automation/label-mapping.yaml - name: Upload Artifact uses: actions/upload-artifact@v3 with: @@ -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 index 014024dff5..3126cdf5a7 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@5.24.0 +# devctl@6.14.0 # name: 'Values and schema' on: @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -34,6 +34,12 @@ jobs: run: | for chart_yaml in helm/*/Chart.yaml; do helm_dir="${chart_yaml%/Chart.yaml}" + + if [ ! -f ${helm_dir}/values.schema.json ]; then + echo "Skipping validation for '${helm_dir}' folder, because 'values.schema.json' does not exist..." + continue + fi + values=${helm_dir}/values.yaml if [ -f ${helm_dir}/ci/ci-values.yaml ]; then # merge ci-values.yaml into values.yaml (providing required values) diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index 99146b0ba7..2df0ad9dc4 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@5.24.0 +# devctl@6.14.0 # name: Create Release on: @@ -15,7 +15,7 @@ on: jobs: debug_info: name: Debug info - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Print github context JSON run: | @@ -24,7 +24,7 @@ jobs: EOF gather_facts: name: Gather facts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: project_go_path: ${{ steps.get_project_go_path.outputs.path }} ref_version: ${{ steps.ref_version.outputs.refversion }} @@ -53,7 +53,7 @@ jobs: echo "version=${version}" >> $GITHUB_OUTPUT - name: Checkout code if: ${{ steps.get_version.outputs.version != '' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get project.go path id: get_project_go_path if: ${{ steps.get_version.outputs.version != '' }} @@ -84,7 +84,7 @@ jobs: echo "refversion=${refversion}" >> $GITHUB_OUTPUT update_project_go: name: Update project.go - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ needs.gather_facts.outputs.version != '' && needs.gather_facts.outputs.project_go_path != '' && needs.gather_facts.outputs.ref_version != 'true' }} needs: - gather_facts @@ -103,7 +103,7 @@ jobs: tarball_binary_path: "*/src/${binary}" smoke_test: "${binary} --version" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update project.go id: update_project_go env: @@ -143,10 +143,10 @@ jobs: version: "${{ needs.gather_facts.outputs.version }}" title: "Bump version to ${{ steps.update_project_go.outputs.new_version }}" run: | - hub pull-request -f -m "${{ env.title }}" -b ${{ env.base }} -h ${{ env.branch }} -r ${{ github.actor }} + gh pr create --title "${{ env.title }}" --body "" --base ${{ env.base }} --head ${{ env.branch }} --reviewer ${{ github.actor }} create_release: name: Create release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - gather_facts if: ${{ needs.gather_facts.outputs.version }} @@ -154,7 +154,7 @@ jobs: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ github.sha }} - name: Ensure correct version in project.go @@ -194,7 +194,7 @@ jobs: create-release-branch: name: Create release branch - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - gather_facts if: ${{ needs.gather_facts.outputs.version }} @@ -208,7 +208,7 @@ jobs: tarball_binary_path: "*/src/${binary}" smoke_test: "${binary} --version" - name: Check out the repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Clone the whole history, not just the most recent commit. - name: Fetch all tags and branches diff --git a/.github/workflows/zz_generated.create_release_pr.yaml b/.github/workflows/zz_generated.create_release_pr.yaml index a0d4dd34ef..40d9bb1b9b 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@5.24.0 +# devctl@6.14.0 # name: Create Release PR on: @@ -30,7 +30,7 @@ on: jobs: debug_info: name: Debug info - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Print github context JSON run: | @@ -39,7 +39,7 @@ jobs: EOF gather_facts: name: Gather facts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: repo_name: ${{ steps.gather_facts.outputs.repo_name }} branch: ${{ steps.gather_facts.outputs.branch }} @@ -136,7 +136,7 @@ jobs: fi create_release_pr: name: Create release PR - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: - gather_facts if: ${{ needs.gather_facts.outputs.skip != 'true' }} @@ -152,7 +152,7 @@ jobs: binary: "architect" version: "6.11.0" - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ needs.gather_facts.outputs.branch }} - name: Prepare release changes @@ -227,4 +227,4 @@ jobs: base: "${{ needs.gather_facts.outputs.base }}" version: "${{ needs.gather_facts.outputs.version }}" run: | - hub pull-request -f -m "Release v${{ env.version }}" -a ${{ github.actor }} -b ${{ env.base }} -h ${{ needs.gather_facts.outputs.branch }} + gh pr create --assignee ${{ github.actor }} --title "Release v${{ env.version }}" --body "" --base ${{ env.base }} --head "${{ needs.gather_facts.outputs.branch }}" diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index b60a8d2d51..6efd628434 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@5.24.0 +# devctl@6.14.0 # name: gitleaks @@ -10,8 +10,8 @@ jobs: gitleaks: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: '0' - name: gitleaks-action - uses: zricethezav/gitleaks-action@v1.6.0 + uses: giantswarm/gitleaks-action@main diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4c45adee6c..0f6e0ef660 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: args: [ --format=json ] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-added-large-files # check for unresolved merge conflicts diff --git a/Makefile b/Makefile index 3773f742af..0f7f27b803 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.24.0 +# devctl@6.14.0 # include Makefile.*.mk @@ -20,4 +20,4 @@ include Makefile.*.mk .PHONY: help help: ## Display this help. - @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-20s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) + @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z%\\\/_0-9-]+:.*?##/ { printf " \033[36m%-20s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) diff --git a/Makefile.gen.app.mk b/Makefile.gen.app.mk index 3cb20ba125..3787b35774 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.24.0 +# devctl@6.14.0 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index a8da27879b..e75cab8e7d 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.24.0 +# devctl@6.14.0 # APPLICATION := $(shell go list -m | cut -d '/' -f 3) diff --git a/renovate.json b/renovate.json deleted file mode 100644 index ff22ebb693..0000000000 --- a/renovate.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "extends": [ - "config:base", - ":reviewer(team:team-phoenix)" - ], - "labels": ["dependencies", "renovate"], - "packageRules": [ - { - "matchPackagePatterns": [".*giantswarm.*"], - "groupName": "giantswarm modules" - }, - { - "matchPackagePatterns": ["^k8s.io"], - "groupName": "k8s modules", - "allowedVersions": "< 0.21.0" - }, - { - "matchPackagePatterns": ["^sigs.k8s.io"], - "groupName": "sig k8s modules" - }, - { - "excludePackagePatterns": [".*giantswarm.*" ,"^k8s.io", "^sigs.k8s.io"], - "groupName": "misc modules" - }, - { - "matchPackagePatterns": ["^sigs.k8s.io/cluster*"], - "groupName": "capi modules", - "enabled": false - }, - { - "matchPackageNames": ["sigs.k8s.io/controller-runtime"], - "allowedVersions": "< 0.7.0" - }, - { - "matchPackagePatterns": ["^github.com/giantswarm/apiextensions*"], - "allowedVersions": ">= 4.0.0" - } - ], - "postUpdateOptions": ["gomodTidy", "gomodUpdateImportPaths"], - "dependencyDashboard": true, - "ignorePaths": [ - ".github/workflows/zz_generated.*", - ".github/workflows/codeql-analysis.yml" - ], - "ignoreDeps": [ - "architect", - "zricethezav/gitleaks-action", - "actions/setup-go" - ], - "regexManagers": [ - { - "fileMatch": ["^helm\\/.+\\/values\\.yaml$"], - "matchStrings": ["repo: (?.*)\n(\\s)*version: (?.*?)\n"], - "datasourceTemplate": "github-releases", - "extractVersionTemplate": "^v(?.*)$" - } - ], - "schedule": [ "after 6am on thursday" ] -} diff --git a/renovate.json5 b/renovate.json5 new file mode 100644 index 0000000000..a2072e6d47 --- /dev/null +++ b/renovate.json5 @@ -0,0 +1,8 @@ +{ + "extends": [ + // Base config - https://github.com/giantswarm/renovate-presets/blob/main/default.json5 + "github>giantswarm/renovate-presets:default.json5", + // Go specific config - https://github.com/giantswarm/renovate-presets/blob/main/lang-go.json5 + "github>giantswarm/renovate-presets:lang-go.json5", + ], +}