Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bring back triple service
Browse files Browse the repository at this point in the history
guy-frontegg committed Jan 7, 2025
1 parent 28227f2 commit 8a8187b
Showing 9 changed files with 35 additions and 35 deletions.
20 changes: 9 additions & 11 deletions common/unified-chart/templates/high-priority/hp-httproute.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{{- if .Values.hp.enabled }}
{{- if .Values.argoRollouts.progressiveDelivery.enabled }}
---
apiVersion: gateway.networking.k8s.io/v1beta1
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: {{ include "hp.name" $top }}-route
@@ -17,15 +17,13 @@ spec:
{{- end }}
rules:
- backendRefs:
{{- range $values.hp.service.ports }}
- name: {{ include "hp.name" $top }}-canary
group: "core"
port: {{ required ".Values.hp.service.ports[*].port number is required" .port }}
kind: Service
- name: {{ include "hp.name" $top }}
group: "core"
port: {{ required ".Values.hp.service.ports[*].port number is required" .port }}
kind: Service
{{- end }}
{{- range $type := tuple "canary" "stable" }}
{{- range $values.hp.service.ports }}
- name: {{ include "hp.name" $top }}-{{ $type }}
group: "core"
port: {{ required ".Values.hp.service.ports[*].port number is required" .port }}
kind: Service
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -2,11 +2,12 @@
{{- $values := .Values -}}
{{- if .Values.hp.enabled }}
{{- if .Values.argoRollouts.progressiveDelivery.enabled }}
{{- range $type := tuple "canary" "stable" }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ include "hp.name" $top }}-canary
name: {{ include "hp.name" $top }}-{{ $type }}
labels:
{{- include "hp.labels" $top | nindent 4 }}
{{- with $values.hp.service.labels }}
@@ -25,5 +26,6 @@ spec:
{{- include "hp.selector.labels" $top | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}


Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ spec:
{{- toYaml .canaryMetadata | nindent 8 }}
{{- end }}
canaryService: {{ include "hp.name" . }}-canary
stableService: {{ include "hp.name" . }}
stableService: {{ include "hp.name" . }}-stable
trafficRouting:
managedRoutes:
- name: {{ include "hp.name" . }}
14 changes: 6 additions & 8 deletions common/unified-chart/templates/web/web-httproute.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{{- if .Values.web.enabled -}}
{{- if .Values.argoRollouts.progressiveDelivery.enabled }}
---
apiVersion: gateway.networking.k8s.io/v1beta1
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: {{ include "web.name" $top }}-route
@@ -17,15 +17,13 @@ spec:
{{- end }}
rules:
- backendRefs:
{{- range $values.web.service.ports }}
- name: {{ include "web.name" $top }}-canary
{{- range $type := tuple "canary" "stable" }}
{{- range $values.web.service.ports }}
- name: {{ include "web.name" $top }}-{{ $type }}
group: "core"
port: {{ required ".Values.web.service.ports[*].port number is required" .port }}
kind: Service
- name: {{ include "web.name" $top }}
group: "core"
port: {{ required ".Values.web.service.ports[*].port number is required" .port }}
kind: Service
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
4 changes: 3 additions & 1 deletion common/unified-chart/templates/web/web-pd-services.yaml
Original file line number Diff line number Diff line change
@@ -2,11 +2,12 @@
{{- $values := .Values -}}
{{- if .Values.web.enabled -}}
{{- if .Values.argoRollouts.progressiveDelivery.enabled }}
{{- range $type := tuple "canary" "stable" }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ include "web.name" $top }}-canary
name: {{ include "web.name" $top }}-{{ $type }}
labels:
{{- include "web.labels" $top | nindent 4 }}
{{- with $values.web.service.labels }}
@@ -25,5 +26,6 @@ spec:
{{- include "web.selector.labels" $top | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}


2 changes: 1 addition & 1 deletion common/unified-chart/templates/web/web-rollout.yaml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ spec:
{{- toYaml .canaryMetadata | nindent 8 }}
{{- end }}
canaryService: {{ include "web.name" . }}-canary
stableService: {{ include "web.name" . }}
stableService: {{ include "web.name" . }}-stable
trafficRouting:
managedRoutes:
- name: {{ include "web.name" . }}
18 changes: 8 additions & 10 deletions common/unified-chart/templates/worker/worker-httproute.yaml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{{- if .Values.worker.enabled }}
{{- if .Values.argoRollouts.progressiveDelivery.enabled }}
---
apiVersion: gateway.networking.k8s.io/v1beta1
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: {{ include "worker.name" $top }}-route
@@ -17,15 +17,13 @@ spec:
{{- end }}
rules:
- backendRefs:
{{- range $values.worker.service.ports }}
- name: {{ include "worker.name" $top }}-canary
group: "core"
port: {{ required ".Values.worker.service.ports[*].port number is required" .port }}
kind: Service
- name: {{ include "worker.name" $top }}
group: "core"
port: {{ required ".Values.worker.service.ports[*].port number is required" .port }}
kind: Service
{{- range $type := tuple "canary" "stable" }}
{{- range $values.worker.service.ports }}
- name: {{ include "worker.name" $top }}-{{ $type }}
group: "core"
port: {{ required ".Values.worker.service.ports[*].port number is required" .port }}
kind: Service
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -2,11 +2,12 @@
{{- $values := .Values -}}
{{- if .Values.worker.enabled }}
{{- if .Values.argoRollouts.progressiveDelivery.enabled }}
{{- range $type := tuple "canary" "stable" }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ include "worker.name" $top }}-canary
name: {{ include "worker.name" $top }}-{{ $type }}
labels:
{{- include "worker.labels" $top | nindent 4 }}
{{- with $values.worker.service.labels }}
@@ -25,5 +26,6 @@ spec:
{{- include "worker.selector.labels" $top | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}


2 changes: 1 addition & 1 deletion common/unified-chart/templates/worker/worker-rollout.yaml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ spec:
{{- toYaml .canaryMetadata | nindent 8 }}
{{- end }}
canaryService: {{ include "worker.name" . }}-canary
stableService: {{ include "worker.name" . }}
stableService: {{ include "worker.name" . }}-stable
trafficRouting:
managedRoutes:
- name: {{ include "worker.name" . }}

0 comments on commit 8a8187b

Please sign in to comment.