Introduced .Values.externalServices.

Co-authored-by: Ciaran Sweet <[email protected]>

Author: pantierra

helm-chart/eoapi/Chart.yaml

@@ -15,7 +15,7 @@ kubeVersion: ">=1.23.0-0"
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.5.2"
+version: "0.5.3"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm-chart/eoapi/templates/services/configmap.yaml

@@ -1,5 +1,4 @@
-{{- range $serviceName, $v := .Values -}}
-{{- if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) }}
+{{- range $serviceName, $v := .Values.externalServices -}}
 {{- if index $v "enabled" }}
 apiVersion: v1
 kind: ConfigMap
@@ -12,7 +11,5 @@ data:
 ---
 {{/* END: if index $v "enabled" */}}
 {{- end }}
-{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
-{{- end }}
-{{/* END: range $serviceName, $v := .Values*/}}
+{{/* END: range $serviceName, $v := .Values.externalServices */}}
 {{- end }}

helm-chart/eoapi/templates/services/deployment.yaml

@@ -1,6 +1,5 @@
 {{ include "eoapi.validateTempDB" . }}
-{{- range $serviceName, $v := .Values -}}
-{{- if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) }}
+{{- range $serviceName, $v := .Values.externalServices -}}
 {{- if index $v "enabled" }}
 apiVersion: apps/v1
 kind: Deployment
@@ -82,7 +81,5 @@ spec:
 ---
 {{/* END: if index $v "enabled" */}}
 {{- end }}
-{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
-{{- end }}
-{{/* END: range $serviceName, $v := .Values*/}}
+{{/* END: range $serviceName, $v := .Values.externalServices */}}
 {{- end }}

helm-chart/eoapi/templates/services/hpa.yaml

@@ -1,6 +1,5 @@
 {{- include "eoapi.validateAutoscaleRules" . -}}
-{{- range $serviceName, $v := .Values -}}
-{{- if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) }}
+{{- range $serviceName, $v := .Values.externalServices -}}
 {{- if index $v "autoscaling" "enabled" }}
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
@@ -44,7 +43,5 @@ spec:
 ---
 {{/* END: if index $v "autoscaling" "enabled" */}}
 {{- end }}
-{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
-{{- end }}
 {{/* END: range $serviceName, $v := .Values*/}}
 {{- end }}

helm-chart/eoapi/templates/services/ingress-nginx.yaml

@@ -30,8 +30,7 @@ spec:
   rules:
     - http:
         paths:
-          {{- range $serviceName, $v := .Values }}
-          {{- if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) }}
+          {{- range $serviceName, $v := .Values.externalServices }}
           {{- if (and (index $v "enabled") (not $.Values.testing)) }}
           - pathType: Prefix
             path: "/{{ $serviceName }}(/|$)(.*)"
@@ -49,8 +48,7 @@ spec:
                 port:
                   number: {{ $.Values.service.port }}
           {{- end }}{{/* END: if index $v "enabled" */}}
-          {{- end }}{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
-          {{- end }}{{/* END: range $serviceName, $v := .Values*/}}
+          {{- end }}{{/* END: range $serviceName, $v := .Values.externalServices */}}
           {{- if (and (not $.Values.testing) (.Values.docServer.enabled)) }}
           - pathType: Prefix
             path: /(/|$)

helm-chart/eoapi/templates/services/service.yaml

@@ -1,5 +1,4 @@
-{{- range $serviceName, $v := .Values -}}
-{{- if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) }}
+{{- range $serviceName, $v := .Values.externalServices -}}
 {{- if index $v "enabled" }}
 apiVersion: v1
 kind: Service
@@ -28,7 +27,5 @@ spec:
 ---
 {{/* END: if index $v "enabled" */}}
 {{- end }}
-{{/* END: if (or (eq $serviceName "raster") (eq $serviceName "stac") (eq $serviceName "vector")) */}}
-{{- end }}
-{{/* END: range $serviceName, $v := .Values*/}}
+{{/* END: range $serviceName, $v := .Values.externalServices */}}
 {{- end }}