From 0ba42e7e1056cf9c83b205b3128eaaafc7b32269 Mon Sep 17 00:00:00 2001 From: David Poltorak Date: Fri, 21 Jul 2023 17:05:12 +0100 Subject: [PATCH] chore: fixed new-lines at end of files, added release step to bump chart version --- .github/workflows/release.yml | 2 ++ infrastructure/charts/agent/templates/apisixtls.yaml | 2 +- infrastructure/charts/agent/templates/certificate.yaml | 2 +- infrastructure/charts/agent/templates/externalsecret.yaml | 2 +- infrastructure/charts/agent/templates/stringsecret.yaml | 2 +- infrastructure/charts/agent/templates/vault-unseal.yaml | 2 +- package.json | 6 ++++++ 7 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d850b5b863..527e6f8eda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,8 @@ jobs: uses: actions/setup-node@v3 with: node-version: "lts/*" + - name: Setup yq - portable yaml processor + uses: mikefarah/yq@v4.34.2 - uses: crazy-max/ghaction-import-gpg@v3 id: import_gpg with: diff --git a/infrastructure/charts/agent/templates/apisixtls.yaml b/infrastructure/charts/agent/templates/apisixtls.yaml index 565c47052d..d38dca4692 100644 --- a/infrastructure/charts/agent/templates/apisixtls.yaml +++ b/infrastructure/charts/agent/templates/apisixtls.yaml @@ -14,4 +14,4 @@ spec: secret: name: "prism-agent-base-path-secret" namespace: "{{ .Release.Namespace }}" -{{- end }} \ No newline at end of file +{{- end }} diff --git a/infrastructure/charts/agent/templates/certificate.yaml b/infrastructure/charts/agent/templates/certificate.yaml index 14f8df7a3c..4af02f1238 100644 --- a/infrastructure/charts/agent/templates/certificate.yaml +++ b/infrastructure/charts/agent/templates/certificate.yaml @@ -17,4 +17,4 @@ spec: {{- range .Values.ingress.applicationUrls }} - {{ . }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/infrastructure/charts/agent/templates/externalsecret.yaml b/infrastructure/charts/agent/templates/externalsecret.yaml index 22ddc72a76..39ced22be0 100644 --- a/infrastructure/charts/agent/templates/externalsecret.yaml +++ b/infrastructure/charts/agent/templates/externalsecret.yaml @@ -17,4 +17,4 @@ spec: .dockerconfigjson: "{{ `{{ .dockerconfigjson | b64dec }}` }}" dataFrom: - extract: - key: {{ .Values.secrets.dockerRegistryToken }} \ No newline at end of file + key: {{ .Values.secrets.dockerRegistryToken }} diff --git a/infrastructure/charts/agent/templates/stringsecret.yaml b/infrastructure/charts/agent/templates/stringsecret.yaml index 5b79e3cb87..879b682590 100644 --- a/infrastructure/charts/agent/templates/stringsecret.yaml +++ b/infrastructure/charts/agent/templates/stringsecret.yaml @@ -17,4 +17,4 @@ spec: encoding: "base64" length: "32" {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/infrastructure/charts/agent/templates/vault-unseal.yaml b/infrastructure/charts/agent/templates/vault-unseal.yaml index dee5ae650f..ba858f0c52 100644 --- a/infrastructure/charts/agent/templates/vault-unseal.yaml +++ b/infrastructure/charts/agent/templates/vault-unseal.yaml @@ -41,4 +41,4 @@ spec: - --shard=$(VAULT_UNSEAL_KEY_0) - --shard=$(VAULT_UNSEAL_KEY_1) - --shard=$(VAULT_UNSEAL_KEY_2) -{{- end }} \ No newline at end of file +{{- end }} diff --git a/package.json b/package.json index c1b1e98b48..f3f4a2bbf9 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,12 @@ "prepareCmd": "sbt \"release release-version ${nextRelease.version} next-version ${nextRelease.version}-SNAPSHOT with-defaults\"" } ], + [ + "@semantic-release/exec", + { + "prepareCmd": "yq -i '.appVersion = \"${nextRelease.version}\"' ./infrastructure/charts/agent/Chart.yaml" + } + ] [ "@semantic-release/exec", {