fix: NVSHAS-8682 remove misplaced resc from crds

charts/core/README.md

@@ -292,7 +292,8 @@ Parameter | Description | Default | Notes
 `bottlerocket.enabled` | Set to true if using AWS bottlerocket | `false` | Deprecated in 5.3.0.
 `bottlerocket.runtimePath` | If bottlerocket is enabled, this local containerd socket path will be used | `/run/dockershim.sock` | Deprecated in 5.3.0.
 `admissionwebhook.type` | admission webhook type | `ClusterIP` |
-`crdwebhook.enabled` | Enable crd service and create crd related resources | `true` |
+`crdwebhooksvc.enabled` | Enable crd service | `true` |
+`crdwebhook.enabled` | Create crd resources | `true` |
 `crdwebhook.type` | crd webhook type | `ClusterIP` |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

charts/core/templates/crd-webhook-service.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.crdwebhooksvc.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: neuvector-svc-crd-webhook
+  namespace: {{ .Release.Namespace }}
+  labels:
+    chart: {{ template "neuvector.chart" . }}
+    release: {{ .Release.Name }}
+spec:
+  ports:
+    - port: 443
+      targetPort: 30443
+      protocol: TCP
+      name: crd-webhook
+  type: {{ .Values.crdwebhook.type }}
+  selector:
+    app: neuvector-controller-pod
+{{- end }}

charts/core/templates/crd.yaml

@@ -974,22 +974,4 @@ spec:
             type: object
         type: object
 {{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: neuvector-svc-crd-webhook
-  namespace: {{ .Release.Namespace }}
-  labels:
-    chart: {{ template "neuvector.chart" . }}
-    release: {{ .Release.Name }}
-spec:
-  ports:
-    - port: 443
-      targetPort: 30443
-      protocol: TCP
-      name: crd-webhook
-  type: {{ .Values.crdwebhook.type }}
-  selector:
-    app: neuvector-controller-pod
 {{- end }}

charts/core/values.yaml

@@ -630,6 +630,9 @@ crio:
 admissionwebhook:
   type: ClusterIP
 
+crdwebhooksvc:
+  enabled: true
+
 crdwebhook:
   enabled: true
   type: ClusterIP

charts/crd/templates/crd.yaml

@@ -980,22 +980,3 @@ spec:
             type: object
         type: object
 {{- end }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: neuvector-svc-crd-webhook
-  namespace: {{ .Release.Namespace }}
-  labels:
-    chart: {{ template "neuvector.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-    - port: 443
-      targetPort: 30443
-      protocol: TCP
-      name: crd-webhook
-  type: {{ .Values.crdwebhook.type }}
-  selector:
-    app: neuvector-controller-pod

test/crd_test.go

@@ -17,7 +17,7 @@ func TestCRD(t *testing.T) {
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/crd.yaml"})
 	outs := splitYaml(out)
 
-	if len(outs) != 8 {
+	if len(outs) != 7 {
 		t.Errorf("Resource count is wrong. count=%v\n", len(outs))
 	}
 }
@@ -33,7 +33,7 @@ func TestCoreCRD(t *testing.T) {
 	out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/crd.yaml"})
 	outs := splitYaml(out)
 
-	if len(outs) != 8 {
+	if len(outs) != 7 {
 		t.Errorf("Resource count is wrong. count=%v\n", len(outs))
 	}
 }