Merge pull request #16 from lalithkota/develop-G2P-2355

Helm charts: Fixed broken labels for templates

.github/workflows/push_trigger.yml

@@ -96,7 +96,7 @@ jobs:
  done
  helm repo index --url https://openg2p.github.io/openg2p-helm/ --merge rancher/index.yaml rancher
  for chartname in $RANCHER_CHARTS; do
- rm rancher/${chartname}*.tgz
+ rm rancher/${chartname}*.tgz || true
  done
  if: env.SKIP != 'TRUE'
 
@@ -107,6 +107,6 @@ jobs:
  author_name: openg2pbot
  author_email: [email protected]
  default_author: user_info
- message: 'added social registry helm charts for publish openg2p/openg2p-reporting@${{ github.sha }}'
+ message: 'added reporting helm charts for publish openg2p/openg2p-reporting@${{ github.sha }}'
  add: './*.tgz ./index.yaml rancher/index.yaml'
  if: env.SKIP != 'TRUE'

charts/debezium/templates/clusterrolebinding.yaml

@@ -1,11 +1,8 @@
 kind: ClusterRoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

charts/debezium/templates/deployment.yaml

@@ -1,15 +1,11 @@
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  replicas: {{ .Values.replicaCount }}
  {{- if .Values.updateStrategy }}
@@ -19,14 +15,10 @@ spec:
  matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.podLabels "context" $) | nindent 6 }}
  template:
  metadata:
- annotations:
- {{- if or .Values.podAnnotations .Values.metrics.enabled }}
- {{- include "debezium.podAnnotations" . | nindent 8 }}
- {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 8 }}
- {{- if .Values.podLabels }}
- {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.podLabels "context" $) | nindent 8 }}
+ {{- if or .Values.podAnnotations .Values.metrics.enabled }}
+ annotations: {{- include "debezium.podAnnotations" . | nindent 8 }}
+ {{- end }}
  spec:
  serviceAccountName: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
  {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) | nindent 6 }}

charts/debezium/templates/service-account.yaml

@@ -2,10 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

charts/debezium/templates/service.yaml

@@ -1,15 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  type: {{ .Values.service.type }}
  {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}

charts/debezium/templates/servicemonitor.yaml

@@ -6,10 +6,10 @@ metadata:
  {{- if .Values.metrics.serviceMonitor.namespace }}
  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
  {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
-  {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-  {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  endpoints:
  - port: http-metrics

charts/opensearch-kafka-connector/templates/clusterrolebinding.yaml

@@ -1,11 +1,8 @@
 kind: ClusterRoleBinding
 apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

charts/opensearch-kafka-connector/templates/configmap.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ include "common.names.fullname" . }}-properties
- labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
- annotations: {{ include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}
 data:
  connect-distributed.properties: |-

charts/opensearch-kafka-connector/templates/deployment.yaml

@@ -1,15 +1,11 @@
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  replicas: {{ .Values.replicaCount }}
  {{- if .Values.updateStrategy }}
@@ -19,14 +15,10 @@ spec:
  matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.podLabels "context" $) | nindent 6 }}
  template:
  metadata:
- annotations:
- {{- if or .Values.podAnnotations .Values.metrics.enabled }}
- {{- include "opensearch-kafka-connector.podAnnotations" . | nindent 8 }}
- {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 8 }}
- {{- if .Values.podLabels }}
- {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.podLabels "context" $) | nindent 8 }}
+ {{- if or .Values.podAnnotations .Values.metrics.enabled }}
+ annotations: {{- include "opensearch-kafka-connector.podAnnotations" . | nindent 8 }}
+ {{- end }}
  spec:
  serviceAccountName: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
  {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) | nindent 6 }}

charts/opensearch-kafka-connector/templates/service-account.yaml

@@ -2,10 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ default (include "common.names.fullname" .) .Values.serviceAccount.name }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

charts/opensearch-kafka-connector/templates/service.yaml

@@ -1,15 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
  name: {{ template "common.names.fullname" . }}
- annotations:
-  {{- if .Values.commonAnnotations }}
-   {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  type: {{ .Values.service.type }}
  {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }}

charts/opensearch-kafka-connector/templates/servicemonitor.yaml

@@ -6,10 +6,10 @@ metadata:
  {{- if .Values.metrics.serviceMonitor.namespace }}
  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
  {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
-  {{- if .Values.metrics.serviceMonitor.additionalLabels }}
-  {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
-  {{- end }}
+ labels: {{- include "common.labels.standard" (dict "customLabels" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }}
+ {{- if .Values.commonAnnotations }}
+ annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ {{- end }}
 spec:
  endpoints:
  - port: http-metrics

charts/reporting-init/templates/configmap-startup.yaml

@@ -3,12 +3,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ template "common.names.fullname" . }}-startup
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
- annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+ annotations: {{ include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 data:
  startup-command.sh: |-

charts/reporting-init/templates/job.yaml

@@ -2,10 +2,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
  name: {{ template "common.names.fullname" . }}
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
  annotations:
  "helm.sh/hook": post-install,post-upgrade
  "helm.sh/hook-weight": "0"

charts/reporting-init/templates/secret-git-config.yaml

@@ -3,10 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: {{ template "common.names.fullname" . }}-git-config
- labels: {{- include "common.labels.standard" . | nindent 4 }}
- {{- if .Values.commonLabels }}
- {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
- {{- end }}
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" .) | nindent 4 }}
  {{- if .Values.commonAnnotations }}
  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
  {{- end }}

charts/reporting/.gitignore

@@ -1,2 +1,2 @@
-charts/*.tgz
+charts/
 Chart.lock

charts/reporting/Chart.yaml

@@ -4,9 +4,6 @@ description: A Helm chart for OpenG2P Reporting module.
 type: application
 version: 0.0.0-develop
 dependencies:
-- name: debezium
- version: 2.6.0
- condition: debezium.enabled
 - name: kafka
  repository: oci://registry-1.docker.io/bitnamicharts
  version: 29.x.x
@@ -15,7 +12,12 @@ dependencies:
  version: 1.2.0
  repository: oci://registry-1.docker.io/bitnamicharts
  condition: opensearch.enabled
+- name: debezium
+ repository: https://openg2p.github.io/openg2p-helm
+ version: 2.6.0
+ condition: debezium.enabled
 - name: opensearch-kafka-connector
+ repository: https://openg2p.github.io/openg2p-helm
  version: 0.0.0-develop
  condition: opensearch-kafka-connector.enabled
 icon: https://openg2p.github.io/openg2p-helm/openg2p-logo.png

charts/reporting/README.md

@@ -1,19 +1,9 @@
-# Reporting Framework
+# Reporting Framework Helm Chart
 
-Helm chart for installing reporting module
+Helm chart for installing reporting framework (infra for reporting).
 
-## Manual Installation
+This chart contains the following components:
 
-Reporting framework can be installed directly as part of OpenG2P modules, like Social Registry and PBMS, etc.
-
-```console
-$ helm repo add openg2p https://openg2p.github.io/openg2p-helm
-$ helm install reporting openg2p/reporting
-```
-
-## Contents
-
-This helm chart contains the following subcharts and they can be individually configured/installed/omitted, through the `values.yaml`.
 - Kafka + Kafka UI
 - OpenSearch
 - Debezium Kafka Connector

charts/reporting/templates/kafka-ui/configmap.yaml

@@ -4,12 +4,9 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
- 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.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
+ annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 data:
  config.yml: |-

charts/reporting/templates/kafka-ui/deployment.yaml

@@ -4,29 +4,23 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
- 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.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
+ annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 spec:
  replicas: {{ .Values.kafkaUi.replicaCount }}
  {{- if .Values.kafkaUi.updateStrategy }}
  strategy: {{- toYaml .Values.kafkaUi.updateStrategy | nindent 4 }}
  {{- end }}
  selector:
- matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.kafkaUi.podLabels "context" $) | nindent 6 }}
+ matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.kafkaUi.podLabels "context" .Subcharts.kafka) | nindent 6 }}
  template:
  metadata:
+ labels: {{ include "common.labels.standard" (dict "customLabels" .Values.kafkaUi.podLabels "context" .Subcharts.kafka) | nindent 8 }}
  {{- if .Values.kafkaUi.podAnnotations }}
- annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+ annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.podAnnotations "context" $) | nindent 8 }}
  {{- end }}
- labels: {{- include "common.labels.standard" . | nindent 8 }}
- {{- if .Values.kafkaUi.podLabels }}
- {{- include "common.tplvalues.render" (dict "value" .Values.kafkaUi.podLabels "context" $) | nindent 8 }}
- {{- end }}
  spec:
  serviceAccountName: {{ include "kafka.serviceAccountName" .Subcharts.kafka }}
  {{- include "common.images.pullSecrets" (dict "images" (list .Values.kafkaUi.image) "global" .Values.global) | nindent 6 }}

charts/reporting/templates/kafka-ui/gateway.yaml

@@ -6,12 +6,9 @@ apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
  name: {{ include "common.names.fullname" .Subcharts.kafka }}-ui
- 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.kafkaUi.commonLabels "context" .Subcharts.kafka) | nindent 4 }}
+ {{- if .Values.kafkaUi.commonAnnotations }}
+ annotations: {{ include "common.tplvalues.render" (dict "value" .Values.kafkaUi.commonAnnotations "context" $) | nindent 4 }}
  {{- end }}
 spec:
  selector: