Merge pull request #7 from lalithkota/develop

Helm charts: Fixed broken labels for templates
OpenG2P · Jun 25, 2024 · c57c6e3 · c57c6e3
2 parents a6e668e + 6c625f9
commit c57c6e3
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 27 deletions.
diff --git a/charts/openg2p-pbms-p2/templates/superset/gateway.yaml b/charts/openg2p-pbms-p2/templates/superset/gateway.yaml
@@ -5,12 +5,9 @@ apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.superset }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.superset.commonLabels "context" .Subcharts.superset) | nindent 4 }}
+  {{- if .Values.superset.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.superset.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
   selector:

diff --git a/charts/openg2p-pbms-p2/templates/superset/virtualservice.yaml b/charts/openg2p-pbms-p2/templates/superset/virtualservice.yaml
@@ -5,12 +5,9 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.superset }}
-  labels: {{- include "common.labels.standard" . | nindent 4 }}
-    {{- if .Values.commonLabels }}
-    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
-    {{- end }}
-  {{- if .Values.commonAnnotations }}
-  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.superset.commonLabels "context" .Subcharts.superset) | nindent 4 }}
+  {{- if .Values.superset.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.superset.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}
 spec:
   hosts:

diff --git a/charts/openg2p-pbms-p2/values.yaml b/charts/openg2p-pbms-p2/values.yaml
@@ -125,7 +125,6 @@ supersetPostgresql:
       wal_level = logical
       max_wal_senders = 20
       max_replication_slots = 10
-
 supersetRedis:
   nameOverride: superset-redis
   architecture: standalone

diff --git a/charts/openg2p-pbms/templates/logging/flow-odoo.yaml b/charts/openg2p-pbms/templates/logging/flow-odoo.yaml
@@ -4,6 +4,10 @@ apiVersion: logging.banzaicloud.io/v1beta1
 kind: Flow
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.odoo }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.odoo.commonLabels "context" .Subcharts.odoo) | nindent 4 }}
+  {{- if .Values.odoo.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   filters:
   - parser:

diff --git a/charts/openg2p-pbms/templates/logging/opensearch/configmap.yaml b/charts/openg2p-pbms/templates/logging/opensearch/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.loggingOpensearch }}-custom-config
-  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.loggingOpensearch.commonLabels "context" $) | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.loggingOpensearch.commonLabels "context" .Subcharts.loggingOpensearch) | nindent 4 }}
   {{- if .Values.loggingOpensearch.commonAnnotations }}
   annotations: {{ include "common.tplvalues.render" (dict "value" .Values.loggingOpensearch.commonAnnotations "context" $) | nindent 4 }}
   {{- end }}

diff --git a/charts/openg2p-pbms/templates/logging/opensearch/gateway.yaml b/charts/openg2p-pbms/templates/logging/opensearch/gateway.yaml
@@ -5,8 +5,10 @@ apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.loggingOpensearch }}
-  labels:
-    {{- include "pbms.labels" . | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.loggingOpensearch.commonLabels "context" .Subcharts.loggingOpensearch) | nindent 4 }}
+  {{- if .Values.loggingOpensearch.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.loggingOpensearch.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     {{ toYaml .Values.loggingOpensearch.istio.gateway.ingressController | nindent 4 }}

diff --git a/charts/openg2p-pbms/templates/logging/opensearch/output.yaml b/charts/openg2p-pbms/templates/logging/opensearch/output.yaml
@@ -4,6 +4,10 @@ apiVersion: logging.banzaicloud.io/v1beta1
 kind: Output
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.loggingOpensearch }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.loggingOpensearch.commonLabels "context" .Subcharts.loggingOpensearch) | nindent 4 }}
+  {{- if .Values.loggingOpensearch.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.loggingOpensearch.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   {{ .Values.loggingOpensearch.loggingOutput.type }}:
     scheme: {{ include "common.tplvalues.render" (dict "value" .Values.loggingOpensearch.loggingOutput.scheme "context" $) }}

diff --git a/charts/openg2p-pbms/templates/logging/opensearch/virtualservice.yaml b/charts/openg2p-pbms/templates/logging/opensearch/virtualservice.yaml
@@ -5,8 +5,10 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.loggingOpensearch }}
-  labels:
-    {{- include "pbms.labels" . | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.loggingOpensearch.commonLabels "context" .Subcharts.loggingOpensearch) | nindent 4 }}
+  {{- if .Values.loggingOpensearch.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.loggingOpensearch.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   hosts:
   - {{ default .Values.loggingOpensearch.hostname .Values.loggingOpensearch.istio.virtualservice.host | quote }}

diff --git a/charts/openg2p-pbms/templates/minio/gateway.yaml b/charts/openg2p-pbms/templates/minio/gateway.yaml
@@ -5,8 +5,10 @@ apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.minio }}
-  labels:
-    {{- include "pbms.labels" . | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.minio.commonLabels "context" .Subcharts.minio) | nindent 4 }}
+  {{- if .Values.minio.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.minio.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     {{ toYaml .Values.minio.istio.gateway.ingressController | nindent 4 }}

diff --git a/charts/openg2p-pbms/templates/minio/virtualservice.yaml b/charts/openg2p-pbms/templates/minio/virtualservice.yaml
@@ -5,8 +5,10 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: {{ include "common.names.fullname" .Subcharts.minio }}
-  labels:
-    {{- include "pbms.labels" . | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.minio.commonLabels "context" .Subcharts.minio) | nindent 4 }}
+  {{- if .Values.minio.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.minio.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   hosts:
   - {{ default .Values.minio.hostname .Values.minio.istio.virtualservice.host | quote }}

diff --git a/charts/openg2p-pbms/templates/postgresql/gateway.yaml b/charts/openg2p-pbms/templates/postgresql/gateway.yaml
@@ -6,8 +6,10 @@ apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:
   name: {{ include "postgresql.v1.primary.fullname" .Subcharts.odoo.Subcharts.postgresql }}
-  labels:
-    {{- include "pbms.labels" . | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.odoo.postgresql.commonLabels "context" .Subcharts.odoo.Subcharts.postgresql) | nindent 4 }}
+  {{- if .Values.odoo.postgresql.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.postgresql.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     {{ toYaml .Values.odoo.postgresql.istio.gateway.ingressController | nindent 4 }}

diff --git a/charts/openg2p-pbms/templates/postgresql/virtualservice.yaml b/charts/openg2p-pbms/templates/postgresql/virtualservice.yaml
@@ -6,8 +6,10 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: {{ include "postgresql.v1.primary.fullname" .Subcharts.odoo.Subcharts.postgresql }}
-  labels:
-    {{- include "pbms.labels" . | nindent 4 }}
+  labels: {{ include "common.labels.standard" (dict "customLabels" .Values.odoo.postgresql.commonLabels "context" .Subcharts.odoo.Subcharts.postgresql) | nindent 4 }}
+  {{- if .Values.odoo.postgresql.commonAnnotations }}
+  annotations: {{ include "common.tplvalues.render" (dict "value" .Values.odoo.postgresql.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   hosts:
   - {{ default .Values.hostname .Values.odoo.postgresql.istio.virtualservice.host | quote }}

diff --git a/charts/openg2p-pbms/values.yaml b/charts/openg2p-pbms/values.yaml
@@ -114,7 +114,6 @@ mail:
 odk-central:
   enabled: true
   hostname: odk-pbms.openg2p.sandbox.net
-
   odk-central-mail:
     enabled: true
     # envVars: