From eeda0428b4d6744f325189c848c3b2d7732aeaf4 Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Sat, 8 Apr 2023 19:19:22 -0700 Subject: [PATCH 1/4] Add before-hook-creation delete policy Signed-off-by: Faisal Memon --- .../charts/spire-server/templates/post-install-hook.yaml | 8 ++++---- .../charts/spire-server/templates/post-upgrade-hook.yaml | 8 ++++---- .../charts/spire-server/templates/pre-upgrade-hook.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/charts/spire/charts/spire-server/templates/post-install-hook.yaml b/charts/spire/charts/spire-server/templates/post-install-hook.yaml index d30893d..1279198 100644 --- a/charts/spire/charts/spire-server/templates/post-install-hook.yaml +++ b/charts/spire/charts/spire-server/templates/post-install-hook.yaml @@ -9,7 +9,7 @@ metadata: {{- include "spire-server.labels" . | nindent 4 }} annotations: "helm.sh/hook": post-install - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -17,7 +17,7 @@ metadata: name: {{ include "spire-server.fullname" . }}-post-install annotations: "helm.sh/hook": post-install - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed rules: - apiGroups: ["admissionregistration.k8s.io"] resources: ["validatingwebhookconfigurations"] @@ -30,7 +30,7 @@ metadata: name: {{ include "spire-server.fullname" . }}-post-install annotations: "helm.sh/hook": post-install - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed subjects: - kind: ServiceAccount name: {{ include "spire-server.serviceAccountName" . }}-post-install @@ -49,7 +49,7 @@ metadata: {{- include "spire-server.labels" . | nindent 4 }} annotations: "helm.sh/hook": post-install - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed spec: template: metadata: diff --git a/charts/spire/charts/spire-server/templates/post-upgrade-hook.yaml b/charts/spire/charts/spire-server/templates/post-upgrade-hook.yaml index a6fd319..db0129a 100644 --- a/charts/spire/charts/spire-server/templates/post-upgrade-hook.yaml +++ b/charts/spire/charts/spire-server/templates/post-upgrade-hook.yaml @@ -9,7 +9,7 @@ metadata: {{- include "spire-server.labels" . | nindent 4 }} annotations: "helm.sh/hook": post-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -17,7 +17,7 @@ metadata: name: {{ include "spire-server.fullname" . }}-post-upgrade annotations: "helm.sh/hook": post-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed rules: - apiGroups: ["admissionregistration.k8s.io"] resources: ["validatingwebhookconfigurations"] @@ -30,7 +30,7 @@ metadata: name: {{ include "spire-server.fullname" . }}-post-upgrade annotations: "helm.sh/hook": post-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed subjects: - kind: ServiceAccount name: {{ include "spire-server.serviceAccountName" . }}-post-upgrade @@ -49,7 +49,7 @@ metadata: {{- include "spire-server.labels" . | nindent 4 }} annotations: "helm.sh/hook": post-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed spec: template: metadata: diff --git a/charts/spire/charts/spire-server/templates/pre-upgrade-hook.yaml b/charts/spire/charts/spire-server/templates/pre-upgrade-hook.yaml index bf4fa74..e07f9d9 100644 --- a/charts/spire/charts/spire-server/templates/pre-upgrade-hook.yaml +++ b/charts/spire/charts/spire-server/templates/pre-upgrade-hook.yaml @@ -9,7 +9,7 @@ metadata: {{- include "spire-server.labels" . | nindent 4 }} annotations: "helm.sh/hook": pre-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -17,7 +17,7 @@ metadata: name: {{ include "spire-server.fullname" . }}-pre-upgrade annotations: "helm.sh/hook": pre-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed rules: - apiGroups: ["admissionregistration.k8s.io"] resources: ["validatingwebhookconfigurations"] @@ -30,7 +30,7 @@ metadata: name: {{ include "spire-server.fullname" . }}-pre-upgrade annotations: "helm.sh/hook": pre-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed subjects: - kind: ServiceAccount name: {{ include "spire-server.serviceAccountName" . }}-pre-upgrade @@ -49,7 +49,7 @@ metadata: {{- include "spire-server.labels" . | nindent 4 }} annotations: "helm.sh/hook": pre-upgrade - "helm.sh/hook-delete-policy": hook-succeeded, hook-failed + "helm.sh/hook-delete-policy": before-hook-creation, hook-succeeded, hook-failed spec: template: metadata: From 67a63bfa9458cda2df2e18dcd495c3b332705d94 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Tue, 11 Apr 2023 10:10:41 +0200 Subject: [PATCH 2/4] Bump spire Helm Chart version from 0.6.1 to 0.6.2 * eeda042 Add before-hook-creation delete policy Signed-off-by: Marco Franssen --- charts/spire/Chart.yaml | 2 +- charts/spire/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml index 5b3182d..968b964 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.6.1 +version: 0.6.2 appVersion: "1.6.1" 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 d16ee1a..f5e7594 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -2,7 +2,7 @@ -![Version: 0.6.1](https://img.shields.io/badge/Version-0.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.1](https://img.shields.io/badge/AppVersion-1.6.1-informational?style=flat-square) +![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.1](https://img.shields.io/badge/AppVersion-1.6.1-informational?style=flat-square) [![Development Phase](https://github.com/spiffe/spiffe/blob/main/.img/maturity/dev.svg)](https://github.com/spiffe/spiffe/blob/main/MATURITY.md#development) 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. From b73f694a846065c2e3749d3c5213e7f4387cbbc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 10:54:31 +0200 Subject: [PATCH 3/4] Bump sigstore/cosign-installer from 3.0.1 to 3.0.2 (#204) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marco Franssen --- .github/workflows/helm-release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml index ec04daf..66dd0ca 100644 --- a/.github/workflows/helm-release.yaml +++ b/.github/workflows/helm-release.yaml @@ -29,9 +29,9 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Setup cosign - uses: sigstore/cosign-installer@v3.0.1 + uses: sigstore/cosign-installer@v3.0.2 with: - cosign-release: v2.0.0 + cosign-release: v2.0.1 - name: Set up Helm uses: azure/setup-helm@v3.5 From bd8bcb2ffa0a516d1424ba075ba78093bcb0c99e Mon Sep 17 00:00:00 2001 From: Faisal Memon Date: Wed, 12 Apr 2023 02:09:18 -0700 Subject: [PATCH 4/4] Add Faisal Memon as maintainer to spire chart (#208) --- charts/spire/Chart.yaml | 2 ++ charts/spire/README.md | 1 + 2 files changed, 3 insertions(+) diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml index 968b964..57af39c 100644 --- a/charts/spire/Chart.yaml +++ b/charts/spire/Chart.yaml @@ -16,6 +16,8 @@ maintainers: url: https://marcofranssen.nl - name: kfox1111 email: Kevin.Fox@pnnl.gov + - name: faisal-memon + email: fymemon@yahoo.com kubeVersion: ">=1.21.0-0" dependencies: - name: spire-server diff --git a/charts/spire/README.md b/charts/spire/README.md index f5e7594..6cfaca2 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -87,6 +87,7 @@ Now you can interact with the Spire agent socket from your own application. The | ---- | ------ | --- | | marcofranssen | | | | kfox1111 | | | +| faisal-memon | | | ## Source Code