Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,34 @@ spec:
periodSeconds: {{ .Values.streamnative_console.probe.startup.periodSeconds }}
failureThreshold: {{ .Values.streamnative_console.probe.startup.failureThreshold }}
{{- end }}
workingDir: "/pulsar-manager/console"
command: ["/pulsar-manager/entrypoint.sh"]
args:
- |
if [ -f "/pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_ID" ]; then
export GOOGLE_CLIENT_ID=$(cat /pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_ID)
fi
if [ -f "/pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_SECRET" ]; then
export GOOGLE_CLIENT_SECRET=$(cat /pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_SECRET)
fi
if [ -f "/pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_ID" ]; then
export AZURE_CLIENT_ID=$(cat /pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_ID)
fi
if [ -f "/pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_SECRET" ]; then
export AZURE_CLIENT_SECRET=$(cat /pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_SECRET)
fi
if [ -f "/pulsar-manager/secrets/azure-oauth2/AZURE_TENANT_ID" ]; then
export AZURE_TENANT_ID=$(cat /pulsar-manager/secrets/azure-oauth2/AZURE_TENANT_ID)
fi
if [ -f "/pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_ID" ]; then
export OKTA_CLIENT_ID=$(cat /pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_ID)
fi
if [ -f "/pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_SECRET" ]; then
export OKTA_CLIENT_SECRET=$(cat /pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_SECRET)
fi
if [ -f "/pulsar-manager/secrets/pulsar-jwt/TOKEN" ]; then
export TOKEN=$(cat /pulsar-manager/secrets/pulsar-jwt/TOKEN)
fi
env:
- name: SPRING_CONFIGURATION_FILE
value: /pulsar-manager/pulsar-manager/application.properties
Expand Down Expand Up @@ -222,31 +250,32 @@ spec:
value: {{ "/pulsar-manager/keys" }}/{{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_FILE | default "token/secret.key" }}
{{- end }}
{{- end }}
{{- if or .Values.streamnative_console.login.sso.google.enabled .Values.streamnative_console.login.sso.azure.enabled .Values.streamnative_console.login.sso.okta.enabled .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
envFrom:
volumeMounts:
- name: streamnative-console-data
mountPath: /data
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- mountPath: /pulsar-manager/keys
name: token-keys
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.google.enabled }}
- secretRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-google-oauth2-secret"
- name: google-oauth2-secret
mountPath: /pulsar-manager/secrets/google-oauth2
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.azure.enabled }}
- secretRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-azure-oauth2-secret"
- name: azure-oauth2-secret
mountPath: /pulsar-manager/secrets/azure-oauth2
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.okta.enabled }}
- secretRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-okta-oauth2-secret"
{{- end }}
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- secretRef:
name: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.SERVICE_ACCOUNT_SUPER_TOKEN_SECRET }}
- name: okta-oauth2-secret
mountPath: /pulsar-manager/secrets/okta-oauth2
readOnly: true
{{- end }}
volumeMounts:
- name: streamnative-console-data
mountPath: /data
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- mountPath: /pulsar-manager/keys
name: token-keys
- name: pulsar-jwt-secret
mountPath: /pulsar-manager/secrets/pulsar-jwt
readOnly: true
{{- end }}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-gateway"
Expand Down Expand Up @@ -296,6 +325,30 @@ spec:
secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY }}
{{- end }}
{{- end }}
{{- if .Values.streamnative_console.login.sso.google.enabled }}
- name: google-oauth2-secret
secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-google-oauth2-secret"
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.login.sso.azure.enabled }}
- name: azure-oauth2-secret
secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-azure-oauth2-secret"
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.login.sso.okta.enabled }}
- name: okta-oauth2-secret
secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-okta-oauth2-secret"
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- name: pulsar-jwt-secret
secret:
secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.SERVICE_ACCOUNT_SUPER_TOKEN_SECRET }}
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.securityContext }}
securityContext: {{- toYaml .Values.streamnative_console.securityContext | nindent 8 }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,34 @@ spec:
periodSeconds: {{ .Values.streamnative_console.probe.startup.periodSeconds }}
failureThreshold: {{ .Values.streamnative_console.probe.startup.failureThreshold }}
{{- end }}
workingDir: "/pulsar-manager/console"
command: ["/pulsar-manager/entrypoint.sh"]
args:
- |
if [ -f "/pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_ID" ]; then
export GOOGLE_CLIENT_ID=$(cat /pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_ID)
fi
if [ -f "/pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_SECRET" ]; then
export GOOGLE_CLIENT_SECRET=$(cat /pulsar-manager/secrets/google-oauth2/GOOGLE_CLIENT_SECRET)
fi
if [ -f "/pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_ID" ]; then
export AZURE_CLIENT_ID=$(cat /pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_ID)
fi
if [ -f "/pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_SECRET" ]; then
export AZURE_CLIENT_SECRET=$(cat /pulsar-manager/secrets/azure-oauth2/AZURE_CLIENT_SECRET)
fi
if [ -f "/pulsar-manager/secrets/azure-oauth2/AZURE_TENANT_ID" ]; then
export AZURE_TENANT_ID=$(cat /pulsar-manager/secrets/azure-oauth2/AZURE_TENANT_ID)
fi
if [ -f "/pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_ID" ]; then
export OKTA_CLIENT_ID=$(cat /pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_ID)
fi
if [ -f "/pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_SECRET" ]; then
export OKTA_CLIENT_SECRET=$(cat /pulsar-manager/secrets/okta-oauth2/OKTA_CLIENT_SECRET)
fi
if [ -f "/pulsar-manager/secrets/pulsar-jwt/TOKEN" ]; then
export TOKEN=$(cat /pulsar-manager/secrets/pulsar-jwt/TOKEN)
fi
env:
- name: SPRING_CONFIGURATION_FILE
value: /pulsar-manager/pulsar-manager/application.properties
Expand Down Expand Up @@ -228,35 +256,32 @@ spec:
value: {{ "/pulsar-manager/keys" }}/{{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY_FILE | default "token/secret.key" }}
{{- end }}
{{- end }}
{{- if or .Values.auth.vault.enabled .Values.streamnative_console.login.sso.google.enabled .Values.streamnative_console.login.sso.azure.enabled .Values.streamnative_console.login.sso.okta.enabled .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
envFrom:
{{- end }}
{{- if .Values.auth.vault.enabled }}
- secretRef:
name: {{ template "pulsar.vault-secret-key-name" . }}
volumeMounts:
- name: streamnative-console-data
mountPath: /data
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- mountPath: /pulsar-manager/keys
name: token-keys
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.google.enabled }}
- secretRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-google-oauth2-secret"
- name: google-oauth2-secret
mountPath: /pulsar-manager/secrets/google-oauth2
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.azure.enabled }}
- secretRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-azure-oauth2-secret"
- name: azure-oauth2-secret
mountPath: /pulsar-manager/secrets/azure-oauth2
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.okta.enabled }}
- secretRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-okta-oauth2-secret"
- name: okta-oauth2-secret
mountPath: /pulsar-manager/secrets/okta-oauth2
readOnly: true
{{- end }}
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- secretRef:
name: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.SERVICE_ACCOUNT_SUPER_TOKEN_SECRET }}
{{- end }}
volumeMounts:
- name: streamnative-console-data
mountPath: /data
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- mountPath: /pulsar-manager/keys
name: token-keys
- name: pulsar-jwt-secret
mountPath: /pulsar-manager/secrets/pulsar-jwt
readOnly: true
{{- end }}
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-gateway"
Expand Down Expand Up @@ -306,6 +331,30 @@ spec:
secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.JWT_BROKER_SECRET_KEY }}
{{- end }}
{{- end }}
{{- if .Values.streamnative_console.login.sso.google.enabled }}
- name: google-oauth2-secret
secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-google-oauth2-secret"
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.login.sso.azure.enabled }}
- name: azure-oauth2-secret
secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-azure-oauth2-secret"
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.login.sso.okta.enabled }}
- name: okta-oauth2-secret
secret:
secretName: "{{ template "pulsar.fullname" . }}-{{ .Values.streamnative_console.component }}-okta-oauth2-secret"
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.login.sso.pulsarJwt.enabled }}
- name: pulsar-jwt-secret
secret:
secretName: {{ .Values.streamnative_console.login.sso.pulsarJwt.config.SERVICE_ACCOUNT_SUPER_TOKEN_SECRET }}
defaultMode: 440
{{- end }}
{{- if .Values.streamnative_console.securityContext }}
securityContext: {{- toYaml .Values.streamnative_console.securityContext | nindent 8 }}
{{- end }}
Expand Down
Loading