Merge branch 'master' into add-imagepullpolicy-value

AbrohamLincoln · Mar 22, 2024 · 7aee1b2 · 7aee1b2
2 parents 89ed828 + eccc60b
commit 7aee1b2
Show file tree

Hide file tree

Showing 569 changed files with 29,437 additions and 7,119 deletions.
diff --git a/.github/workflows/publish-on-tagging.yaml b/.github/workflows/publish-on-tagging.yaml
@@ -13,5 +13,5 @@ jobs:
         uses: becitsthere/helm-gh-pages@master
         with:
           charts_dir: charts
-          helm_version: 2.17.0
+          helm_version: 3.2.0
           token: ${{ secrets.HELM_PUBLISHER_TOKEN }}
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -12,5 +12,5 @@ jobs:
         uses: becitsthere/helm-gh-pages@master
         with:
           charts_dir: charts
-          helm_version: 2.17.0
+          helm_version: 3.2.0
           token: ${{ secrets.HELM_PUBLISHER_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+.*.swp
+.vscode
+*.code-workspace
+*.bak
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # NeuVector Helm charts
 
-A collection of Helm charts for deploying NeuVector product in Kubernetes and Openshift clusters.
+A collection of Helm charts for deploying NeuVector product in Kubernetes, Rancher and Openshift clusters.
 
 ## Installing charts
 
@@ -62,13 +62,19 @@ kubectl create namespace neuvector
 kubectl label  namespace neuvector "pod-security.kubernetes.io/enforce=privileged"
 ```
 
-- Configure Kubernetes to pull from the NeuVector container registry.
+- To install the chart with the release name `neuvector`.
 ```console
 helm install neuvector --namespace neuvector --create-namespace neuvector/core
 ```
 
 You can find a list of all config options in the [README of the core chart](charts/core).
 
+### Deploy in Rancher by SUSE
+
+
+You can find instructions for deploying NeuVector from Rancher charts here: https://open-docs.neuvector.com/deploying/rancher
+
+
 ### Deploy in RedHat OpenShift
 
 - Create a new project.

diff --git a/charts/core/Chart.yaml b/charts/core/Chart.yaml
@@ -1,7 +1,7 @@
 name: core
 apiVersion: v1
-version: 2.4.5
-appVersion: 5.1.3
+version: 2.7.3
+appVersion: 5.3.0
 description: Helm chart for NeuVector's core services
 home: https://neuvector.com
 icon: https://avatars2.githubusercontent.com/u/19367275?s=200&v=4

diff --git a/charts/core/README.md b/charts/core/README.md
diff --git a/charts/core/templates/NOTES.txt b/charts/core/templates/NOTES.txt
@@ -1,6 +1,9 @@
 {{- if and .Values.manager.enabled .Values.manager.ingress.enabled }}
 From outside the cluster, the NeuVector URL is:
 http://{{ .Values.manager.ingress.host }}
+{{- else if and .Values.manager.enabled .Values.manager.ingress.enabled .Values.manager.ingress.tls}}
+From outside the cluster, the NeuVector URL is:
+https://{{ .Values.manager.ingress.host }}
 {{- else if not .Values.openshift }}
 Get the NeuVector URL by running these commands:
 {{- if contains "NodePort" .Values.manager.svc.type }}
@@ -17,4 +20,4 @@ Get the NeuVector URL by running these commands:
   SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} neuvector-service-webui -o jsonpath="{.status.loadBalancer.ingress[0].ip}")
   echo https://$SERVICE_IP:8443
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/core/templates/_helpers.tpl b/charts/core/templates/_helpers.tpl
@@ -30,3 +30,19 @@ Create chart name and version as used by the chart label.
 {{- define "neuvector.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{/*
+Lookup secret.
+*/}}
+{{- define "neuvector.secrets.lookup" -}}
+{{- $value := "" -}}
+{{- $secretData := (lookup "v1" "Secret" .namespace .secret).data  -}}
+{{- if and $secretData (hasKey $secretData .key) -}}
+  {{- $value = index $secretData .key -}}
+{{- else if .defaultValue -}}
+  {{- $value = .defaultValue | toString | b64enc -}}
+{{- end -}}
+{{- if $value -}}
+{{- printf "%s" $value -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/core/templates/admission-webhook-service.yaml b/charts/core/templates/admission-webhook-service.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 spec:
   ports:
     - port: 443

diff --git a/charts/core/templates/clusterrole.yaml b/charts/core/templates/clusterrole.yaml
@@ -14,7 +14,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 rules:
 - apiGroups:
   - ""
@@ -44,7 +44,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 rules:
 {{- if .Values.openshift }}
 - apiGroups:
@@ -83,7 +83,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 rules:
 - apiGroups:
   - admissionregistration.k8s.io
@@ -108,7 +108,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 rules:
 - apiGroups:
   - config.openshift.io

diff --git a/charts/core/templates/clusterrolebinding-least.yaml b/charts/core/templates/clusterrolebinding-least.yaml
@@ -15,7 +15,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -46,7 +46,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -77,7 +77,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -108,7 +108,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -134,7 +134,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

diff --git a/charts/core/templates/clusterrolebinding.yaml b/charts/core/templates/clusterrolebinding.yaml
@@ -15,7 +15,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -46,7 +46,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -77,7 +77,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -108,7 +108,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
 {{- if not $oc3 }}
   apiGroup: rbac.authorization.k8s.io
@@ -134,7 +134,7 @@ metadata:
   labels:
     chart: {{ template "neuvector.chart" . }}
     release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    heritage: Helm
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole