Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[charts/portal]Changes to support pod and container security context for Portal charts #287

Merged
merged 13 commits into from
Jan 23, 2024
Merged

[charts/portal]Changes to support pod and container security context for Portal charts #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d6c7f7e
Changes to support pod and container security context for Portal charts
Jan 22, 2024
3485033
Changes to support pod and container security context for Portal charts
Jan 23, 2024
f3df7d3
Changes to support pod and container security context for Portal charts
Jan 23, 2024
9656751
Doc changes
Jan 23, 2024
b2350e4
Doc changes and chart changes
Jan 23, 2024
9b97d4b
Doc changes and chart changes
Jan 23, 2024
62e5d78
Updating production-values.yaml
Jan 23, 2024
c23dee5
druid changes
Jan 23, 2024
23f36bb
Removing redundant comments
Jan 23, 2024
c7fa9f4
Global values commented
Jan 23, 2024
2488a84
Update README.md to add the Openshift installation steps
ksaladi Jan 23, 2024
9fec3ee
Update README.md to update the OpenShift steps
ksaladi Jan 23, 2024
7a54e19
Update README.md updating spell check
ksaladi Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/druid/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ maintainers:
- name: Gazza7205
sources:
- https://github.com/CAAPIM/apim-charts
version: 1.0.12
version: 1.0.13
appVersion: 0.17.0
10 changes: 10 additions & 0 deletions charts/druid/templates/broker/broker-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions charts/druid/templates/coordinator/coordinator-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 11 additions & 0 deletions charts/druid/templates/historical/historical-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions charts/druid/templates/ingestion/ingestion-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
11 changes: 11 additions & 0 deletions charts/druid/templates/kafka/kafka-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions charts/druid/templates/middlemanager/middlemanager-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 12 additions & 1 deletion charts/druid/templates/minio/minio-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
11 changes: 11 additions & 0 deletions charts/druid/templates/zookeeper/zookeeper-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions charts/portal/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: druid
repository: file://../druid
version: 1.0.12
version: 1.0.13
- name: mysql
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 9.4.7
Expand All @@ -11,5 +11,5 @@ dependencies:
- name: ingress-nginx
repository: https://kubernetes.github.io/ingress-nginx/
version: 4.7.2
digest: sha256:77bef6109e5ced4a4f00e93044d4bbfd15d0c4b619bae3419dd692a8620a696b
generated: "2023-11-15T10:29:33.351726-05:00"
digest: sha256:52ddb3e04c6f6b75b023041b9cca016beb93590982f57379950b0ee18b6691c1
generated: "2024-01-23T15:57:52.7895836+05:30"
2 changes: 1 addition & 1 deletion charts/portal/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "5.2.2"
description: CA API Developer Portal
name: portal
version: 2.3.5
version: 2.3.6
type: application
home: https://github.com/CAAPIM/apim-charts
maintainers:
Expand Down
Loading
Loading