Merge branch 'main' into feat-best-practices-values

sigstore · Feb 13, 2025 · 0aaf6d4 · 0aaf6d4
2 parents 0acc601 + 173e112
commit 0aaf6d4
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -66,7 +66,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
+        uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
 
       - name: Publish and Sign OCI Charts
         run: |

diff --git a/charts/rekor/Chart.yaml b/charts/rekor/Chart.yaml
@@ -4,7 +4,7 @@ description: Part of the sigstore project, Rekor is a timestamping server and tr
 
 type: application
 
-version: 1.6.2
+version: 1.6.5
 appVersion: 1.3.9
 
 keywords:
@@ -31,7 +31,7 @@ annotations:
     - name: curlimages/curl
       image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69
     - name: rekor-server
-      image: ghcr.io/sigstore/rekor/rekor-server:v1.3.9@sha256:9b10d2a1eb8180f9992f73269854328f0d5b27da5d9bfb70c65e1430355f3e96
+      image: ghcr.io/sigstore/rekor/rekor-server:v1.3.9@sha256:26d34133d458f07ccc35e057ec91e93543e879f5a025a09e8a791accd86cddd3
     - name: redis
       image: docker.io/redis:6.2.16-alpine3.20@sha256:2ba50e1ac3a0ea17b736ce9db2b0a9f6f8b85d4c27d5f5accc6a416d8f42c6d5
     - name: backfill-redis

diff --git a/charts/rekor/README.md b/charts/rekor/README.md
@@ -1,6 +1,6 @@
 # rekor
 
-![Version: 1.6.2](https://img.shields.io/badge/Version-1.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.9](https://img.shields.io/badge/AppVersion-1.3.9-informational?style=flat-square)
+![Version: 1.6.5](https://img.shields.io/badge/Version-1.6.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.9](https://img.shields.io/badge/AppVersion-1.3.9-informational?style=flat-square)
 
 Part of the sigstore project, Rekor is a timestamping server and transparency log for storing signatures, as well as an API based server for validation
 

diff --git a/charts/rekor/templates/_helpers.tpl b/charts/rekor/templates/_helpers.tpl
@@ -349,7 +349,11 @@ Server Arguments
 {{- end }}
 {{- if eq (.Values.server.searchIndex).storageProvider "mysql" }}
 {{- if and (.Values.mysql.gcp.enabled) (.Values.mysql.gcp.cloudsql.unixDomainSocket.enabled) }}
+{{- if .Values.mysql.gcp.cloudsql.iamUsername }}
+- {{ printf "--search_index.mysql.dsn=%s@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true" .Values.mysql.gcp.cloudsql.iamUsername .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
+{{- else }}
 - {{ printf "--search_index.mysql.dsn=$(MYSQL_USER):$(MYSQL_PASSWORD)@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true" .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
+{{- end }}
 {{- else }}
 - "--search_index.mysql.dsn=$(MYSQL_USER):$(MYSQL_PASSWORD)@tcp($(MYSQL_HOSTNAME):$(MYSQL_PORT))/$(MYSQL_DATABASE)"
 {{- end }}

diff --git a/charts/rekor/templates/server/deployment.yaml b/charts/rekor/templates/server/deployment.yaml
@@ -60,6 +60,9 @@ spec:
           image: "{{ template "rekor.image" .Values.mysql.gcp.cloudsql }}"
           command:
             - "/cloud-sql-proxy"
+            {{- if (((.Values.mysql).gcp).cloudsql).iamUsername }}
+            - "--auto-iam-authn"
+            {{- end }}
             {{- if ((((.Values.mysql).gcp).cloudsql).unixDomainSocket).enabled }}
             - "--unix-socket"
             - {{ .Values.mysql.gcp.cloudsql.unixDomainSocket.path | quote }}

diff --git a/charts/rekor/values.schema.json b/charts/rekor/values.schema.json
@@ -266,6 +266,9 @@
                         "instance": {
                             "type": "string"
                         },
+                        "iamUsername": {
+                            "type": "string"
+                        },
                         "scaffoldSQLProxy": {
                             "properties": {
                                 "registry": {

diff --git a/charts/scaffold/Chart.lock b/charts/scaffold/Chart.lock
@@ -4,7 +4,7 @@ dependencies:
   version: 2.6.5
 - name: rekor
   repository: https://sigstore.github.io/helm-charts
-  version: 1.6.2
+  version: 1.6.5
 - name: trillian
   repository: https://sigstore.github.io/helm-charts
   version: 0.3.0
@@ -17,5 +17,5 @@ dependencies:
 - name: tsa
   repository: https://sigstore.github.io/helm-charts
   version: 1.0.6
-digest: sha256:d408523043c179ed112e5d3afe30c0d1bc2b01cb61eb1db9cb82ba553f7ebf21
-generated: "2025-01-30T08:24:49.517372-03:00"
+digest: sha256:ce64e776b7c864d2a8343228a384bb8eb6123b1c91ec7da4813be6fc7bc40caa
+generated: "2025-02-10T11:37:33.609252-07:00"
diff --git a/charts/scaffold/Chart.yaml b/charts/scaffold/Chart.yaml
@@ -4,7 +4,7 @@ description: Scaffolding the components of the sigstore architecture
 
 type: application
 
-version: 0.6.70
+version: 0.6.72
 keywords:
   - security
   - pki
@@ -20,7 +20,7 @@ dependencies:
     repository: https://sigstore.github.io/helm-charts
     condition: fulcio.enabled
   - name: rekor
-    version: 1.6.2
+    version: 1.6.5
     repository: https://sigstore.github.io/helm-charts
     condition: rekor.enabled
   - name: trillian

diff --git a/charts/scaffold/README.md b/charts/scaffold/README.md
@@ -2,7 +2,7 @@
 
 <!-- This README.md is generated. Please edit README.md.gotmpl -->
 
-![Version: 0.6.70](https://img.shields.io/badge/Version-0.6.70-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.6.72](https://img.shields.io/badge/Version-0.6.72-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Scaffolding the components of the sigstore architecture
 
@@ -38,7 +38,7 @@ helm uninstall [RELEASE_NAME]
 |------------|------|---------|
 | https://sigstore.github.io/helm-charts | ctlog | 0.2.60 |
 | https://sigstore.github.io/helm-charts | fulcio | 2.6.5 |
-| https://sigstore.github.io/helm-charts | rekor | 1.6.2 |
+| https://sigstore.github.io/helm-charts | rekor | 1.6.5 |
 | https://sigstore.github.io/helm-charts | trillian | 0.3.0 |
 | https://sigstore.github.io/helm-charts | tsa | 1.0.6 |
 | https://sigstore.github.io/helm-charts | tuf | 0.1.22 |