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

[sn-platform-slim] Sync securityContext changes #1043

Merged
merged 3 commits into from
Jun 20, 2023
Merged

[sn-platform-slim] Sync securityContext changes #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4139eb9
Sync #1041
ciiiii Jun 20, 2023
ce64ddc
Sync #1042
ciiiii Jun 20, 2023
e14b6ae
Fix helm syntax error
ciiiii Jun 20, 2023
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
3 changes: 3 additions & 0 deletions charts/sn-platform-slim/templates/alert-manager/alertmanager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ spec:
{{ toYaml .Values.alert_manager.tolerations | indent 8 }}
{{- end }}
terminationGracePeriodSeconds: {{ .Values.alert_manager.gracePeriod }}
{{- if .Values.alert_manager.securityContext }}
securityContext: {{- toYaml .Values.alert_manager.securityContext | nindent 8 }}
{{- end }}
containers:
{{- if .Values.configmapReload.alertmanager.enabled }}
- name: {{ template "pulsar.fullname" . }}-{{ .Values.alert_manager.component }}-{{ .Values.configmapReload.alertmanager.name }}
Expand Down
3 changes: 3 additions & 0 deletions charts/sn-platform-slim/templates/detector/pulsar-detector-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
{{- if .Values.global.imagePullSecrets }}
imagePullSecrets: {{- toYaml .Values.global.imagePullSecrets | nindent 8 }}
{{- end }}
{{- if .Values.pulsar_detector.securityContext }}
securityContext: {{- toYaml .Values.pulsar_detector.securityContext | nindent 8 }}
{{- end }}
{{- if .Values.pulsar_detector.serviceAccount.use }}
serviceAccountName: {{ template "pulsar.detector.serviceAccount" . }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion charts/sn-platform-slim/templates/streamnative-console/streamnative-console-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ metadata:
annotations:
{{- with .Values.streamnative_console.annotations }}
{{ toYaml . | indent 4 }}
{{- end }
{{- end }}
spec:
serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}"
replicas: 1
Expand Down
16 changes: 15 additions & 1 deletion charts/sn-platform-slim/templates/toolset/toolset-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ spec:
{{ toYaml .Values.toolset.tolerations | indent 8 }}
{{- end }}
terminationGracePeriodSeconds: {{ .Values.toolset.gracePeriod }}
{{- if .Values.toolset.installBusybox }}
initContainers:
- name: busybox
image: "{{ .Values.images.toolset.busybox.repository }}:{{ .Values.images.toolset.busybox.tag }}"
Expand All @@ -83,13 +84,22 @@ spec:
command: ["sh", "-c"]
args:
- |
set -ex
cd /home
mkdir binaries;
busybox --install -s binaries;
cp binaries/* /tmp/binaries;
cp /bin/busybox /tmp/binaries;
cp binaries/* tmp/binaries;
cp /bin/busybox tmp/binaries;
securityContext:
runAsUser: 65534
runAsGroup: 65534
runAsNonRoot: true
volumeMounts:
- name: binaries
mountPath: /tmp/binaries
mountPath: /home/tmp/binaries
{{- end }}
containers:
- name: "pulsar"
{{- include "pulsar.toolset.image" . | nindent 8 }}
Expand All @@ -116,12 +126,14 @@ spec:
{{ toYaml . | indent 8 }}
{{- end }}
volumeMounts:
{{- if .Values.toolset.installBusybox }}
- name: binaries
mountPath: /bin/busybox
subPath: busybox
- name: binaries
mountPath: /bin/vi
subPath: vi
{{- end }}
{{- include "pulsar.toolset.certs.volumeMounts" . | nindent 8 }}
{{- include "pulsar.toolset.token.volumeMounts" . | nindent 8 }}
{{- include "pulsar.toolset.log.volumeMounts" . | nindent 8 }}
Expand All @@ -130,8 +142,10 @@ spec:
{{ toYaml . | indent 8 }}
{{- end }}
volumes:
{{- if .Values.toolset.installBusybox }}
- name: binaries
emptyDir: {}
{{- end }}
{{- include "pulsar.toolset.certs.volumes" . | nindent 6 }}
{{- include "pulsar.toolset.token.volumes" . | nindent 6 }}
{{- include "pulsar.toolset.log.volumes" . | nindent 6 }}
Expand Down
3 changes: 3 additions & 0 deletions charts/sn-platform-slim/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,8 @@ pulsar_detector:
# nodeSelector:
# cloud.google.com/gke-nodepool: default-pool
# tolerations: []
securityContext:
runAsNonRoot: true
# Definition of the serviceAccount used to run brokers.
serviceAccount:
# Specifies whether to use a service account to run this component
Expand Down Expand Up @@ -1483,6 +1485,7 @@ proxy:
toolset:
component: toolset
useProxy: false
installBusybox: true
replicaCount: 1
# nodeSelector:
# cloud.google.com/gke-nodepool: default-pool
Expand Down