From 79e7720a8f2b112f53db2eefb3762be1b175470d Mon Sep 17 00:00:00 2001 From: Calcagiara Date: Wed, 21 Aug 2024 11:43:18 +0200 Subject: [PATCH 1/6] feat(apigwOp): pods now restart when configmap is upgraded --- charts/apigw-operator/Chart.yaml | 2 +- charts/apigw-operator/templates/deployment.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/apigw-operator/Chart.yaml b/charts/apigw-operator/Chart.yaml index 5fa792f..c7e6cfe 100644 --- a/charts/apigw-operator/Chart.yaml +++ b/charts/apigw-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: apigw-operator description: A Helm chart for Kubernetes type: application -version: 0.1.7 +version: 0.1.8 appVersion: "1.1.2" maintainers: - name: ffais diff --git a/charts/apigw-operator/templates/deployment.yaml b/charts/apigw-operator/templates/deployment.yaml index e810cf8..8463927 100644 --- a/charts/apigw-operator/templates/deployment.yaml +++ b/charts/apigw-operator/templates/deployment.yaml @@ -13,8 +13,9 @@ spec: {{- include "apigw-operator.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: @@ -83,4 +84,4 @@ spec: {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }} From ddbc7a450fa1499e9da66e1c5586af607e455e76 Mon Sep 17 00:00:00 2001 From: Calcagiara Date: Wed, 21 Aug 2024 11:43:54 +0200 Subject: [PATCH 2/6] feat(core): pods now restart when configmap is upgraded --- charts/core/Chart.yaml | 2 +- charts/core/templates/deployment.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml index 9fc9433..8d18b1f 100644 --- a/charts/core/Chart.yaml +++ b/charts/core/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: core description: Core backend application for DigitalHub. type: application -version: 0.1.36 +version: 0.1.37 appVersion: "0.6.0" maintainers: - name: ffais diff --git a/charts/core/templates/deployment.yaml b/charts/core/templates/deployment.yaml index 79401a4..690b68a 100644 --- a/charts/core/templates/deployment.yaml +++ b/charts/core/templates/deployment.yaml @@ -13,8 +13,9 @@ spec: {{- include "core.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: From 0b314b869785de2447b193eb02201ab168634223 Mon Sep 17 00:00:00 2001 From: Calcagiara Date: Wed, 21 Aug 2024 11:44:51 +0200 Subject: [PATCH 3/6] feat(drsOp): pods now restart when configmap is upgraded --- charts/dremio-rest-server-operator/Chart.yaml | 2 +- charts/dremio-rest-server-operator/templates/deployment.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/dremio-rest-server-operator/Chart.yaml b/charts/dremio-rest-server-operator/Chart.yaml index fd10285..ac5c74c 100644 --- a/charts/dremio-rest-server-operator/Chart.yaml +++ b/charts/dremio-rest-server-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: dremio-rest-server-operator description: A Helm chart for Kubernetes type: application -version: 0.1.4 +version: 0.1.5 appVersion: "1.0.3" maintainers: - name: ffais diff --git a/charts/dremio-rest-server-operator/templates/deployment.yaml b/charts/dremio-rest-server-operator/templates/deployment.yaml index f7f3675..a04bb50 100644 --- a/charts/dremio-rest-server-operator/templates/deployment.yaml +++ b/charts/dremio-rest-server-operator/templates/deployment.yaml @@ -13,8 +13,9 @@ spec: {{- include "dremio-rest-server-operator.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: @@ -83,4 +84,4 @@ spec: {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} - {{- end }} \ No newline at end of file + {{- end }} From 6a5b204032963edf48085d5a096b845668df6200 Mon Sep 17 00:00:00 2001 From: Calcagiara Date: Wed, 21 Aug 2024 11:46:17 +0200 Subject: [PATCH 4/6] feat(krm): pods now restart when configmap is upgraded, added extraEnv in configmap --- charts/kubernetes-resource-manager/Chart.yaml | 2 +- charts/kubernetes-resource-manager/templates/configmap.yaml | 3 +++ charts/kubernetes-resource-manager/templates/deployment.yaml | 3 ++- charts/kubernetes-resource-manager/values.yaml | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/charts/kubernetes-resource-manager/Chart.yaml b/charts/kubernetes-resource-manager/Chart.yaml index 3a6ffe2..2acb509 100644 --- a/charts/kubernetes-resource-manager/Chart.yaml +++ b/charts/kubernetes-resource-manager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubernetes-resource-manager description: A Helm chart for Kubernetes type: application -version: 0.1.22 +version: 0.1.24 appVersion: "1.1.18" maintainers: - name: ffais diff --git a/charts/kubernetes-resource-manager/templates/configmap.yaml b/charts/kubernetes-resource-manager/templates/configmap.yaml index 1d8569b..f44adc7 100644 --- a/charts/kubernetes-resource-manager/templates/configmap.yaml +++ b/charts/kubernetes-resource-manager/templates/configmap.yaml @@ -19,3 +19,6 @@ data: KRM_AUTH_OAUTH2_SCOPES: {{ .Values.oidc.scope }} AUTH_TYPE: {{ .Values.oidc.authType }} REDIRECT_URL: {{ .Values.oidc.redirectUrl }} + {{- if .Values.env.additionalEnv }} + {{- toYaml .Values.env.additionalEnv | nindent 2}} + {{- end }} diff --git a/charts/kubernetes-resource-manager/templates/deployment.yaml b/charts/kubernetes-resource-manager/templates/deployment.yaml index b6e61a9..d465556 100644 --- a/charts/kubernetes-resource-manager/templates/deployment.yaml +++ b/charts/kubernetes-resource-manager/templates/deployment.yaml @@ -13,8 +13,9 @@ spec: {{- include "kubernetes-resource-manager.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: diff --git a/charts/kubernetes-resource-manager/values.yaml b/charts/kubernetes-resource-manager/values.yaml index 0e4eacc..ca8c416 100644 --- a/charts/kubernetes-resource-manager/values.yaml +++ b/charts/kubernetes-resource-manager/values.yaml @@ -225,3 +225,6 @@ resourceSelectors: owners: "db.movetokube.com/v1alpha1" # list separated by , names: "(digitalhub\\-owner|digitalhub\\-reader|digitalhub\\-writer).*" + +env: + additionalEnv: {} From 8c9cb8ec50fe951a304d9e0b4fa824fbf3c53320 Mon Sep 17 00:00:00 2001 From: Calcagiara Date: Wed, 21 Aug 2024 11:47:18 +0200 Subject: [PATCH 5/6] feat(minioOp): pods now restart when configmap is upgraded --- charts/minio-operator/Chart.yaml | 2 +- charts/minio-operator/templates/deployment.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/minio-operator/Chart.yaml b/charts/minio-operator/Chart.yaml index 8038940..ce33de6 100644 --- a/charts/minio-operator/Chart.yaml +++ b/charts/minio-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: minio-operator description: A Kubernetes operator to handle instances of buckets, users and policies on MinIO. type: application -version: 0.1.3 +version: 0.1.4 appVersion: "1.0.1" maintainers: - name: ffais diff --git a/charts/minio-operator/templates/deployment.yaml b/charts/minio-operator/templates/deployment.yaml index 5ea7b92..df92be6 100644 --- a/charts/minio-operator/templates/deployment.yaml +++ b/charts/minio-operator/templates/deployment.yaml @@ -13,8 +13,9 @@ spec: {{- include "minio-operator.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: From 0c1f7f91249303d24ffaaae8afe83c09dcfbd09d Mon Sep 17 00:00:00 2001 From: Calcagiara Date: Wed, 21 Aug 2024 11:47:53 +0200 Subject: [PATCH 6/6] feat(postgrestOp): pods now restart when configmap is upgraded --- charts/postgrest-operator/Chart.yaml | 2 +- charts/postgrest-operator/templates/deployment.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/postgrest-operator/Chart.yaml b/charts/postgrest-operator/Chart.yaml index 553d1ca..d8b2b56 100644 --- a/charts/postgrest-operator/Chart.yaml +++ b/charts/postgrest-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: postgrest-operator description: A Helm chart for Kubernetes type: application -version: 0.1.6 +version: 0.1.7 appVersion: "2.0.5" maintainers: - name: ffais diff --git a/charts/postgrest-operator/templates/deployment.yaml b/charts/postgrest-operator/templates/deployment.yaml index b47b164..54be7e4 100644 --- a/charts/postgrest-operator/templates/deployment.yaml +++ b/charts/postgrest-operator/templates/deployment.yaml @@ -13,8 +13,9 @@ spec: {{- include "postgrest-operator.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + {{- with .Values.podAnnotations }} {{- toYaml . | nindent 8 }} {{- end }} labels: