feat: configurable update strategy (#2036)

* feat: configurable update strategy * feat: backport strategy feature to alpha * chore: update readme * test: fixes test issue where it references the wrong struct * chore: update readme
camunda · Jun 25, 2024 · 70f5232 · 70f5232
1 parent fd64f25
commit 70f5232
Show file tree

Hide file tree

Showing 49 changed files with 1,023 additions and 2 deletions.
diff --git a/charts/camunda-platform-alpha/templates/connectors/deployment.yaml b/charts/camunda-platform-alpha/templates/connectors/deployment.yaml
@@ -7,6 +7,10 @@ metadata:
   annotations: {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: {{ .Values.connectors.replicas }}
+  {{- if .Values.connectors.strategy }}
+  strategy:
+    {{- .Values.connectors.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels: {{- include "connectors.matchLabels" . | nindent 6 }}
   template:

diff --git a/charts/camunda-platform-alpha/templates/console/deployment.yaml b/charts/camunda-platform-alpha/templates/console/deployment.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: {{ .Values.console.replicas }}
+  {{- if .Values.console.strategy }}
+  strategy:
+    {{- .Values.console.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "console.matchLabels" . | nindent 6 }}

diff --git a/charts/camunda-platform-alpha/templates/identity/deployment.yaml b/charts/camunda-platform-alpha/templates/identity/deployment.yaml
@@ -7,6 +7,10 @@ metadata:
   annotations: {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  {{- if .Values.identity.strategy }}
+  strategy:
+    {{- .Values.identity.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels: {{- include "identity.matchLabels" . | nindent 6 }}
   template:

diff --git a/charts/camunda-platform-alpha/templates/operate/deployment.yaml b/charts/camunda-platform-alpha/templates/operate/deployment.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  {{- if .Values.operate.strategy }}
+  strategy:
+    {{- .Values.operate.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "operate.matchLabels" . | nindent 6 }}

diff --git a/charts/camunda-platform-alpha/templates/optimize/deployment.yaml b/charts/camunda-platform-alpha/templates/optimize/deployment.yaml
@@ -9,6 +9,8 @@ metadata:
     {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  strategy:
+    {{- .Values.optimize.strategy | toYaml | nindent 4 }}
   selector:
     matchLabels:
       {{- include "optimize.matchLabels" . | nindent 6 }}

diff --git a/charts/camunda-platform-alpha/templates/tasklist/deployment.yaml b/charts/camunda-platform-alpha/templates/tasklist/deployment.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  {{- if .Values.tasklist.strategy }}
+  strategy:
+    {{- .Values.tasklist.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "tasklist.matchLabels" . | nindent 6 }}

diff --git a/charts/camunda-platform-alpha/templates/web-modeler/deployment-restapi.yaml b/charts/camunda-platform-alpha/templates/web-modeler/deployment-restapi.yaml
@@ -7,6 +7,10 @@ metadata:
   annotations: {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  {{- if .Values.webModeler.restapi.strategy }}
+  strategy:
+    {{- .Values.webModeler.restapi.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels: {{- include "webModeler.restapi.matchLabels" . | nindent 6 }}
   template:

diff --git a/charts/camunda-platform-alpha/templates/web-modeler/deployment-webapp.yaml b/charts/camunda-platform-alpha/templates/web-modeler/deployment-webapp.yaml
@@ -7,6 +7,10 @@ metadata:
   annotations: {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  {{- if .Values.webModeler.webapp.strategy }}
+  strategy:
+    {{- .Values.webModeler.webapp.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels: {{- include "webModeler.webapp.matchLabels" . | nindent 6 }}
   template:

diff --git a/charts/camunda-platform-alpha/templates/web-modeler/deployment-websockets.yaml b/charts/camunda-platform-alpha/templates/web-modeler/deployment-websockets.yaml
@@ -7,6 +7,10 @@ metadata:
   annotations: {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: 1
+  {{- if .Values.webModeler.websockets.strategy }}
+  strategy:
+    {{- .Values.webModeler.websockets.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels: {{- include "webModeler.websockets.matchLabels" . | nindent 6 }}
   template:

diff --git a/charts/camunda-platform-alpha/templates/zeebe-gateway/deployment.yaml b/charts/camunda-platform-alpha/templates/zeebe-gateway/deployment.yaml
@@ -9,6 +9,10 @@ metadata:
     {{- toYaml .Values.global.annotations | nindent 4 }}
 spec:
   replicas: {{ .Values.zeebeGateway.replicas  }}
+  {{- if .Values.zeebeGateway.strategy }}
+  strategy:
+    {{- .Values.zeebeGateway.strategy | toYaml | nindent 4 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "zeebe.matchLabels.gateway" . | nindent 6 }}

diff --git a/charts/camunda-platform-alpha/templates/zeebe/statefulset.yaml b/charts/camunda-platform-alpha/templates/zeebe/statefulset.yaml
@@ -21,7 +21,7 @@ spec:
       {{- include "zeebe.matchLabels.broker" . | nindent 6 }}
   serviceName: {{ include "zeebe.names.broker" . }}
   updateStrategy:
-    type: RollingUpdate
+    {{- .Values.zeebe.strategy | toYaml | nindent 4 }}
   podManagementPolicy: Parallel
   template:
     metadata:

diff --git a/charts/camunda-platform-alpha/test/unit/connectors/deployment_test.go b/charts/camunda-platform-alpha/test/unit/connectors/deployment_test.go
@@ -848,3 +848,42 @@ func (s *deploymentTemplateTest) TestContainerSetInitContainer() {
 
 	s.Require().Contains(podContainers, expectedContainer)
 }
+
+func (s *deploymentTemplateTest) TestDefaultStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues:      map[string]string{},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal("", string(strategy.Type))
+
+}
+
+func (s *deploymentTemplateTest) TestDefinedStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"connectors.strategy.type": "Recreate",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal("Recreate", string(strategy.Type))
+}
diff --git a/charts/camunda-platform-alpha/test/unit/console/deployment_test.go b/charts/camunda-platform-alpha/test/unit/console/deployment_test.go
@@ -775,3 +775,45 @@ func (s *deploymentTemplateTest) TestSetDnsPolicyAndDnsConfig() {
 
 	require.Equal(s.T(), expectedDNSConfig, deployment.Spec.Template.Spec.DNSConfig, "dnsConfig should match the expected configuration")
 }
+
+func (s *deploymentTemplateTest) TestDefaultStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"console.enabled": "true",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal("", string(strategy.Type))
+
+}
+
+func (s *deploymentTemplateTest) TestDefinedStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"console.enabled":       "true",
+			"console.strategy.type": "Recreate",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal("Recreate", string(strategy.Type))
+}
diff --git a/charts/camunda-platform-alpha/test/unit/identity/deployment_test.go b/charts/camunda-platform-alpha/test/unit/identity/deployment_test.go
@@ -1111,3 +1111,42 @@ func (s *deploymentTemplateTest) TestSetDnsPolicyAndDnsConfig() {
 
 	require.Equal(s.T(), expectedDNSConfig, deployment.Spec.Template.Spec.DNSConfig, "dnsConfig should match the expected configuration")
 }
+
+func (s *deploymentTemplateTest) TestDefaultStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues:      map[string]string{},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal("", string(strategy.Type))
+
+}
+
+func (s *deploymentTemplateTest) TestDefinedStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"identity.strategy.type": "Recreate",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal("Recreate", string(strategy.Type))
+}
diff --git a/charts/camunda-platform-alpha/test/unit/operate/deployment_test.go b/charts/camunda-platform-alpha/test/unit/operate/deployment_test.go
@@ -1011,3 +1011,41 @@ func (s *deploymentTemplateTest) TestSetDnsPolicyAndDnsConfig() {
 
 	require.Equal(s.T(), expectedDNSConfig, deployment.Spec.Template.Spec.DNSConfig, "dnsConfig should match the expected configuration")
 }
+
+func (s *deploymentTemplateTest) TestDefaultStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues:      map[string]string{},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal(string(strategy.Type), "")
+}
+
+func (s *deploymentTemplateTest) TestDefinedStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"operate.strategy.type": "Recreate",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal(string(strategy.Type), "Recreate")
+}
diff --git a/charts/camunda-platform-alpha/test/unit/optimize/deployment_test.go b/charts/camunda-platform-alpha/test/unit/optimize/deployment_test.go
@@ -928,3 +928,41 @@ func (s *deploymentTemplateTest) TestSetDnsPolicyAndDnsConfig() {
 
 	require.Equal(s.T(), expectedDNSConfig, deployment.Spec.Template.Spec.DNSConfig, "dnsConfig should match the expected configuration")
 }
+
+func (s *deploymentTemplateTest) TestDefaultStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues:      map[string]string{},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal(string(strategy.Type), "Recreate")
+}
+
+func (s *deploymentTemplateTest) TestDefinedStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"optimize.strategy.type": "RollingUpdate",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal(string(strategy.Type), "RollingUpdate")
+}
diff --git a/charts/camunda-platform-alpha/test/unit/optimize/golden/deployment.golden.yaml b/charts/camunda-platform-alpha/test/unit/optimize/golden/deployment.golden.yaml
@@ -16,6 +16,8 @@ metadata:
     {}
 spec:
   replicas: 1
+  strategy:
+    type: Recreate
   selector:
     matchLabels:
       app: camunda-platform

diff --git a/charts/camunda-platform-alpha/test/unit/tasklist/deployment_test.go b/charts/camunda-platform-alpha/test/unit/tasklist/deployment_test.go
@@ -919,6 +919,43 @@ func (s *deploymentTemplateTest) TestTasklistWithLog4j2Configuration() {
 	s.Require().Equal("config", volume.Name)
 	s.Require().Equal("camunda-platform-test-tasklist-configuration", volume.ConfigMap.Name)
 }
+func (s *deploymentTemplateTest) TestDefaultStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues:      map[string]string{},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal(string(strategy.Type), "")
+}
+
+func (s *deploymentTemplateTest) TestDefinedStrategy() {
+	// given
+	options := &helm.Options{
+		SetValues: map[string]string{
+			"tasklist.strategy.type": "Recreate",
+		},
+		KubectlOptions: k8s.NewKubectlOptions("", "", s.namespace),
+	}
+
+	// when
+	output := helm.RenderTemplate(s.T(), options, s.chartPath, s.release, s.templates)
+	var deployment appsv1.Deployment
+	helm.UnmarshalK8SYaml(s.T(), output, &deployment)
+
+	// then
+	strategy := deployment.Spec.Strategy
+
+	s.Require().Equal(string(strategy.Type), "Recreate")
+}
 func (s *deploymentTemplateTest) TestSetDnsPolicyAndDnsConfig() {
 	// given
 	options := &helm.Options{