From a834ec8893a313bd2a592d33540f8e46acdcc4d9 Mon Sep 17 00:00:00 2001 From: Marcell Sevcsik Date: Mon, 29 Nov 2021 16:01:47 +0100 Subject: [PATCH 1/2] Makes autoUpdate always present in case of classicfullstack mode --- .../default/templates/Common/customresource-dynakube.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml b/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml index 67c9a970..1bd4ad81 100644 --- a/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml +++ b/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml @@ -270,11 +270,9 @@ spec: {{ if .Values.oneAgent }} {{/* For compatibility between 0.2.3 and 0.3.0 */}} autoUpdate: {{.Values.oneAgent.autoUpdate}} - {{ else if .Values.classicFullStack.autoUpdate }} - autoUpdate: {{.Values.classicFullStack.autoUpdate}} {{ else }} - autoUpdate: false - {{ end }} + autoUpdate: {{.Values.classicFullStack.autoUpdate}} + {{- end }} {{- if .Values.classicFullStack.dnsPolicy }} dnsPolicy: {{ .Values.classicFullStack.dnsPolicy }} From 2dc366ce69f1a9305e0b45e936d8c70c0d4cec70 Mon Sep 17 00:00:00 2001 From: Marcell Sevcsik Date: Mon, 29 Nov 2021 16:30:00 +0100 Subject: [PATCH 2/2] Reintroduce hooks --- .../default/templates/Common/customresource-dynakube.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml b/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml index 1bd4ad81..efc7fe92 100644 --- a/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml +++ b/dynatrace-operator/chart/default/templates/Common/customresource-dynakube.yaml @@ -19,6 +19,10 @@ apiVersion: dynatrace.com/v1beta1 kind: DynaKube metadata: + annotations: + {{- if ne .Values.platform "google"}} + "helm.sh/hook": post-install,post-upgrade + {{ end }} name: {{ .Values.name }} namespace: {{ .Release.Namespace }} labels: @@ -269,9 +273,9 @@ spec: {{- end }} {{ if .Values.oneAgent }} {{/* For compatibility between 0.2.3 and 0.3.0 */}} - autoUpdate: {{.Values.oneAgent.autoUpdate}} + autoUpdate: {{.Values.oneAgent.autoUpdate | default "false"}} {{ else }} - autoUpdate: {{.Values.classicFullStack.autoUpdate}} + autoUpdate: {{.Values.classicFullStack.autoUpdate | default "false" }} {{- end }} {{- if .Values.classicFullStack.dnsPolicy }}