From 26f380e8dc0679d029ee398bab03c7cf00da736a Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Wed, 13 Nov 2024 16:54:25 +0200 Subject: [PATCH 1/4] update minio image --- charts/testkube-enterprise/Chart.lock | 6 +++--- charts/testkube-enterprise/Chart.yaml | 2 +- charts/testkube-enterprise/charts/minio/Chart.lock | 6 +++--- charts/testkube-enterprise/charts/minio/Chart.yaml | 2 +- charts/testkube-enterprise/charts/minio/values.yaml | 2 +- charts/testkube-enterprise/values.yaml | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/testkube-enterprise/Chart.lock b/charts/testkube-enterprise/Chart.lock index 0865716a..90834dc4 100644 --- a/charts/testkube-enterprise/Chart.lock +++ b/charts/testkube-enterprise/Chart.lock @@ -25,6 +25,6 @@ dependencies: version: 1.2.6-3 - name: minio repository: file://./charts/minio - version: 14.8.3-1 -digest: sha256:3f744059030e29edfb75007b27f1e3faf408fd20ba18b52e6b4f14918d3ea2d9 -generated: "2024-11-13T10:16:21.478109127Z" + version: 14.8.3-2 +digest: sha256:9c1c026538707ebd5f87b88b60f0d8e9a79acadb6c2fb314f55629d127c7d57c +generated: "2024-11-13T16:52:30.689099+02:00" diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml index d0d087f3..647322d9 100644 --- a/charts/testkube-enterprise/Chart.yaml +++ b/charts/testkube-enterprise/Chart.yaml @@ -34,7 +34,7 @@ dependencies: version: 1.2.6-3 repository: "file://./charts/nats" - name: minio - version: 14.8.3-1 + version: 14.8.3-2 repository: file://./charts/minio condition: minio.enabled maintainers: diff --git a/charts/testkube-enterprise/charts/minio/Chart.lock b/charts/testkube-enterprise/charts/minio/Chart.lock index 1c098fd3..22cc3049 100644 --- a/charts/testkube-enterprise/charts/minio/Chart.lock +++ b/charts/testkube-enterprise/charts/minio/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.26.0 -digest: sha256:5ff7837915aef0067bd32271ee2b10c990774c16c4b6fe0a7c5eb6e53530ce08 -generated: "2024-10-31T09:35:39.451559083Z" + version: 2.27.0 +digest: sha256:b711ab5874abf868a0c64353a790f17771758cee6f802acb9819be004c8460af +generated: "2024-11-13T16:53:48.961412+02:00" diff --git a/charts/testkube-enterprise/charts/minio/Chart.yaml b/charts/testkube-enterprise/charts/minio/Chart.yaml index c589b3e3..f608487f 100644 --- a/charts/testkube-enterprise/charts/minio/Chart.yaml +++ b/charts/testkube-enterprise/charts/minio/Chart.yaml @@ -34,4 +34,4 @@ maintainers: name: minio sources: - https://github.com/bitnami/charts/tree/main/bitnami/minio -version: 14.8.3-1 +version: 14.8.3-2 diff --git a/charts/testkube-enterprise/charts/minio/values.yaml b/charts/testkube-enterprise/charts/minio/values.yaml index f1fcf829..583f0a47 100644 --- a/charts/testkube-enterprise/charts/minio/values.yaml +++ b/charts/testkube-enterprise/charts/minio/values.yaml @@ -74,7 +74,7 @@ extraDeploy: [] image: registry: docker.io repository: bitnami/minio - tag: 2024.10.29-debian-12-r0 + tag: 2024.11.7-debian-12-r1 digest: "" ## Specify a imagePullPolicy ## ref: https://kubernetes.io/docs/concepts/containers/images/#pre-pulled-images diff --git a/charts/testkube-enterprise/values.yaml b/charts/testkube-enterprise/values.yaml index 89c7429b..2940c76b 100644 --- a/charts/testkube-enterprise/values.yaml +++ b/charts/testkube-enterprise/values.yaml @@ -120,10 +120,10 @@ minio: # -- Common labels which will be added to all MinIO resources commonLabels: *common_labels # Uncomment if you want to provide different image settings - # image: - # registry: docker.io - # repository: bitnami/minio - # tag: 2023.11.20-debian-11-r0 + image: + registry: docker.io + repository: bitnami/minio + tag: 2024.11.7-debian-12-r1 # digest: "" # pullPolicy: IfNotPresent # Uncomment if you want to provide different client image settings From 131bf39eb05c8ce5f2611c83655da6fb46fc40c3 Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Thu, 14 Nov 2024 18:08:57 +0200 Subject: [PATCH 2/4] update imagepullSecrets --- .../nats-box/deployment/pod-template.yaml | 16 +++++++++++---- .../nats/files/stateful-set/pod-template.yaml | 20 +++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml b/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml index eca5a3e4..b6738898 100644 --- a/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml +++ b/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml @@ -9,13 +9,21 @@ spec: # service discovery uses DNS; don't need service env vars enableServiceLinks: false - + {{- with (default .Values.global.image.pullSecretNames .Values.global.imagePullSecrets) }} imagePullSecrets: - {{- range . }} + {{- range . }} + {{- if typeIs "string" . }} - name: {{ . | quote }} - {{- end }} - {{- end }} + {{- else if typeIsLike "map[string]interface {}" . }} + {{- if hasKey . "name" }} + - name: {{ .name | quote }} + {{- else }} + - {{ . | toYaml | nindent 2 }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.natsBox.serviceAccount }} {{- if .enabled }} diff --git a/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml b/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml index aa066100..a134041f 100644 --- a/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml +++ b/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml @@ -28,13 +28,21 @@ spec: # service discovery uses DNS; don't need service env vars enableServiceLinks: false - - {{- with (default .Values.global.image.pullSecretNames .Values.global.imagePullSecrets) }} + + {{- with (default .Values.global.image.pullSecretNames .Values.global.imagePullSecrets) }} imagePullSecrets: - {{- range . }} - - name: {{ . | quote }} - {{- end }} - {{- end }} + {{- range . }} + {{- if typeIs "string" . }} + - name: {{ . | quote }} + {{- else if typeIsLike "map[string]interface {}" . }} + {{- if hasKey . "name" }} + - name: {{ .name | quote }} + {{- else }} + - {{ . | toYaml }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} {{- with .Values.serviceAccount }} {{- if .enabled }} From 324149868b223351d3c94823412d03c8407a268e Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Thu, 14 Nov 2024 18:15:18 +0200 Subject: [PATCH 3/4] update nats --- charts/testkube-enterprise/Chart.lock | 6 +++--- charts/testkube-enterprise/Chart.yaml | 2 +- charts/testkube-enterprise/charts/nats/Chart.yaml | 2 +- .../charts/nats/files/nats-box/deployment/pod-template.yaml | 2 -- .../charts/nats/files/stateful-set/pod-template.yaml | 2 -- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/charts/testkube-enterprise/Chart.lock b/charts/testkube-enterprise/Chart.lock index 90834dc4..d6aa94d6 100644 --- a/charts/testkube-enterprise/Chart.lock +++ b/charts/testkube-enterprise/Chart.lock @@ -22,9 +22,9 @@ dependencies: version: 16.2.1-1 - name: nats repository: file://./charts/nats - version: 1.2.6-3 + version: 1.2.6-4 - name: minio repository: file://./charts/minio version: 14.8.3-2 -digest: sha256:9c1c026538707ebd5f87b88b60f0d8e9a79acadb6c2fb314f55629d127c7d57c -generated: "2024-11-13T16:52:30.689099+02:00" +digest: sha256:0c7f12a2fbf97f360116809d28887efa99abc02ec9a9de83768c1c2440e011b0 +generated: "2024-11-14T18:14:16.0603+02:00" diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml index 647322d9..4ea3645d 100644 --- a/charts/testkube-enterprise/Chart.yaml +++ b/charts/testkube-enterprise/Chart.yaml @@ -31,7 +31,7 @@ dependencies: condition: mongodb.enabled - name: nats condition: testkube-api.nats.enabled - version: 1.2.6-3 + version: 1.2.6-4 repository: "file://./charts/nats" - name: minio version: 14.8.3-2 diff --git a/charts/testkube-enterprise/charts/nats/Chart.yaml b/charts/testkube-enterprise/charts/nats/Chart.yaml index 7113dc2d..3b1ba138 100644 --- a/charts/testkube-enterprise/charts/nats/Chart.yaml +++ b/charts/testkube-enterprise/charts/nats/Chart.yaml @@ -6,7 +6,7 @@ keywords: - nats - messaging - cncf -version: 1.2.6-3 +version: 1.2.6-4 home: http://github.com/nats-io/k8s maintainers: - email: info@nats.io diff --git a/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml b/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml index b6738898..6129bf1c 100644 --- a/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml +++ b/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml @@ -16,14 +16,12 @@ spec: {{- if typeIs "string" . }} - name: {{ . | quote }} {{- else if typeIsLike "map[string]interface {}" . }} - {{- if hasKey . "name" }} - name: {{ .name | quote }} {{- else }} - {{ . | toYaml | nindent 2 }} {{- end }} {{- end }} {{- end }} - {{- end }} {{- with .Values.natsBox.serviceAccount }} {{- if .enabled }} diff --git a/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml b/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml index a134041f..b715fde9 100644 --- a/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml +++ b/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml @@ -35,14 +35,12 @@ spec: {{- if typeIs "string" . }} - name: {{ . | quote }} {{- else if typeIsLike "map[string]interface {}" . }} - {{- if hasKey . "name" }} - name: {{ .name | quote }} {{- else }} - {{ . | toYaml }} {{- end }} {{- end }} {{- end }} - {{- end }} {{- with .Values.serviceAccount }} {{- if .enabled }} From dc1c30ed970228a02b8fdb662be831504ca0db3b Mon Sep 17 00:00:00 2001 From: ypoplavs Date: Thu, 14 Nov 2024 18:26:43 +0200 Subject: [PATCH 4/4] fix type --- .../charts/nats/files/nats-box/deployment/pod-template.yaml | 6 +++--- .../charts/nats/files/stateful-set/pod-template.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml b/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml index 6129bf1c..43c0c0f7 100644 --- a/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml +++ b/charts/testkube-enterprise/charts/nats/files/nats-box/deployment/pod-template.yaml @@ -13,12 +13,12 @@ spec: {{- with (default .Values.global.image.pullSecretNames .Values.global.imagePullSecrets) }} imagePullSecrets: {{- range . }} - {{- if typeIs "string" . }} - - name: {{ . | quote }} + {{- if typeIs "slice" . }} + - name: {{ . | quote }} {{- else if typeIsLike "map[string]interface {}" . }} - name: {{ .name | quote }} {{- else }} - - {{ . | toYaml | nindent 2 }} + - {{ . | toYaml }} {{- end }} {{- end }} {{- end }} diff --git a/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml b/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml index b715fde9..b59339f8 100644 --- a/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml +++ b/charts/testkube-enterprise/charts/nats/files/stateful-set/pod-template.yaml @@ -32,7 +32,7 @@ spec: {{- with (default .Values.global.image.pullSecretNames .Values.global.imagePullSecrets) }} imagePullSecrets: {{- range . }} - {{- if typeIs "string" . }} + {{- if typeIs "slice" . }} - name: {{ . | quote }} {{- else if typeIsLike "map[string]interface {}" . }} - name: {{ .name | quote }}