From 3d5359e17ad1a6c541a28967d711b466e6e5e61e Mon Sep 17 00:00:00 2001 From: Frank Kloeker Date: Fri, 15 Mar 2024 05:44:31 +0100 Subject: [PATCH 1/2] [helm] add additional sidecar container Signed-off-by: Frank Kloeker --- charts/k0s/templates/syncer.yaml | 3 +++ charts/k0s/values.yaml | 3 +++ charts/k3s/templates/syncer.yaml | 3 +++ charts/k3s/values.yaml | 2 ++ charts/k8s/templates/syncer.yaml | 3 +++ charts/k8s/values.yaml | 2 ++ 6 files changed, 16 insertions(+) diff --git a/charts/k0s/templates/syncer.yaml b/charts/k0s/templates/syncer.yaml index 965c975c9..91c4611e9 100644 --- a/charts/k0s/templates/syncer.yaml +++ b/charts/k0s/templates/syncer.yaml @@ -345,4 +345,7 @@ spec: {{ toYaml .Values.syncer.resources | indent 10 }} {{- end }} {{- include "vcluster.legacyPlugins.containers" . | indent 6 }} + {{- if .Values.sidecarContainer }} +{{ toYaml .Values.sidecarContainer | indent 6 }} + {{- end }} {{- end }} diff --git a/charts/k0s/values.yaml b/charts/k0s/values.yaml index 04f4ae4f9..c1807244c 100644 --- a/charts/k0s/values.yaml +++ b/charts/k0s/values.yaml @@ -512,3 +512,6 @@ telemetry: platformUserID: "" platformInstanceID: "" machineID: "" + +### additional sidecar container +# sidecarContainer: diff --git a/charts/k3s/templates/syncer.yaml b/charts/k3s/templates/syncer.yaml index a83a8e250..7ef5fb890 100644 --- a/charts/k3s/templates/syncer.yaml +++ b/charts/k3s/templates/syncer.yaml @@ -428,4 +428,7 @@ spec: {{ toYaml .Values.syncer.resources | indent 10 }} {{- end }} {{- include "vcluster.legacyPlugins.containers" . | indent 6 }} + {{- if .Values.sidecarContainer }} +{{ toYaml .Values.sidecarContainer | indent 6 }} + {{- end }} {{- end }} diff --git a/charts/k3s/values.yaml b/charts/k3s/values.yaml index 70bdbf2b5..3e6949ea9 100644 --- a/charts/k3s/values.yaml +++ b/charts/k3s/values.yaml @@ -537,3 +537,5 @@ noopSyncer: # #secret: "" +### additional sidecar container +# sidecarContainer: diff --git a/charts/k8s/templates/syncer.yaml b/charts/k8s/templates/syncer.yaml index a59945763..b8ac29e59 100644 --- a/charts/k8s/templates/syncer.yaml +++ b/charts/k8s/templates/syncer.yaml @@ -490,4 +490,7 @@ spec: resources: {{ toYaml .Values.syncer.resources | indent 10 }} {{- include "vcluster.legacyPlugins.containers" . | indent 6 }} + {{- if .Values.sidecarContainer }} +{{ toYaml .Values.sidecarContainer | indent 6 }} + {{- end }} {{- end }} diff --git a/charts/k8s/values.yaml b/charts/k8s/values.yaml index 7d076e05d..13f2ef781 100644 --- a/charts/k8s/values.yaml +++ b/charts/k8s/values.yaml @@ -522,3 +522,5 @@ telemetry: platformInstanceID: "" machineID: "" +### additional sidecar container +# sidecarContainer: From ee90f582d6ffdec1d9631ec506d68149c9f29e8e Mon Sep 17 00:00:00 2001 From: Frank Kloeker Date: Tue, 19 Mar 2024 09:44:50 +0100 Subject: [PATCH 2/2] add additional sidecar in statefulset Signed-off-by: Frank Kloeker --- chart/templates/statefulset.yaml | 3 +++ chart/values.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml index 712d889b0..505708888 100644 --- a/chart/templates/statefulset.yaml +++ b/chart/templates/statefulset.yaml @@ -231,4 +231,7 @@ spec: {{ toYaml .Values.controlPlane.statefulSet.persistence.addVolumeMounts | indent 12 }} {{- end }} {{- include "vcluster.legacyPlugins.containers" . | indent 8 }} + {{- if .Values.sidecarContainer }} +{{ toYaml .Values.sidecarContainer | indent 6 }} + {{- end }} {{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 4fe0efe60..d43a2e5c8 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -506,3 +506,6 @@ platform: telemetry: disabled: false + +### additional sidecar container +# sidecarContainer: