Merge pull request #301 from CAAPIM/ks_p523_merge

[Charts/portal] Changes to support Portal version 5.2.3
CAAPIM · Feb 28, 2024 · 6a22458 · 6a22458
2 parents 677c8f1 + 424ce02
commit 6a22458
Show file tree

Hide file tree

Showing 29 changed files with 483 additions and 75 deletions.
diff --git a/charts/druid/Chart.yaml b/charts/druid/Chart.yaml
@@ -7,5 +7,5 @@ maintainers:
   - name: Gazza7205
 sources:
   - https://github.com/CAAPIM/apim-charts
-version: 1.0.11
+version: 1.0.13
 appVersion: 0.17.0
diff --git a/charts/druid/templates/broker/broker-statefulset.yaml b/charts/druid/templates/broker/broker-statefulset.yaml
@@ -41,10 +41,20 @@ spec:
       {{- if .Values.broker.tolerations }}
       tolerations: {{- toYaml .Values.broker.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.broker.podSecurityContext }}
+      securityContext: {{- toYaml .Values.broker.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- end }}
       containers:
         - name: broker
           image: "{{ .Values.global.portalRepository }}{{ .Values.image.broker }}"
           imagePullPolicy: "{{ .Values.broker.image.pullPolicy }}"
+          {{- if .Values.broker.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.broker.containerSecurityContext | nindent 12 }}
+          {{- else if .Values.global.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
           envFrom:
           - configMapRef:
               name: broker-config

diff --git a/charts/druid/templates/coordinator/coordinator-statefulset.yaml b/charts/druid/templates/coordinator/coordinator-statefulset.yaml
@@ -41,10 +41,20 @@ spec:
       {{- if .Values.coordinator.tolerations }}
       tolerations: {{- toYaml .Values.coordinator.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.coordinator.podSecurityContext }}
+      securityContext: {{- toYaml .Values.coordinator.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- end }}
       containers:
         - name: coordinator
           image: "{{ .Values.global.portalRepository }}{{ .Values.image.coordinator }}"
           imagePullPolicy: "{{ .Values.coordinator.image.pullPolicy }}"
+          {{- if .Values.coordinator.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.coordinator.containerSecurityContext | nindent 12 }}
+          {{- else if .Values.global.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
           env:
             - name: MINIO_ACCESS_KEY
               valueFrom:

diff --git a/charts/druid/templates/historical/historical-statefulset.yaml b/charts/druid/templates/historical/historical-statefulset.yaml
@@ -41,12 +41,23 @@ spec:
       {{- if .Values.historical.tolerations }}
       tolerations: {{- toYaml .Values.historical.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.historical.podSecurityContext }}
+      securityContext: {{- toYaml .Values.historical.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- else }}
       securityContext:
         fsGroup: 1010
+      {{- end }}
       containers:
         - name: historical
           image: "{{ .Values.global.portalRepository }}{{ .Values.image.historical }}"
           imagePullPolicy: "{{ .Values.historical.image.pullPolicy }}"
+          {{- if .Values.historical.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.historical.containerSecurityContext | nindent 12 }}
+          {{- else if .Values.global.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
           env:
             - name: MINIO_ACCESS_KEY
               valueFrom:

diff --git a/charts/druid/templates/ingestion/ingestion-deployment.yaml b/charts/druid/templates/ingestion/ingestion-deployment.yaml
@@ -42,10 +42,20 @@ spec:
       {{- if .Values.ingestion.tolerations }}
       tolerations: {{- toYaml .Values.ingestion.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.ingestion.podSecurityContext }}
+      securityContext: {{- toYaml .Values.ingestion.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- end }}
       containers:
         - name: ingestion-server
           image: "{{ .Values.global.portalRepository }}{{ .Values.image.ingestion }}"
           imagePullPolicy: "{{ .Values.ingestion.image.pullPolicy }}"
+          {{- if .Values.ingestion.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.ingestion.containerSecurityContext | nindent 12 }}
+          {{- else if .Values.global.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
           env:
             - name: MINIO_ACCESS_KEY
               valueFrom:

diff --git a/charts/druid/templates/ingestion/ingestion-pdb.yaml b/charts/druid/templates/ingestion/ingestion-pdb.yaml
@@ -14,5 +14,5 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: ingestion
+      app: ingestion-server
 {{ end }}
diff --git a/charts/druid/templates/kafka/kafka-statefulset.yaml b/charts/druid/templates/kafka/kafka-statefulset.yaml
@@ -41,12 +41,23 @@ spec:
       {{- if .Values.kafka.tolerations }}
       tolerations: {{- toYaml .Values.kafka.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.kafka.podSecurityContext }}
+      securityContext: {{- toYaml .Values.kafka.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- else }}
       securityContext:
         fsGroup: 1010
+      {{- end }}
       containers:
       - name: kafka
         image: "{{ .Values.global.portalRepository }}{{ .Values.image.kafka }}"
         imagePullPolicy: "{{ .Values.kafka.image.pullPolicy }}"
+        {{- if .Values.kafka.containerSecurityContext }}
+        securityContext: {{- toYaml .Values.kafka.containerSecurityContext | nindent 12 }}
+        {{- else if .Values.global.containerSecurityContext }}
+        securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: kafka-config

diff --git a/charts/druid/templates/middlemanager/middlemanager-statefulset.yaml b/charts/druid/templates/middlemanager/middlemanager-statefulset.yaml
@@ -41,10 +41,20 @@ spec:
       {{- if .Values.middlemanager.tolerations }}
       tolerations: {{- toYaml .Values.middlemanager.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.middlemanager.podSecurityContext }}
+      securityContext: {{- toYaml .Values.middlemanager.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- end }}
       containers:
         - name: middlemanager
           image: "{{ .Values.global.portalRepository }}{{ .Values.image.middlemanager }}"
           imagePullPolicy: "{{ .Values.middlemanager.image.pullPolicy }}"
+          {{- if .Values.middlemanager.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.middlemanager.containerSecurityContext | nindent 12 }}
+          {{- else if .Values.global.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
           env:
             - name: MINIO_ACCESS_KEY
               valueFrom:

diff --git a/charts/druid/templates/minio/minio-statefulset.yaml b/charts/druid/templates/minio/minio-statefulset.yaml
@@ -42,8 +42,14 @@ spec:
       {{- if .Values.minio.tolerations }}
       tolerations: {{- toYaml .Values.minio.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.minio.podSecurityContext }}
+      securityContext: {{- toYaml .Values.minio.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- else }}
       securityContext:
         fsGroup: 1010
+      {{- end }}
       containers:
       {{ $address := print ".minio." .Release.Namespace ".svc.cluster.local/opt/data" }}
       - command:
@@ -56,7 +62,12 @@ spec:
         {{ end }}
         name: minio
         image: "{{ .Values.global.portalRepository }}{{ .Values.image.minio }}"
-        imagePullPolicy: "{{ .Values.minio.image.pullPolicy }}"  
+        imagePullPolicy: "{{ .Values.minio.image.pullPolicy }}"
+        {{- if .Values.minio.containerSecurityContext }}
+        securityContext: {{- toYaml .Values.minio.containerSecurityContext | nindent 12 }}
+        {{- else if .Values.global.containerSecurityContext }}
+        securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+        {{- end }}
         env:
           - name: MINIO_ACCESS_KEY
             valueFrom:

diff --git a/charts/druid/templates/zookeeper/zookeeper-statefulset.yaml b/charts/druid/templates/zookeeper/zookeeper-statefulset.yaml
@@ -44,12 +44,23 @@ spec:
       {{- if .Values.zookeeper.tolerations }}
       tolerations: {{- toYaml .Values.zookeeper.tolerations | nindent 12 }}
       {{- end }}
+      {{- if .Values.zookeeper.podSecurityContext }}
+      securityContext: {{- toYaml .Values.zookeeper.podSecurityContext | nindent 12 }}
+      {{- else if .Values.global.podSecurityContext }}
+      securityContext: {{- toYaml .Values.global.podSecurityContext | nindent 12 }}
+      {{- else }}
       securityContext:
         fsGroup: 1010
+      {{- end }}
       containers:
         - name: zookeeper
           image: "{{ .Values.global.portalRepository }}{{ .Values.image.zookeeper }}"
           imagePullPolicy: "{{ .Values.zookeeper.image.pullPolicy }}"
+          {{- if .Values.zookeeper.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.zookeeper.containerSecurityContext | nindent 12 }}
+          {{- else if .Values.global.containerSecurityContext }}
+          securityContext: {{- toYaml .Values.global.containerSecurityContext | nindent 12 }}
+          {{- end }}
           ports:
           - containerPort: 2181
           - containerPort: 2888

diff --git a/charts/portal/Chart.lock b/charts/portal/Chart.lock
@@ -1,15 +1,15 @@
 dependencies:
 - name: druid
   repository: file://../druid
-  version: 1.0.11
+  version: 1.0.13
 - name: mysql
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
-  version: 9.4.7
+  version: 9.19.1
 - name: rabbitmq
   repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
   version: 12.0.3
 - name: ingress-nginx
   repository: https://kubernetes.github.io/ingress-nginx/
   version: 4.7.2
-digest: sha256:f389872802ff4b5fa8e629a7218888f295477b84e144b4d224ef5726d162ad2d
-generated: "2023-10-11T16:00:27.1193375+05:30"
+digest: sha256:fabdd9a1a279335547e764c767281be489be70ddd02f0d2807e4403e591226eb
+generated: "2024-02-20T14:13:27.1279746+05:30"
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "5.2.2.1"
+appVersion: "5.2.3"
 description: CA API Developer Portal
 name: portal
-version: 2.3.7
+version: 2.3.8
 type: application
 home: https://github.com/CAAPIM/apim-charts
 maintainers:
@@ -16,7 +16,7 @@ dependencies:
   condition: portal.analytics.enabled
   repository: "file://../druid"
 - name: mysql
-  version: 9.4.7
+  version: 9.19.1
   repository: "https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami"
   condition: global.setupDemoDatabase
 - name: rabbitmq