From 02ed2021c89ba1c90bda1872b1a2994b094276a3 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 8 Mar 2023 09:42:48 +0100 Subject: [PATCH] Bump spire Helm Chart version from 0.3.0 to 0.4.0 * 7984bbd Add script to automate cutting a release * eb186ca Add values for server TTL configurables * f123296 Add a flag to configure the Kubernetes NodeAttestor (#83) * 0275569 Incorperate feedback * a00c97b Incorperate feedback * f93434a Make server service account allow list configurable * f0b7f5b Make spire agent server address configurable * cb627f0 Allow all subchart to conditionally disable (#90) * 2e9510f Switch to non root nginx (#89) * a901751 Fix Homepage URL * 06c395f Fix sources in Chart.yaml (#85) * d341c5a UpstreamAuthority cert-manager support (#82) * a82ee69 Make sure all configmap changes rollout * b7f8c86 Add extra initContainers, containers, volumes to agent and server * 81ac89a Add k8s 1.26.0 (Kind) to the test matrix * bb6abfc Merge pull request #76 from spiffe/dependabot/github_actions/sigstore/cosign-installer-3.0.1 * c0e5665 Bump cosign to v2.0.0 * d729a44 Bump sigstore/cosign-installer from 2.8.1 to 3.0.1 * fe7cd73 Merge pull request #74 from spiffe/arm64-support * a3c04c0 Update supported versions * 75480ed Bump spiffe-csi-driver image to 0.2.3 (arm64 support) * 79889ff Bump spiffe-oidc-discovery-provider image to 1.6.0 (arm64 support) * a632f76 Bump spire-agent image to 1.6.0 (arm64 support) * b92e81d Bump spire-server image to 1.6.0 (arm64 support) * fea2aa5 Fix sigstore/cosign-installer usage in release workflow * fe93346 Use quote function instead of actual quotes * 9480ab7 Add beta note to readme (#62) * 4681498 Better spire-server entry commands (#59) Signed-off-by: Marco Franssen --- charts/spire/Chart.yaml | 2 +- charts/spire/README.md | 2 +- release-chart.sh | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml index 00a0705..ef7008a 100644 --- a/charts/spire/Chart.yaml +++ b/charts/spire/Chart.yaml @@ -3,7 +3,7 @@ name: spire description: > A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager. type: application -version: 0.3.0 +version: 0.4.0 appVersion: "1.5.5" keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"] home: https://github.com/spiffe/helm-charts/tree/main/charts/spire diff --git a/charts/spire/README.md b/charts/spire/README.md index b99a99c..78d0d1d 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -2,7 +2,7 @@ -![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.5](https://img.shields.io/badge/AppVersion-1.5.5-informational?style=flat-square) +![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.5](https://img.shields.io/badge/AppVersion-1.5.5-informational?style=flat-square) A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager. diff --git a/release-chart.sh b/release-chart.sh index 99fbf7e..6b3f273 100755 --- a/release-chart.sh +++ b/release-chart.sh @@ -100,9 +100,11 @@ if [ ! -f "charts/${chart}/Chart.yaml" ] ; then print_error_and_exit "no chart named '${chart}' in charts folder" fi +branch_name="bump-${chart}-version" + git checkout main git pull -git checkout --track -B "bump-${chart}-version" main +git checkout --track -B "${branch_name}" main commits_since_previous_release="$(git log "${chart}-${current_version}..HEAD" --pretty=format:'* %h %s')" "${SED}" -i "s/version: ${current_version}/version: ${new_version}/" "charts/${chart}/Chart.yaml" ./helm-docs.sh @@ -131,5 +133,19 @@ Please review the below changelog to ensure this matches up with the semantic ve ${commits_since_previous_release} EOF +if [ -n "${dry_run}" ] ; then + echo >&2 + echo >&2 "If you choose not to submit the PR please run following commands to cleanup the branch:" + echo >&2 + echo >&2 " git checkout main" + echo >&2 " git push origin :${branch_name}" + echo >&2 " git branch -D ${branch_name}" + echo >&2 + echo >&2 'If you choose to submit the PR, please run following:' + echo >&2 + echo >&2 " gh pr merge --auto -r -d" + exit +fi + gh pr merge --auto -r -d git checkout main