From a9fa1e637acf30b309c81d30e9c42c6ec40cca57 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 22 Jun 2023 08:36:28 +0000 Subject: [PATCH] Align files --- .circleci/config.yml | 2 +- .github/dependabot.yml | 2 +- .../zz_generated.check_values_schema.yaml | 27 ++++++++++--------- .../zz_generated.create_release.yaml | 2 +- .../zz_generated.create_release_pr.yaml | 2 +- .github/workflows/zz_generated.gitleaks.yaml | 2 +- Makefile | 4 +-- Makefile.gen.app.mk | 2 +- Makefile.gen.go.mk | 2 +- 9 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0533714c..dff4393d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - architect: giantswarm/architect@4.28.1 + architect: giantswarm/architect@4.29.0 workflows: package-and-push-chart-on-tag: diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 97eaaa68..71b7cfbe 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.22.0 +# devctl@6.3.1 # version: 2 updates: diff --git a/.github/workflows/zz_generated.check_values_schema.yaml b/.github/workflows/zz_generated.check_values_schema.yaml index 6631d515..d87509a2 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.22.0 +# devctl@6.3.1 # name: 'Values and schema' on: @@ -13,6 +13,8 @@ on: - 'helm/**/values.schema.json' # schema - 'helm/**/ci/ci-values.yaml' # overrides for CI (can contain required entries) + push: {} + jobs: check: name: 'validate values.yaml against values.schema.json' @@ -30,15 +32,16 @@ jobs: - name: 'Check if values.yaml is a valid instance of values.schema.json' run: | - HELM_DIR=$(git diff --name-only origin/${GITHUB_BASE_REF} ${GITHUB_SHA} \ - | grep 'helm/[-a-z].*\/' | head -1 | awk -F '/' '{print $1"/"$2}') - VALUES=${HELM_DIR}/values.yaml - if [ -f ${HELM_DIR}/ci/ci-values.yaml ]; then - # merge ci-values.yaml into values.yaml (providing required values) - echo -e "\nMerged values:\n==============" - yq '. *= load("'${HELM_DIR}'/ci/ci-values.yaml")' ${HELM_DIR}/values.yaml | tee ${HELM_DIR}/combined-values.yaml - echo -e "\n==============\n" - VALUES=${HELM_DIR}/combined-values.yaml - fi + for chart_yaml in helm/*/Chart.yaml; do + helm_dir="${chart_yaml%/Chart.yaml}" + values=${helm_dir}/values.yaml + if [ -f ${helm_dir}/ci/ci-values.yaml ]; then + # merge ci-values.yaml into values.yaml (providing required values) + echo -e "\nMerged values:\n==============" + yq '. *= load("'${helm_dir}'/ci/ci-values.yaml")' ${helm_dir}/values.yaml | tee ${helm_dir}/combined-values.yaml + echo -e "\n==============\n" + values=${helm_dir}/combined-values.yaml + fi - ${HOME}/yajsv -s ${HELM_DIR}/values.schema.json ${VALUES} + ${HOME}/yajsv -s ${helm_dir}/values.schema.json ${values} + done diff --git a/.github/workflows/zz_generated.create_release.yaml b/.github/workflows/zz_generated.create_release.yaml index a6b058a3..6446af66 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.22.0 +# devctl@6.3.1 # 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 88659ec5..8b714ef0 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.22.0 +# devctl@6.3.1 # name: Create Release PR on: diff --git a/.github/workflows/zz_generated.gitleaks.yaml b/.github/workflows/zz_generated.gitleaks.yaml index 1c3e6bb7..e1ca75a2 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.22.0 +# devctl@6.3.1 # name: gitleaks diff --git a/Makefile b/Makefile index 5fae57d4..4ae00496 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.22.0 +# devctl@6.3.1 # 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 f5ce6d3d..ab6210d4 100644 --- a/Makefile.gen.app.mk +++ b/Makefile.gen.app.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.22.0 +# devctl@6.3.1 # ##@ App diff --git a/Makefile.gen.go.mk b/Makefile.gen.go.mk index 4d5762c2..19e55e86 100644 --- a/Makefile.gen.go.mk +++ b/Makefile.gen.go.mk @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated with: # -# devctl@5.22.0 +# devctl@6.3.1 # APPLICATION := $(shell go list -m | cut -d '/' -f 3)