From 0a702b834d56e8ccb2f03035e5c9ad679f6f51cf Mon Sep 17 00:00:00 2001 From: Bernt Andreas Drange Date: Mon, 31 Oct 2022 14:21:43 +0200 Subject: [PATCH 1/4] Add support for multiline postinstall and postupgrade commands --- frontend/templates/services-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/templates/services-deployment.yaml b/frontend/templates/services-deployment.yaml index 8c2cb1df..ae876f7f 100644 --- a/frontend/templates/services-deployment.yaml +++ b/frontend/templates/services-deployment.yaml @@ -173,9 +173,9 @@ spec: args: - | {{- if $.Release.IsInstall }} - {{ $service.postinstall.command }} + {{- toYaml $service.postinstall.command | nindent 10 }} {{- end }} - {{ $service.postupgrade.command }} + {{- toYaml $service.postupgrade.command | nindent 10 }} volumeMounts: {{ if $service.mounts }} {{- range $index, $mountName := $service.mounts -}} From 6d4a8ab22232dd6f08b7570bdaef26e533d5810a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Bebr=C4=ABtis?= Date: Tue, 1 Nov 2022 10:57:40 +0200 Subject: [PATCH 2/4] silta-cluster: Load traefik and sidecar images from docker hub --- silta-cluster/Chart.yaml | 2 +- silta-cluster/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/silta-cluster/Chart.yaml b/silta-cluster/Chart.yaml index 0c3ab46a..e139797b 100644 --- a/silta-cluster/Chart.yaml +++ b/silta-cluster/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.0" description: Setup a silta kubernetes cluster. name: silta-cluster -version: 0.2.37 +version: 0.2.38 dependencies: - name: traefik version: 1.87.x diff --git a/silta-cluster/values.yaml b/silta-cluster/values.yaml index a64d5eb2..ea96c489 100644 --- a/silta-cluster/values.yaml +++ b/silta-cluster/values.yaml @@ -14,7 +14,7 @@ traefik: enabled: true externalTrafficPolicy: Local priorityClassName: "high-priority" - image: eu.gcr.io/silta-images/traefik + image: wunderio/silta-traefik imageTag: 1.7.34-mod rbac: enabled: true @@ -238,7 +238,7 @@ k8sControllerSidecars: enabled: true replicaCount: 1 image: - repository: eu.gcr.io/silta-images/silta-k8s-controller-sidecars + repository: wunderio/silta-k8s-controller-sidecars tag: latest pullPolicy: IfNotPresent resources: From ac0d0de982e6cbc48af462d43b6cc7ff6be4e051 Mon Sep 17 00:00:00 2001 From: Bernt Andreas Drange Date: Thu, 3 Nov 2022 13:30:24 +0200 Subject: [PATCH 3/4] Remove toYaml from service.postinstall/postupgrade commands --- frontend/templates/services-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/templates/services-deployment.yaml b/frontend/templates/services-deployment.yaml index ae876f7f..3d112ef9 100644 --- a/frontend/templates/services-deployment.yaml +++ b/frontend/templates/services-deployment.yaml @@ -173,9 +173,9 @@ spec: args: - | {{- if $.Release.IsInstall }} - {{- toYaml $service.postinstall.command | nindent 10 }} + {{- $service.postinstall.command | nindent 10 }} {{- end }} - {{- toYaml $service.postupgrade.command | nindent 10 }} + {{- $service.postupgrade.command | nindent 10 }} volumeMounts: {{ if $service.mounts }} {{- range $index, $mountName := $service.mounts -}} From 3f18ab3b292806f898eacba762b2ed752319795e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=81nis=20Bebr=C4=ABtis?= Date: Thu, 3 Nov 2022 15:55:11 +0200 Subject: [PATCH 4/4] Version bump --- frontend/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/Chart.yaml b/frontend/Chart.yaml index 16de94e7..d12298ba 100644 --- a/frontend/Chart.yaml +++ b/frontend/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: frontend -version: 0.2.78 +version: 0.2.79 dependencies: - name: mariadb version: 7.10.x