From 055c799e2771bbc73915106b0e2853f2203bbd08 Mon Sep 17 00:00:00 2001 From: Jonny Stoten Date: Tue, 2 Jul 2024 15:58:09 +0100 Subject: [PATCH 1/4] Update chart version to 0.0.2 and rename chart dir --- .../{external-data-provider => attest-provider}/.helmignore | 0 charts/{external-data-provider => attest-provider}/Chart.yaml | 4 ++-- charts/{external-data-provider => attest-provider}/README.md | 0 .../templates/attest-provider-deployment.yaml} | 2 +- .../templates/attest-provider-service.yaml} | 0 .../templates/attest-provider.yaml} | 0 .../{external-data-provider => attest-provider}/values.yaml | 2 ++ 7 files changed, 5 insertions(+), 3 deletions(-) rename charts/{external-data-provider => attest-provider}/.helmignore (100%) rename charts/{external-data-provider => attest-provider}/Chart.yaml (86%) rename charts/{external-data-provider => attest-provider}/README.md (100%) rename charts/{external-data-provider/templates/external-data-provider-deployment.yaml => attest-provider/templates/attest-provider-deployment.yaml} (97%) rename charts/{external-data-provider/templates/external-data-provider-service.yaml => attest-provider/templates/attest-provider-service.yaml} (100%) rename charts/{external-data-provider/templates/external-data-provider.yaml => attest-provider/templates/attest-provider.yaml} (100%) rename charts/{external-data-provider => attest-provider}/values.yaml (86%) diff --git a/charts/external-data-provider/.helmignore b/charts/attest-provider/.helmignore similarity index 100% rename from charts/external-data-provider/.helmignore rename to charts/attest-provider/.helmignore diff --git a/charts/external-data-provider/Chart.yaml b/charts/attest-provider/Chart.yaml similarity index 86% rename from charts/external-data-provider/Chart.yaml rename to charts/attest-provider/Chart.yaml index f4a5d81..09429f7 100644 --- a/charts/external-data-provider/Chart.yaml +++ b/charts/attest-provider/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: A Helm chart for attest external data provider name: attest-provider -version: 0.0.1 +version: 0.0.2 home: https://github.com/docker/attest-provider sources: - https://github.com/docker/attest-provider.git -appVersion: 0.0.1 +appVersion: 0.0.2 diff --git a/charts/external-data-provider/README.md b/charts/attest-provider/README.md similarity index 100% rename from charts/external-data-provider/README.md rename to charts/attest-provider/README.md diff --git a/charts/external-data-provider/templates/external-data-provider-deployment.yaml b/charts/attest-provider/templates/attest-provider-deployment.yaml similarity index 97% rename from charts/external-data-provider/templates/external-data-provider-deployment.yaml rename to charts/attest-provider/templates/attest-provider-deployment.yaml index d0d9a65..7b7d41e 100644 --- a/charts/external-data-provider/templates/external-data-provider-deployment.yaml +++ b/charts/attest-provider/templates/attest-provider-deployment.yaml @@ -14,7 +14,7 @@ spec: run: attest-provider spec: containers: - - image: docker/attest-provider:dev + - image: {{ .Values.image }} imagePullPolicy: IfNotPresent name: attest-provider securityContext: diff --git a/charts/external-data-provider/templates/external-data-provider-service.yaml b/charts/attest-provider/templates/attest-provider-service.yaml similarity index 100% rename from charts/external-data-provider/templates/external-data-provider-service.yaml rename to charts/attest-provider/templates/attest-provider-service.yaml diff --git a/charts/external-data-provider/templates/external-data-provider.yaml b/charts/attest-provider/templates/attest-provider.yaml similarity index 100% rename from charts/external-data-provider/templates/external-data-provider.yaml rename to charts/attest-provider/templates/attest-provider.yaml diff --git a/charts/external-data-provider/values.yaml b/charts/attest-provider/values.yaml similarity index 86% rename from charts/external-data-provider/values.yaml rename to charts/attest-provider/values.yaml index 4d28e1f..7d707a1 100644 --- a/charts/external-data-provider/values.yaml +++ b/charts/attest-provider/values.yaml @@ -1,3 +1,5 @@ +image: "docker/attest-provider:0.0.2@sha256:de950017a4077835504f441d6a7224ea84b51c8d86e75e8c8ac8e307190724fd" + certDir: /certs clientCAFile: /tmp/gatekeeper/ca.crt port: 8090 From 318fd2e9042ffcf4f351f76ddb60ea6e0af32b43 Mon Sep 17 00:00:00 2001 From: Jonny Stoten Date: Tue, 2 Jul 2024 16:09:55 +0100 Subject: [PATCH 2/4] Fix path --- .github/workflows/workflow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 0f16024..a2ed076 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -112,7 +112,7 @@ jobs: ./scripts/generate-tls-cert.sh export GITHUB_TOKEN=${{ steps.app-token.outputs.token }} make docker-buildx kind-load-image - helm install attest-provider charts/external-data-provider \ + helm install attest-provider charts/attest-provider \ --set provider.tls.caBundle="$(cat certs/ca.crt | base64 | tr -d '\n\r')" \ --namespace security \ --wait --debug From 6f80686ebed1ae3db5f02a2e330c338cc704eb40 Mon Sep 17 00:00:00 2001 From: Jonny Stoten Date: Tue, 2 Jul 2024 16:44:10 +0100 Subject: [PATCH 3/4] Add volume mount for TLS certs --- .../templates/attest-provider-deployment.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/charts/attest-provider/templates/attest-provider-deployment.yaml b/charts/attest-provider/templates/attest-provider-deployment.yaml index 7b7d41e..b06772f 100644 --- a/charts/attest-provider/templates/attest-provider-deployment.yaml +++ b/charts/attest-provider/templates/attest-provider-deployment.yaml @@ -52,6 +52,11 @@ spec: mountPath: /tmp/gatekeeper readOnly: true {{- end }} + {{- if .Values.certSecret }} + - name: tls-cert-key + mountPath: {{ .Values.certDir }} + readOnly: true + {{- end }} restartPolicy: Always nodeSelector: kubernetes.io/os: linux @@ -66,3 +71,13 @@ spec: - key: ca.crt path: ca.crt {{- end }} + {{- if .Values.certSecret }} + - name: tls-cert-key + secret: + secretName: {{ .Values.certSecret }} + items: + - key: tls.crt + path: tls.crt + - key: tls.key + path: tls.key + {{- end }} From a37c181b9735d2635facac21eb1de216842080ba Mon Sep 17 00:00:00 2001 From: Jonny Stoten Date: Tue, 2 Jul 2024 16:50:31 +0100 Subject: [PATCH 4/4] Fix workflow --- .github/workflows/workflow.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index a2ed076..e1db399 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -114,6 +114,7 @@ jobs: make docker-buildx kind-load-image helm install attest-provider charts/attest-provider \ --set provider.tls.caBundle="$(cat certs/ca.crt | base64 | tr -d '\n\r')" \ + --set image="docker/attest-provider:dev" \ --namespace security \ --wait --debug