chore: use one boolean

Author: Ubisoft-potato

manifests/bucketeer/charts/web/templates/ingress.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enabled }}
+{{- if not .Values.gcpMultiCluster.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml

@@ -1,24 +1,24 @@
-{{- if and .Values.multiClusterIngress.enabled .Values.env.gcpEnabled }}
+{{- if .Values.gcpMultiCluster.enabled }}
 apiVersion: networking.gke.io/v1
 kind: MultiClusterIngress
 metadata:
-  name: {{ .Values.multiClusterIngress.name }}
+  name: {{ .Values.gcpMultiCluster.ingress.name }}
   namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "web.name" . }}
     chart: {{ template "web.chart" . }}
     release: {{ template "web.fullname" . }}
     heritage: {{ .Release.Service }}
   annotations:
-    networking.gke.io/static-ip: {{ .Values.multiClusterIngress.staticIPName }}
+    networking.gke.io/static-ip: {{ .Values.gcpMultiCluster.ingress.staticIPName }}
 spec:
   template:
     spec:
       backend:
         serviceName: {{ template "web.fullname" . }}
         servicePort: {{ .Values.service.httpPort }}
       rules:
-        - host: {{ .Values.multiClusterIngress.host }}
+        - host: {{ .Values.gcpMultiCluster.ingress.host }}
           http:
-            paths: {{- toYaml .Values.multiClusterIngress.rulePaths | nindent 14 }}
+            paths: {{- toYaml .Values.gcpMultiCluster.ingress.rulePaths | nindent 14 }}
 {{- end }}

manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml

@@ -1,8 +1,8 @@
-{{- if and .Values.multiClusterService.enabled .Values.env.gcpEnabled }}
+{{- if .Values.gcpMultiCluster.enabled }}
 apiVersion: networking.gke.io/v1
 kind: MultiClusterService
 metadata:
-  name: {{ .Values.multiClusterService.name }}
+  name: {{ .Values.gcpMultiCluster.service.name }}
   namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "web.name" . }}

manifests/bucketeer/charts/web/templates/service.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.service.enabled }}
+{{- if not .Values.gcpMultiCluster.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

manifests/bucketeer/charts/web/values.yaml

@@ -118,7 +118,6 @@ envoy:
   adminPort: 8001
   resources: {}
 service:
-  enabled: true
   type: NodePort
   grpcPort: 9000
   httpPort: 9003
@@ -135,7 +134,6 @@ resources: {}
 serviceAccount:
   annotations: {}
 ingress:
-  enabled: true
   name: web
   host:
   staticIPName:
@@ -147,19 +145,17 @@ ingress:
           port:
             number: 9003
 
-multiClusterService:
+gcpMultiCluster:
   enabled: false
-  name: web-multi-cluster-service
-
-
-multiClusterIngress:
-  enabled: false
-  name: web-multi-cluster-ingress
-  host: web-gateway.bucketeer.io
-  staticIPName: web-multi-cluster-static-ip
-  rulePaths:
-    - path: /
-      pathType: Prefix
-      backend:
-        serviceName: web
-        servicePort: 9003
+  service:
+    name: web-multi-cluster-service
+  ingress:
+    name: web-multi-cluster-ingress
+    host: web-gateway.bucketeer.io
+    staticIPName: web-multi-cluster-static-ip
+    rulePaths:
+      - path: /
+        pathType: Prefix
+        backend:
+          serviceName: web
+          servicePort: 9003