Change charts structure

.github/workflows/lint-test.yaml

@@ -13,7 +13,7 @@ jobs:
 
       - name: Run chart-testing (lint)
         id: lint
-        uses: helm/chart-testing-action@v1.1.0
+        uses: helm/chart-testing-action@dev-v2
         with:
           command: lint
           config: ct.yaml
@@ -23,7 +23,7 @@ jobs:
         if: steps.lint.outputs.changed == 'true'
 
       - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.1.0
+        uses: helm/chart-testing-action@dev-v2
         with:
           command: install
           config: ct.yaml

.github/workflows/publish.yaml

@@ -10,8 +10,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Publish Helm charts
-        uses: stefanprodan/helm-gh-pages@master
+        uses: becitsthere/helm-gh-pages@master
         with:
-          charts_dir: .
+          charts_dir: charts
           helm_version: 2.17.0
           token: ${{ secrets.HELM_PUBLISHER_TOKEN }}

Chart.yaml → charts/core/Chart.yaml

@@ -1,4 +1,4 @@
-name: neuvector-helm
+name: core
 apiVersion: v1
 version: 1.6.1
 appVersion: 4.0.0

README.md → charts/core/README.md

@@ -1,10 +1,4 @@
-# NeuVector
-
-Visibility and Security: The NeuVector ‘Multi-Vector Container Security Platform’
-
-[NeuVector](https://neuvector.com) provides a real-time Kubernetes and OpenShift container security solution that adapts easily to your changing environment and secures containers at their most vulnerable point – during run-time. The declarative security policy ensures that applications scale up or scale down quickly without manual intervention. The NeuVector solution is a Red Hat and Docker Certified container itself which deploys easily on each host, providing a container firewall, host monitoring and security, security auditing with CIS benchmarks, and vulnerability scanning.
-
-The installation will deploy the NeuVector Enforcer container on each worker node as a daemon set, and by default 3 controller containers (for HA, one is elected the leader). The controllers can be deployed on any node, including Master, Infra or management nodes. See the NeuVector docs for node labeling to control where controllers are deployed.
+# NeuVector Helm Chart
 
 ## Prerequisites
 
@@ -76,7 +70,7 @@ Where ’your-name’ is your Docker username, ’your-pword’ is your Docker p
 To install the chart with the release name `my-release` and image pull secret:
 
 ```console
-$ helm install --name my-release --namespace neuvector ./neuvector-helm/ --set imagePullSecrets=regsecret
+$ helm install --name my-release --namespace neuvector ./neuvector-helm/charts/core/  --set imagePullSecrets=regsecret
 ```
 
 > If you already installed neuvector in your cluster without using helm, please `kubectl delete -f your-neuvector-yaml.yaml` before trying to use helm install.
@@ -98,7 +92,7 @@ $ oc -n neuvector adm policy add-scc-to-user privileged -z default
 To install the chart with the release name `my-release` and your private registry:
 
 ```console
-$ helm install --name my-release --namespace neuvector ./neuvector-helm/ --set openshift=true,registry=your-private-registry
+$ helm install --name my-release --namespace neuvector ./neuvector-helm/charts/core/ --set openshift=true,registry=your-private-registry
 ```
 
 If you are using a private registry, and want to enable the updater cronjob, please create a script, run it as a cronjob before midnight or the updater daily schedule.
@@ -122,13 +116,7 @@ $ docker logout docker-registry.default.svc:5000
 Please `git pull` the latest neuvector-helm/ before upgrade.
 
 ```console
-$ helm upgrade my-release --set imagePullSecrets=regsecret,tag=2.2.0 ./neuvector-helm/
-```
-
-Please keep all of the previous settings you do not want to change during rolling upgrade.
-
-```console
-$ helm upgrade my-release --set openshift=true,registry=your-private-registry,cve.updater.enabled=true ./neuvector-helm/
+$ helm upgrade my-release --set imagePullSecrets=regsecret,tag=4.0.0 ./neuvector-helm/charts/core/
 ```
 
 ## Uninstalling the Chart

ct.yaml

@@ -1,4 +1,4 @@
 remote: origin
 chart-dirs:
-  - .
+  - charts
 chart-repos:

test/crd_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestCRD(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},

test/daemonset_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestEnforcerDaemonset(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -24,7 +24,7 @@ func TestEnforcerDaemonset(t *testing.T) {
 }
 
 func TestEnforcerDaemonsetRuntime(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{

test/deployment_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestControllerDeployment(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -24,7 +24,7 @@ func TestControllerDeployment(t *testing.T) {
 }
 
 func TestControllerDeploymentDisrupt(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -74,7 +74,7 @@ func checkManagerDeployment(t *testing.T, dep appsv1.Deployment, ssl bool) {
 }
 
 func TestManagerDeployment(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -100,7 +100,7 @@ func TestManagerDeployment(t *testing.T) {
 }
 
 func TestManagerDeploymentNonSSL(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{

test/ingress_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestIngress(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -43,7 +43,7 @@ func TestIngress(t *testing.T) {
 }
 
 func TestIngressManagerOnly(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{

test/psp_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestPSP(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{

test/role_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestRoleBinding(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -23,7 +23,7 @@ func TestRoleBinding(t *testing.T) {
 }
 
 func TestClusterRole(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -39,7 +39,7 @@ func TestClusterRole(t *testing.T) {
 }
 
 func TestClusterRoleBinding(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},

test/scanner_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestScanner(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{

test/service_test.go

@@ -68,7 +68,7 @@ func checkControllerServiceFedManaged(t *testing.T, svc corev1.Service, svcType
 }
 
 func TestControllerService(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -89,7 +89,7 @@ func TestControllerService(t *testing.T) {
 }
 
 func TestControllerServiceAPI(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -119,7 +119,7 @@ func TestControllerServiceAPI(t *testing.T) {
 }
 
 func TestControllerFedMaster(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -149,7 +149,7 @@ func TestControllerFedMaster(t *testing.T) {
 }
 
 func TestControllerServiceAPIandFedMaster(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -182,7 +182,7 @@ func TestControllerServiceAPIandFedMaster(t *testing.T) {
 }
 
 func TestControllerServiceAPIandFedManaged(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -215,7 +215,7 @@ func TestControllerServiceAPIandFedManaged(t *testing.T) {
 }
 
 func TestControllerServiceIngress(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -255,7 +255,7 @@ func checkManagerService(t *testing.T, svc corev1.Service, svcType string) {
 }
 
 func TestManagerService(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},
@@ -276,7 +276,7 @@ func TestManagerService(t *testing.T) {
 }
 
 func TestManagerServiceLB(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	svcType := "LoadBalancer"
 	options := &helm.Options{

test/updater_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestUpdater(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{
@@ -42,7 +42,7 @@ func TestUpdater(t *testing.T) {
 }
 
 func TestUpdaterWithScanner(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{

test/webhook_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestAdmWebhook(t *testing.T) {
-	helmChartPath := ".."
+	helmChartPath := "../charts/core"
 
 	options := &helm.Options{
 		SetValues: map[string]string{},