Patch Neuvector in NonProd (#5863)

* Bump neuvector chart to version 1.5.9 * Update neuvector CRDs * Make neuvector crd target unique * Update neuvector chart version
hmcts · Dec 11, 2024 · 5dcf5a4 · 5dcf5a4
1 parent eff69b6
commit 5dcf5a4
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 5 deletions.
diff --git a/apps/neuvector/crds/kustomization.yaml b/apps/neuvector/crds/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.3.0/crd-k8s-1.19.yaml
-  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.3.0/waf-crd-k8s-1.19.yaml
-  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.3.0/dlp-crd-k8s-1.19.yaml
-  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.3.0/admission-crd-k8s-1.19.yaml
+  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.4.0/crd-k8s-1.19.yaml
+  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.4.0/waf-crd-k8s-1.19.yaml
+  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.4.0/dlp-crd-k8s-1.19.yaml
+  - https://raw.githubusercontent.com/neuvector/manifests/main/kubernetes/5.4.0/admission-crd-k8s-1.19.yaml
diff --git a/apps/neuvector/crds/kustomize.yaml b/apps/neuvector/crds/kustomize.yaml
@@ -0,0 +1,26 @@
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: neuvector-crds
+  namespace: flux-system
+spec:
+  interval: 10m
+  path: ./apps/neuvector/crds
+
+---
+
+apiVersion: kustomize.toolkit.fluxcd.io/v1
+kind: Kustomization
+metadata:
+  name: neuvector
+  namespace: flux-system
+spec:
+  path: ./apps/neuvector/${ENVIRONMENT}/${CLUSTER}
+  dependsOn:
+    - name: neuvector-crds
+  postBuild:
+    substitute:
+      NAMESPACE: "neuvector"
+      TEAM_NOTIFICATION_CHANNEL: "${ENV_MONITOR_CHANNEL}"
+      ENV_INJECTOR: "disabled"
+      WI_NAME: neuvector
diff --git a/apps/neuvector/neuvector/ithc/ithc.yaml b/apps/neuvector/neuvector/ithc/ithc.yaml
@@ -5,6 +5,9 @@ metadata:
   name: neuvector
   namespace: neuvector
 spec:
+  chart:
+    spec:
+      version: 1.5.14
   values:
     keyvault:
       name: sdsneuvector

diff --git a/apps/neuvector/neuvector/stg/stg.yaml b/apps/neuvector/neuvector/stg/stg.yaml
@@ -5,6 +5,9 @@ metadata:
   name: neuvector
   namespace: neuvector
 spec:
+  chart:
+    spec:
+      version: 1.5.14
   values:
     keyvault:
       name: sdsneuvector

diff --git a/apps/neuvector/neuvector/test/test.yaml b/apps/neuvector/neuvector/test/test.yaml
@@ -5,6 +5,9 @@ metadata:
   name: neuvector
   namespace: neuvector
 spec:
+  chart:
+    spec:
+      version: 1.5.14
   values:
     keyvault:
       name: sdsneuvector

diff --git a/clusters/ithc/base/kustomization.yaml b/clusters/ithc/base/kustomization.yaml
@@ -24,3 +24,4 @@ patches:
       annotationSelector: hmcts.github.com/kustomize-defaults != disabled
   - path: ../../../apps/toffee/ithc/base/kustomize.yaml
   - path: ../../../apps/admin/ithc/base/kustomize.yaml
+  - path: ../../../apps/neuvector/crds/kustomize.yaml
diff --git a/clusters/stg/base/kustomization.yaml b/clusters/stg/base/kustomization.yaml
@@ -28,4 +28,5 @@ patches:
       kind: Kustomization
       annotationSelector: hmcts.github.com/kustomize-defaults != disabled
   - path: ../../../apps/toffee/stg/base/kustomize.yaml
-  - path: ../../../apps/admin/stg/base/kustomize.yaml
+  - path: ../../../apps/admin/stg/base/kustomize.yaml
+  - path: ../../../apps/neuvector/crds/kustomize.yaml
diff --git a/clusters/test/base/kustomization.yaml b/clusters/test/base/kustomization.yaml
@@ -27,3 +27,4 @@ patches:
       annotationSelector: hmcts.github.com/kustomize-defaults != disabled
   - path: ../../../apps/toffee/test/base/kustomize.yaml
   - path: ../../../apps/admin/test/base/kustomize.yaml
+  - path: ../../../apps/neuvector/crds/kustomize.yaml