argo rollout add active metadata

frontegg · Sep 12, 2024 · 280963b · 280963b
1 parent d4b8add
commit 280963b
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 14 deletions.
diff --git a/common/unified-chart/templates/high-priority/hp-deployment.yaml b/common/unified-chart/templates/high-priority/hp-deployment.yaml
@@ -10,7 +10,7 @@ metadata:
   {{- toYaml .Values.hp.labels | nindent 4 }}
 spec:
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit | default 2 }}
-  {{- if .Values.argoRollouts }}
+  {{- if .Values.argoRollouts.enabled }}
   replicas: 0
   {{- else if not .Values.web.autoscaling.enabled }}
   replicas: {{ .Values.hp.replicaCount }}

diff --git a/common/unified-chart/templates/high-priority/hp-hpa.yaml b/common/unified-chart/templates/high-priority/hp-hpa.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- include "keda.annotations" . | nindent 4 }}
 spec:
   scaleTargetRef:
-    {{- if .Values.argoRollouts }}
+    {{- if .Values.argoRollouts.enabled }}
     apiVersion: argoproj.io/v1alpha1
     kind: Rollout
     name: {{ include "hp.name" . }}

diff --git a/common/unified-chart/templates/high-priority/hp-pdb.yaml b/common/unified-chart/templates/high-priority/hp-pdb.yaml
@@ -14,4 +14,9 @@ spec:
   selector:
     matchLabels:
       {{- include "hp.selector.labels" . | nindent 6 }}
+      {{- if .Values.argoRollouts.enabled }}
+      {{- with .Values.argoRollouts.activeMetadata }}
+      {{- toYaml .labels | nindent 6 }}
+      {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/common/unified-chart/templates/high-priority/hp-rollout.yaml b/common/unified-chart/templates/high-priority/hp-rollout.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hp.enabled }}
-{{- if .Values.argoRollouts }}
+{{- if .Values.argoRollouts.enabled }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
@@ -16,6 +16,10 @@ spec:
       {{- include "hp.selector.labels" . | nindent 6 }}
   strategy:
     blueGreen:
+      {{- with .Values.argoRollouts.activeMetadata }}
+      activeMetadata:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       activeService: {{ include "hp.name" . }}
       autoPromotionEnabled: true
 {{- end }}

diff --git a/common/unified-chart/templates/high-priority/hp-scaled-object.yaml b/common/unified-chart/templates/high-priority/hp-scaled-object.yaml
@@ -14,7 +14,7 @@ metadata:
     {{- include "hp.labels" $top | nindent 4 }}
 spec:
   scaleTargetRef:
-    {{- if $values.argoRollouts }}
+    {{- if $values.argoRollouts.enabled }}
     apiVersion: argoproj.io/v1alpha1
     kind: Rollout
     name: {{ include "hp.name" $top }}

diff --git a/common/unified-chart/templates/high-priority/hp-service.yaml b/common/unified-chart/templates/high-priority/hp-service.yaml
@@ -1,6 +1,6 @@
 {{- $values := .Values -}}
 {{- if $values.hp.enabled }}
-{{- if $values.argoRollouts }}
+{{- if $values.argoRollouts.enabled }}
 ---
 apiVersion: v1
 kind: Service

diff --git a/common/unified-chart/templates/web/web-deployment.yaml b/common/unified-chart/templates/web/web-deployment.yaml
@@ -9,7 +9,7 @@ metadata:
     {{- include "web.labels" . | nindent 4 }}
 spec:
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit | default 2 }}
-  {{- if .Values.argoRollouts }}
+  {{- if .Values.argoRollouts.enabled }}
   replicas: 0
   {{- else if not .Values.web.autoscaling.enabled }}
   replicas: {{ .Values.web.replicaCount }}

diff --git a/common/unified-chart/templates/web/web-hpa.yaml b/common/unified-chart/templates/web/web-hpa.yaml
@@ -13,7 +13,7 @@ metadata:
     {{- end }}
 spec:
   scaleTargetRef:
-    {{- if .Values.argoRollouts }}
+    {{- if .Values.argoRollouts.enabled }}
     apiVersion: argoproj.io/v1alpha1
     kind: Rollout
     name: {{ include "web.name" . }}

diff --git a/common/unified-chart/templates/web/web-pdb.yaml b/common/unified-chart/templates/web/web-pdb.yaml
@@ -14,4 +14,9 @@ spec:
   selector:
     matchLabels:
       {{- include "web.selector.labels" . | nindent 6 }}
+      {{- if .Values.argoRollouts.enabled }}
+      {{- with .Values.argoRollouts.activeMetadata }}
+      {{- toYaml .labels | nindent 6 }}
+      {{- end }}
+      {{- end }}
 {{- end }}
diff --git a/common/unified-chart/templates/web/web-rollout.yaml b/common/unified-chart/templates/web/web-rollout.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.web.enabled -}}
-{{- if .Values.argoRollouts }}
+{{- if .Values.argoRollouts.enabled }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
@@ -16,6 +16,10 @@ spec:
       {{- include "web.selector.labels" . | nindent 6 }}
   strategy:
     blueGreen:
+      {{- with .Values.argoRollouts.activeMetadata }}
+      activeMetadata:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       activeService: {{ include "web.name" . }}
       autoPromotionEnabled: true
 {{- end }}

diff --git a/common/unified-chart/templates/web/web-scaled-object.yaml b/common/unified-chart/templates/web/web-scaled-object.yaml
@@ -14,7 +14,7 @@ metadata:
     {{- include "web.labels" $top | nindent 4 }}
 spec:
   scaleTargetRef:
-    {{- if $values.argoRollouts }}
+    {{- if $values.argoRollouts.enabled }}
     apiVersion: argoproj.io/v1alpha1
     kind: Rollout
     name: {{ include "web.name" $top }}

diff --git a/common/unified-chart/templates/worker/worker-deployment.yaml b/common/unified-chart/templates/worker/worker-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     {{- include "worker.labels" . | nindent 4 }}
 spec:
-  {{- if .Values.argoRollouts }}
+  {{- if .Values.argoRollouts.enabled }}
   replicas: 0
   {{- else if not .Values.web.autoscaling.enabled }}
   replicas: {{ .Values.worker.replicaCount }}

diff --git a/common/unified-chart/templates/worker/worker-hpa.yaml b/common/unified-chart/templates/worker/worker-hpa.yaml
@@ -13,7 +13,7 @@ metadata:
     {{- end }}
 spec:
   scaleTargetRef:
-    {{- if .Values.argoRollouts }}
+    {{- if .Values.argoRollouts.enabled }}
     apiVersion: argoproj.io/v1alpha1
     kind: Rollout
     name: {{ include "worker.name" . }}

diff --git a/common/unified-chart/templates/worker/worker-rollout.yaml b/common/unified-chart/templates/worker/worker-rollout.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.worker.enabled }}
-{{- if .Values.argoRollouts }}
+{{- if .Values.argoRollouts.enabled }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
@@ -16,6 +16,10 @@ spec:
       {{- include "worker.selector.labels" . | nindent 6 }}
   strategy:
     blueGreen:
+      {{- with .Values.argoRollouts.activeMetadata }}
+      activeMetadata:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       activeService: {{ include "worker.name" . }}
       autoPromotionEnabled: true
 {{- end }}

diff --git a/common/unified-chart/templates/worker/worker-scaled-object.yaml b/common/unified-chart/templates/worker/worker-scaled-object.yaml
@@ -14,7 +14,7 @@ metadata:
     {{- include "worker.labels" $top | nindent 4 }}
 spec:
   scaleTargetRef:
-    {{- if $values.argoRollouts }}
+    {{- if $values.argoRollouts.enabled }}
     apiVersion: argoproj.io/v1alpha1
     kind: Rollout
     name: {{ include "worker.name" $top }}

diff --git a/common/unified-chart/values.yaml b/common/unified-chart/values.yaml
@@ -9,7 +9,11 @@
 # CAUTION this will change name of all manifests
 nameSuffix: v2
 
-argoRollouts: true
+argoRollouts:
+  enabled: true
+  activeMetadata:
+    labels:
+      role: active
 
 image:
   repository: