Skip to content

Commit d4c73a3

Browse files
bobcallawaybobcallaway
authored
bump trillian chart for v1.7.3 release and interpolateParams dsn parameter (#1207)
Signed-off-by: Bob Callaway <bcallaway@google.com>
1 parent 15f4307 commit d4c73a3

4 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎charts/trillian/Chart.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: |
55
66
type: application
77

8-
version: 0.3.15
9-
appVersion: 1.7.2
8+
version: 0.3.16
9+
appVersion: 1.7.3
1010

1111
keywords:
1212
- security
@@ -25,18 +25,18 @@ annotations:
2525
artifacthub.io/license: Apache-2.0
2626
artifacthub.io/images: |
2727
- name: curl
28-
image: docker.io/curlimages/curl:8.17.0@sha256:935d9100e9ba842cdb060de42472c7ca90cfe9a7c96e4dacb55e79e560b3ff40
28+
image: docker.io/curlimages/curl:8.21.0@sha256:7c12af72ceb38b7432ab85e1a265cff6ae58e06f95539d539b654f2cfa64bb13
2929
- name: netcat
3030
image: docker.io/subfuzion/netcat@sha256:7e808e84a631d9c2cd5a04f6a084f925ea388e3127553461536c1248c3333c8a
3131
- name: db_server
3232
image: gcr.io/trillian-opensource-ci/db_server:v1.5.3@sha256:2a685a38dd0129cceb646c232d285383f614c7e6fa51ff8f512aef78e4298461
3333
- name: log_server
34-
image: ghcr.io/sigstore/scaffolding/trillian_log_server:v1.7.2@sha256:d953a8eb3f9311e55ebee754de234f1f63e4db2d5e76c15326c288fb0887bb11
34+
image: ghcr.io/sigstore/scaffolding/trillian_log_server:v1.7.3@sha256:5a878e4e4f03790d2dda4b07a551ff9832128b307447d4156255c73690aa2da3
3535
- name: log_signer
36-
image: ghcr.io/sigstore/scaffolding/trillian_log_signer:v1.7.2@sha256:51631983a7e6f0b3faeb188c590e65b9793a6a6617e0631f8b4fd68e98d0460e
36+
image: ghcr.io/sigstore/scaffolding/trillian_log_signer:v1.7.3@sha256:28c5ff40963f83ffdf4e2d9ea1e4e2c877c33cfb0ff068f3daad1c1080aad0ac
3737
- name: cloud_proxy
38-
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.19.0-alpine@sha256:7d760797955e765e9f8c793e3b86be6ed0cbd5684d4b401c8cfa81d185176fc6
38+
image: gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.23.0-alpine@sha256:7cf46b7a0251486351cf7ed18dab04d96f05e26deb19d426e237f390e3baef14
3939
- name: scaffold_cloud_proxy
40-
image: ghcr.io/sigstore/scaffolding/cloudsqlproxy:v0.7.31@sha256:aa1120d0a203cd20878c1327cf9a0cdbff90bfd950cce2b86f99612faaf2093f
40+
image: ghcr.io/sigstore/scaffolding/cloudsqlproxy:v0.7.37@sha256:2cb6ff4ebe7ae82b4c39e5c2b40365b0e4a47adcc244167c7cd364a6f8a9fdda
4141
- name: createdb
4242
image: ghcr.io/sigstore/scaffolding/createdb:v0.7.31@sha256:3cee6c78973b82af6c3c3632bf8d44dafbab1632b3999a7292b170237c5dd5cc

‎charts/trillian/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- This README.md is generated. Please edit README.md.gotmpl -->
44

5-
![Version: 0.3.15](https://img.shields.io/badge/Version-0.3.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.2](https://img.shields.io/badge/AppVersion-1.7.2-informational?style=flat-square)
5+
![Version: 0.3.16](https://img.shields.io/badge/Version-0.3.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.3](https://img.shields.io/badge/AppVersion-1.7.3-informational?style=flat-square)
66

77
Trillian is a log that stores an accurate, immutable and verifiable history of activity.
88

@@ -62,7 +62,7 @@ helm uninstall [RELEASE_NAME]
6262
| initContainerImage.curl.imagePullPolicy | string | `"IfNotPresent"` | |
6363
| initContainerImage.curl.registry | string | `"docker.io"` | |
6464
| initContainerImage.curl.repository | string | `"curlimages/curl"` | |
65-
| initContainerImage.curl.version | string | `"sha256:935d9100e9ba842cdb060de42472c7ca90cfe9a7c96e4dacb55e79e560b3ff40"` | 8.17.0 |
65+
| initContainerImage.curl.version | string | `"sha256:7c12af72ceb38b7432ab85e1a265cff6ae58e06f95539d539b654f2cfa64bb13"` | 8.21.0 |
6666
| initContainerImage.netcat.imagePullPolicy | string | `"IfNotPresent"` | |
6767
| initContainerImage.netcat.registry | string | `"docker.io"` | |
6868
| initContainerImage.netcat.repository | string | `"subfuzion/netcat"` | |
@@ -73,7 +73,7 @@ helm uninstall [RELEASE_NAME]
7373
| logServer.image.pullPolicy | string | `"IfNotPresent"` | |
7474
| logServer.image.registry | string | `"ghcr.io"` | |
7575
| logServer.image.repository | string | `"sigstore/scaffolding/trillian_log_server"` | |
76-
| logServer.image.version | string | `"sha256:d953a8eb3f9311e55ebee754de234f1f63e4db2d5e76c15326c288fb0887bb11"` | trillian v1.7.2 (scaffolding v0.7.31) |
76+
| logServer.image.version | string | `"sha256:5a878e4e4f03790d2dda4b07a551ff9832128b307447d4156255c73690aa2da3"` | trillian v1.7.3 (scaffolding v0.7.37) |
7777
| logServer.livenessProbe | object | `{}` | |
7878
| logServer.name | string | `"log-server"` | |
7979
| logServer.nodeSelector | object | `{}` | |
@@ -106,7 +106,7 @@ helm uninstall [RELEASE_NAME]
106106
| logSigner.image.pullPolicy | string | `"IfNotPresent"` | |
107107
| logSigner.image.registry | string | `"ghcr.io"` | |
108108
| logSigner.image.repository | string | `"sigstore/scaffolding/trillian_log_signer"` | |
109-
| logSigner.image.version | string | `"sha256:51631983a7e6f0b3faeb188c590e65b9793a6a6617e0631f8b4fd68e98d0460e"` | trillian v1.7.2 (scaffolding v0.7.31) |
109+
| logSigner.image.version | string | `"sha256:28c5ff40963f83ffdf4e2d9ea1e4e2c877c33cfb0ff068f3daad1c1080aad0ac"` | trillian v1.7.3 (scaffolding v0.7.37) |
110110
| logSigner.livenessProbe | object | `{}` | |
111111
| logSigner.name | string | `"log-signer"` | |
112112
| logSigner.nodeSelector | object | `{}` | |
@@ -134,7 +134,7 @@ helm uninstall [RELEASE_NAME]
134134
| mysql.auth.username | string | `"mysql"` | |
135135
| mysql.enabled | bool | `true` | |
136136
| mysql.gcp.cloudsql.registry | string | `"gcr.io"` | |
137-
| mysql.gcp.cloudsql.repository | string | `"cloud-sql-connectors/cloud-sql-proxy:2.19.0-alpine"` | |
137+
| mysql.gcp.cloudsql.repository | string | `"cloud-sql-connectors/cloud-sql-proxy:2.23.0-alpine"` | |
138138
| mysql.gcp.cloudsql.resources.requests.cpu | string | `"1"` | |
139139
| mysql.gcp.cloudsql.resources.requests.memory | string | `"2Gi"` | |
140140
| mysql.gcp.cloudsql.securityContext.allowPrivilegeEscalation | bool | `false` | |
@@ -143,7 +143,7 @@ helm uninstall [RELEASE_NAME]
143143
| mysql.gcp.cloudsql.securityContext.runAsNonRoot | bool | `true` | |
144144
| mysql.gcp.cloudsql.unixDomainSocket.enabled | bool | `false` | |
145145
| mysql.gcp.cloudsql.unixDomainSocket.path | string | `"/cloudsql"` | |
146-
| mysql.gcp.cloudsql.version | string | `"sha256:7d760797955e765e9f8c793e3b86be6ed0cbd5684d4b401c8cfa81d185176fc6"` | crane digest gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.19.0-alpine |
146+
| mysql.gcp.cloudsql.version | string | `"sha256:7cf46b7a0251486351cf7ed18dab04d96f05e26deb19d426e237f390e3baef14"` | crane digest gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.23.0-alpine |
147147
| mysql.gcp.enabled | bool | `false` | |
148148
| mysql.gcp.instance | string | `""` | |
149149
| mysql.gcp.scaffoldSQLProxy.registry | string | `"ghcr.io"` | |
@@ -154,7 +154,7 @@ helm uninstall [RELEASE_NAME]
154154
| mysql.gcp.scaffoldSQLProxy.securityContext.capabilities.drop[0] | string | `"ALL"` | |
155155
| mysql.gcp.scaffoldSQLProxy.securityContext.readOnlyRootFilesystem | bool | `true` | |
156156
| mysql.gcp.scaffoldSQLProxy.securityContext.runAsNonRoot | bool | `true` | |
157-
| mysql.gcp.scaffoldSQLProxy.version | string | `"sha256:aa1120d0a203cd20878c1327cf9a0cdbff90bfd950cce2b86f99612faaf2093f"` | v0.7.31 which is based on cloud-sql-proxy:2.19.0-alpine |
157+
| mysql.gcp.scaffoldSQLProxy.version | string | `"sha256:2cb6ff4ebe7ae82b4c39e5c2b40365b0e4a47adcc244167c7cd364a6f8a9fdda"` | v0.7.37 which is based on cloud-sql-proxy:2.23.0-alpine |
158158
| mysql.hostname | string | `""` | |
159159
| mysql.image.pullPolicy | string | `"IfNotPresent"` | |
160160
| mysql.image.registry | string | `"gcr.io"` | |

‎charts/trillian/templates/_helpers.tpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@ Log Server Arguments
192192
{{- if eq (include "trillian.storageSystem" .) "mysql" }}
193193
{{- if and (.Values.mysql.gcp.enabled) (.Values.mysql.gcp.cloudsql.unixDomainSocket.enabled) }}
194194
{{- if .Values.mysql.gcp.cloudsql.iamUsername }}
195-
- {{ printf "--mysql_uri=%s@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true" .Values.mysql.gcp.cloudsql.iamUsername .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
195+
- {{ printf "--mysql_uri=%s@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true&interpolateParams=true" .Values.mysql.gcp.cloudsql.iamUsername .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
196196
{{- else }}
197-
- {{ printf "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true" .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
197+
- {{ printf "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true&interpolateParams=true" .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
198198
{{- end }}
199199
{{- else }}
200-
- "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@tcp($(MYSQL_HOSTNAME):$(MYSQL_PORT))/$(MYSQL_DATABASE)"
200+
- "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@tcp($(MYSQL_HOSTNAME):$(MYSQL_PORT))/$(MYSQL_DATABASE)?parseTime=true&interpolateParams=true"
201201
{{- end }}
202202
{{- end }}
203203
- {{ printf "--rpc_endpoint=0.0.0.0:%d" (.Values.logServer.portRPC | int) | quote }}
@@ -217,12 +217,12 @@ Log Signer Arguments
217217
{{- if eq (include "trillian.storageSystem" .) "mysql" }}
218218
{{- if and (.Values.mysql.gcp.enabled) (.Values.mysql.gcp.cloudsql.unixDomainSocket.enabled) }}
219219
{{- if .Values.mysql.gcp.cloudsql.iamUsername }}
220-
- {{ printf "--mysql_uri=%s@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true" .Values.mysql.gcp.cloudsql.iamUsername .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
220+
- {{ printf "--mysql_uri=%s@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true&interpolateParams=true" .Values.mysql.gcp.cloudsql.iamUsername .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
221221
{{- else }}
222-
- {{ printf "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true" .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
222+
- {{ printf "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@unix(%s/%s)/$(MYSQL_DATABASE)?parseTime=true&interpolateParams=true" .Values.mysql.gcp.cloudsql.unixDomainSocket.path .Values.mysql.gcp.instance | quote }}
223223
{{- end }}
224224
{{- else }}
225-
- "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@tcp($(MYSQL_HOSTNAME):$(MYSQL_PORT))/$(MYSQL_DATABASE)"
225+
- "--mysql_uri=$(MYSQL_USER):$(MYSQL_PASSWORD)@tcp($(MYSQL_HOSTNAME):$(MYSQL_PORT))/$(MYSQL_DATABASE)?parseTime=true&interpolateParams=true"
226226
{{- end }}
227227
{{- end }}
228228
- {{ printf "--rpc_endpoint=0.0.0.0:%d" (.Values.logSigner.portRPC | int) | quote }}

‎charts/trillian/values.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ initContainerImage:
88
curl:
99
registry: docker.io
1010
repository: curlimages/curl
11-
# -- 8.17.0
12-
version: sha256:935d9100e9ba842cdb060de42472c7ca90cfe9a7c96e4dacb55e79e560b3ff40
11+
# -- 8.21.0
12+
version: sha256:7c12af72ceb38b7432ab85e1a265cff6ae58e06f95539d539b654f2cfa64bb13
1313
imagePullPolicy: IfNotPresent
1414
netcat:
1515
registry: docker.io
@@ -31,8 +31,8 @@ mysql:
3131
scaffoldSQLProxy:
3232
registry: ghcr.io
3333
repository: sigstore/scaffolding/cloudsqlproxy
34-
# -- v0.7.31 which is based on cloud-sql-proxy:2.19.0-alpine
35-
version: sha256:aa1120d0a203cd20878c1327cf9a0cdbff90bfd950cce2b86f99612faaf2093f
34+
# -- v0.7.37 which is based on cloud-sql-proxy:2.23.0-alpine
35+
version: sha256:2cb6ff4ebe7ae82b4c39e5c2b40365b0e4a47adcc244167c7cd364a6f8a9fdda
3636
resources:
3737
requests:
3838
memory: "2Gi"
@@ -46,9 +46,9 @@ mysql:
4646
- ALL
4747
cloudsql:
4848
registry: gcr.io
49-
repository: cloud-sql-connectors/cloud-sql-proxy:2.19.0-alpine
50-
# -- crane digest gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.19.0-alpine
51-
version: sha256:7d760797955e765e9f8c793e3b86be6ed0cbd5684d4b401c8cfa81d185176fc6
49+
repository: cloud-sql-connectors/cloud-sql-proxy:2.23.0-alpine
50+
# -- crane digest gcr.io/cloud-sql-connectors/cloud-sql-proxy:2.23.0-alpine
51+
version: sha256:7cf46b7a0251486351cf7ed18dab04d96f05e26deb19d426e237f390e3baef14
5252
resources:
5353
requests:
5454
memory: "2Gi"
@@ -140,8 +140,8 @@ logServer:
140140
registry: ghcr.io
141141
repository: sigstore/scaffolding/trillian_log_server
142142
pullPolicy: IfNotPresent
143-
# -- trillian v1.7.2 (scaffolding v0.7.31)
144-
version: sha256:d953a8eb3f9311e55ebee754de234f1f63e4db2d5e76c15326c288fb0887bb11
143+
# -- trillian v1.7.3 (scaffolding v0.7.37)
144+
version: sha256:5a878e4e4f03790d2dda4b07a551ff9832128b307447d4156255c73690aa2da3
145145
podAnnotations: {}
146146
podLabels: {}
147147
nodeSelector: {}
@@ -180,8 +180,8 @@ logSigner:
180180
registry: ghcr.io
181181
repository: sigstore/scaffolding/trillian_log_signer
182182
pullPolicy: IfNotPresent
183-
# -- trillian v1.7.2 (scaffolding v0.7.31)
184-
version: sha256:51631983a7e6f0b3faeb188c590e65b9793a6a6617e0631f8b4fd68e98d0460e
183+
# -- trillian v1.7.3 (scaffolding v0.7.37)
184+
version: sha256:28c5ff40963f83ffdf4e2d9ea1e4e2c877c33cfb0ff068f3daad1c1080aad0ac
185185
podAnnotations: {}
186186
podLabels: {}
187187
nodeSelector: {}

0 commit comments

Comments
 (0)