Skip to content

feat: add extra env/volumes/volumeMounts to implement the ability to … #513

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add extra env/volumes/volumeMounts to implement the ability to … #513

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
6 changes: 6 additions & 0 deletions charts/core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ Parameter | Description | Default | Notes
`controller.podLabels` | Specify the pod labels. | `{}` |
`controller.podAnnotations` | Specify the pod annotations. | `{}` |
`controller.env` | User-defined environment variables for controller. | `[]` |
`controller.extraEnv` | User-defined additional environment variables for controller. | `[]` |
`controller.extraVolumes` | User-defined additional volume definitions that will be added to the manager. | `[]` |
`controller.extraVolumeMounts` | User-defined additional volumeMount definitions that will be added to the manager. | `[]` |
`controller.ranchersso.enabled` | If true, enable single sign on for Rancher | `false` | Required for Rancher Authentication. |
`controller.pvc.enabled` | If true, enable persistence for controller using PVC | `false` | Require persistent volume type RWX, and storage 1Gi
`controller.pvc.accessModes` | Access modes for the created PVC. | `["ReadWriteMany"]` |
Expand Down Expand Up @@ -199,6 +202,9 @@ Parameter | Description | Default | Notes
` CUSTOM_PAGE_HEADER_COLOR` | use color name (yellow) or value (#ffff00) |
` CUSTOM_PAGE_FOOTER_CONTENT` | max. 120 characters, base64 encoded. |
` CUSTOM_PAGE_FOOTER_COLOR` | use color name (yellow) or value (#ffff00) |
`manager.extraEnv` | User-defined additional environment variables for manager. | `[]` |
`manager.extraVolumes` | User-defined additional volume definitions that will be added to the manager. | `[]` |
`manager.extraVolumeMounts` | User-defined additional volumeMount definitions that will be added to the manager. | `[]` |
`manager.svc.type` | set manager service type for native Kubernetes | `NodePort`;<br>if it is OpenShift platform or ingress is enabled, then default is `ClusterIP` | set to LoadBalancer if using cloud providers, such as Azure, Amazon, Google
`manager.svc.nodePort` | set manager service NodePort number | `nil` |
`manager.svc.loadBalancerIP` | if manager service type is LoadBalancer, this is used to specify the load balancer's IP | `nil` |
Expand Down
14 changes: 13 additions & 1 deletion charts/core/templates/controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ spec:
initialDelaySeconds: 5
periodSeconds: 5
env:
# Add extraEnv
{{- with .Values.controller.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
- name: CLUSTER_JOIN_ADDR
value: neuvector-svc-controller.{{ .Release.Namespace }}
- name: CLUSTER_ADVERTISED_ADDR
Expand Down Expand Up @@ -186,7 +190,11 @@ spec:
{{- with .Values.controller.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
volumeMounts:
# Add extraVolumeMounts
{{- with .Values.controller.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if or .Values.controller.pvc.enabled .Values.controller.azureFileShare.enabled }}
- mountPath: /var/neuvector
name: nv-share
Expand Down Expand Up @@ -261,6 +269,10 @@ spec:
terminationGracePeriodSeconds: 300
restartPolicy: Always
volumes:
# Add extraVolumes
{{- with .Values.controller.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or .Values.controller.pvc.enabled .Values.controller.azureFileShare.enabled }}
- name: nv-share
{{- if .Values.controller.pvc.enabled }}
Expand Down
12 changes: 12 additions & 0 deletions charts/core/templates/manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ spec:
containerPort: 8443
protocol: TCP
env:
# Add extraEnv
{{- with .Values.manager.extraEnv }}
{{- toYaml . | nindent 12 }}
{{- end }}
- name: CTRL_SERVER_IP
value: neuvector-svc-controller.{{ .Release.Namespace }}
{{- if not .Values.manager.env.ssl }}
Expand All @@ -101,6 +105,10 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
volumeMounts:
# Add extraVolumeMounts
{{- with .Values.manager.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.manager.certificate.secret }}
- mountPath: /etc/neuvector/certs/ssl-cert.key
subPath: {{ .Values.manager.certificate.keyFile }}
Expand Down Expand Up @@ -169,6 +177,10 @@ spec:
{{- end }}
restartPolicy: Always
volumes:
# Add extraVolumes
{{- with .Values.manager.extraVolumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.manager.certificate.secret }}
- name: cert
secret:
Expand Down
Loading