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

update console helm chart #1502

Merged
merged 1 commit into from
Sep 1, 2023
Merged

update console helm chart #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 22 additions & 22 deletions ...nsole/templates/database/minio/minio.yaml → ...lates/database/fileserver/fileserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{{- if .Values.minio.create }}
{{- if .Values.fileserver.create }}
---
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: deepfence-file-server
labels:
{{- include "deepfence-console.labels" . | nindent 4 }}
component: minio
component: fileserver
name: deepfence-file-server
spec:
serviceName: deepfence-file-server
replicas: 1
selector:
matchLabels:
{{- include "deepfence-console.selectorLabels" . | nindent 6 }}
component: minio
component: fileserver
name: deepfence-file-server
template:
metadata:
{{- with .Values.minio.podAnnotations }}
{{- with .Values.fileserver.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "deepfence-console.selectorLabels" . | nindent 8 }}
component: minio
component: fileserver
name: deepfence-file-server
spec:
serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.minio.podSecurityContext | nindent 8 }}
{{- toYaml .Values.fileserver.podSecurityContext | nindent 8 }}
containers:
- name: minio
- name: fileserver
securityContext:
{{- toYaml .Values.minio.securityContext | nindent 12 }}
image: "{{ .Values.global.imageRepoPrefix }}/{{ .Values.minio.image.repository }}:{{ default .Values.global.imageTag .Values.minio.image.tag }}"
imagePullPolicy: {{ .Values.minio.image.pullPolicy }}
{{- toYaml .Values.fileserver.securityContext | nindent 12 }}
image: "{{ .Values.global.imageRepoPrefix }}/{{ .Values.fileserver.image.repository }}:{{ default .Values.global.imageTag .Values.fileserver.image.tag }}"
imagePullPolicy: {{ .Values.fileserver.image.pullPolicy }}
envFrom:
- secretRef:
name: "deepfence-file-server"
Expand All @@ -48,36 +48,36 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
path: /minio/health/live
path: /status
port: http
initialDelaySeconds: 120
initialDelaySeconds: 60
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
readinessProbe:
httpGet:
path: /minio/health/live
path: /status
port: http
initialDelaySeconds: 60
periodSeconds: 20
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
resources:
{{- toYaml .Values.minio.resources | nindent 12 }}
{{- toYaml .Values.fileserver.resources | nindent 12 }}
volumeMounts:
- mountPath: /data
name: "file-server-{{ .Release.Name }}"
{{- with .Values.minio.nodeSelector }}
{{- with .Values.fileserver.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.minio.affinity }}
{{- with .Values.fileserver.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.minio.tolerations }}
{{- with .Values.fileserver.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
Expand All @@ -89,16 +89,16 @@ spec:
- "ReadWriteOnce"
resources:
requests:
storage: "{{ .Values.minio.volumeSize }}"
storageClassName: {{ default .Values.global.storageClass .Values.minio.storageClass }}
storage: "{{ .Values.fileserver.volumeSize }}"
storageClassName: {{ default .Values.global.storageClass .Values.fileserver.storageClass }}
---
apiVersion: v1
kind: Service
metadata:
name: deepfence-file-server
labels:
{{- include "deepfence-console.labels" . | nindent 4 }}
component: minio
component: fileserver
name: deepfence-file-server
spec:
type: ClusterIP
Expand All @@ -113,6 +113,6 @@ spec:
protocol: TCP
selector:
{{- include "deepfence-console.selectorLabels" . | nindent 4 }}
component: minio
component: fileserver
name: deepfence-file-server
{{- end }}
6 changes: 3 additions & 3 deletions ...sole/templates/database/minio/secret.yaml → ...templates/database/fileserver/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.minio.create }}
{{- if .Values.fileserver.create }}
---
kind: Secret
apiVersion: v1
Expand All @@ -7,9 +7,9 @@ metadata:
name: "deepfence-file-server"
labels:
{{- include "deepfence-console.labels" . | nindent 4 }}
component: minio
component: fileserver
stringData:
{{- range $k, $v := .Values.minio.secrets }}
{{- range $k, $v := .Values.fileserver.secrets }}
{{ $k }}: {{ $v }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion ...yment-scripts/helm-charts/deepfence-console/templates/database/postgresql/postgresql.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
- -c
- exec pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}
initialDelaySeconds: 60
periodSeconds: 20
periodSeconds: 30
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
Expand Down
8 changes: 4 additions & 4 deletions ...ates/deepfence-console-secrets/minio.yaml → ...deepfence-console-secrets/fileserver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{{- if .Values.minio.create }}
{{- if .Values.fileserver.create }}
---
kind: Secret
apiVersion: v1
type: Opaque
metadata:
name: "deepfence-console-secrets-minio"
name: "deepfence-console-secrets-fileserver"
labels:
{{- include "deepfence-console.labels" . | nindent 4 }}
component: file-server
Expand All @@ -13,7 +13,7 @@ stringData:
DEEPFENCE_MINIO_PORT: "9000"
DEEPFENCE_MINIO_SECURE: "false"
DEEPFENCE_MINIO_BUCKET: deepfence
DEEPFENCE_MINIO_PASSWORD: {{ .Values.minio.secrets.MINIO_ROOT_PASSWORD | quote }}
DEEPFENCE_MINIO_USER: {{ .Values.minio.secrets.MINIO_ROOT_USER | quote }}
DEEPFENCE_MINIO_PASSWORD: {{ .Values.fileserver.secrets.MINIO_ROOT_PASSWORD | quote }}
DEEPFENCE_MINIO_USER: {{ .Values.fileserver.secrets.MINIO_ROOT_USER | quote }}
{{- end }}

4 changes: 2 additions & 2 deletions deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ingester.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ spec:
name: {{ .Values.redis.secretName }}
{{- end }}
- secretRef:
{{- if .Values.minio.create }}
name: "deepfence-console-secrets-minio"
{{- if .Values.fileserver.create }}
name: "deepfence-console-secrets-fileserver"
{{- else }}
name: {{ .Values.minio.secretName }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ spec:
name: {{ .Values.redis.secretName }}
{{- end }}
- secretRef:
{{- if .Values.minio.create }}
name: "deepfence-console-secrets-minio"
{{- if .Values.fileserver.create }}
name: "deepfence-console-secrets-fileserver"
{{- else }}
name: {{ .Values.minio.secretName }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions deployment-scripts/helm-charts/deepfence-console/templates/deepfence-scheduler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ spec:
name: {{ .Values.redis.secretName }}
{{- end }}
- secretRef:
{{- if .Values.minio.create }}
name: "deepfence-console-secrets-minio"
{{- if .Values.fileserver.create }}
name: "deepfence-console-secrets-fileserver"
{{- else }}
name: {{ .Values.minio.secretName }}
{{- end }}
Expand Down
18 changes: 12 additions & 6 deletions deployment-scripts/helm-charts/deepfence-console/templates/deepfence-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ spec:
name: {{ .Values.redis.secretName }}
{{- end }}
- secretRef:
{{- if .Values.minio.create }}
name: "deepfence-console-secrets-minio"
{{- if .Values.fileserver.create }}
name: "deepfence-console-secrets-fileserver"
{{- else }}
name: {{ .Values.minio.secretName }}
{{- end }}
Expand Down Expand Up @@ -89,14 +89,20 @@ spec:
httpGet:
path: /deepfence/ping
port: http
initialDelaySeconds: 120
periodSeconds: 20
initialDelaySeconds: 90
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
readinessProbe:
httpGet:
path: /deepfence/ping
port: http
initialDelaySeconds: 120
periodSeconds: 20
initialDelaySeconds: 90
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
resources:
{{- toYaml .Values.server.resources | nindent 12 }}
{{- with .Values.server.nodeSelector }}
Expand Down
14 changes: 10 additions & 4 deletions deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ spec:
name: {{ .Values.redis.secretName }}
{{- end }}
- secretRef:
{{- if .Values.minio.create }}
name: "deepfence-console-secrets-minio"
{{- if .Values.fileserver.create }}
name: "deepfence-console-secrets-fileserver"
{{- else }}
name: {{ .Values.minio.secretName }}
{{- end }}
Expand Down Expand Up @@ -76,14 +76,20 @@ spec:
httpGet:
path: /health
port: http
initialDelaySeconds: 120
initialDelaySeconds: 60
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
readinessProbe:
httpGet:
path: /health
port: http
initialDelaySeconds: 60
periodSeconds: 20
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 5
successThreshold: 1
resources:
{{- toYaml .Values.ui.resources | nindent 12 }}
{{- with .Values.ui.nodeSelector }}
Expand Down
4 changes: 2 additions & 2 deletions deployment-scripts/helm-charts/deepfence-console/templates/deepfence-worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ spec:
name: {{ .Values.redis.secretName }}
{{- end }}
- secretRef:
{{- if .Values.minio.create }}
name: "deepfence-console-secrets-minio"
{{- if .Values.fileserver.create }}
name: "deepfence-console-secrets-fileserver"
{{- else }}
name: {{ .Values.minio.secretName }}
{{- end }}
Expand Down
4 changes: 2 additions & 2 deletions deployment-scripts/helm-charts/deepfence-console/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ redis:
tolerations: []
affinity: {}

minio:
# Specifies whether a postgres database instance should be created
fileserver:
# Specifies whether a file server instance should be created
create: true
# if create false provide name of the existing secret
# secret format refer templates/console-secrets/minio.yaml
Expand Down