diff --git a/Dockerfile b/Dockerfile index 87f5097..fd380e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,4 +20,5 @@ ENV VAULT_ADDR= COPY --from=certs /etc/ssl/certs /etc/ssl/certs COPY --from=builder build/bin/spiffe-vault /usr/local/bin/spiffe-vault COPY --from=vault-binary bin/vault /usr/local/bin/vault +COPY --from=gcr.io/projectsigstore/cosign:v1.9.1 /ko-app/cosign /usr/local/bin/cosign ENTRYPOINT [ "/usr/local/bin/spiffe-vault" ] diff --git a/charts/spiffe-vault/Chart.yaml b/charts/spiffe-vault/Chart.yaml index 17e7d0a..d01d700 100644 --- a/charts/spiffe-vault/Chart.yaml +++ b/charts/spiffe-vault/Chart.yaml @@ -21,4 +21,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.1.0" +appVersion: "v0.3.0" diff --git a/charts/spiffe-vault/templates/spiffe-vault.yaml b/charts/spiffe-vault/templates/spiffe-vault.yaml index 6d76751..9960d63 100644 --- a/charts/spiffe-vault/templates/spiffe-vault.yaml +++ b/charts/spiffe-vault/templates/spiffe-vault.yaml @@ -36,9 +36,11 @@ spec: - name: spire-agent-sockets mountPath: /var/run/spire/sockets readOnly: true + {{- if .Values.docker.enabled }} - name: docker-certs mountPath: /certs/client readOnly: true + {{- end }} {{- if .Values.docker.enabled }} - name: dind-daemon securityContext: @@ -53,8 +55,10 @@ spec: volumeMounts: - name: docker-graph-storage mountPath: /var/lib/docker + {{- if .Values.docker.enabled }} - name: docker-certs mountPath: /certs/client + {{- end }} {{- end }} restartPolicy: OnFailure {{- with .Values.nodeSelector }} diff --git a/charts/spiffe-vault/values.yaml b/charts/spiffe-vault/values.yaml index ae6a150..0587355 100644 --- a/charts/spiffe-vault/values.yaml +++ b/charts/spiffe-vault/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: - repository: philips-software/spiffe-vault + repository: philipssoftware/spiffe-vault pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: ""