diff --git a/apps/neuvector/crds/kustomization.yaml b/apps/neuvector/crds/kustomization.yaml index 8303e24450a..1b0426a0cf8 100644 --- 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 \ No newline at end of file + - 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 \ No newline at end of file diff --git a/apps/neuvector/crds/kustomize.yaml b/apps/neuvector/crds/kustomize.yaml new file mode 100644 index 00000000000..c5802003843 --- /dev/null +++ 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 \ No newline at end of file diff --git a/apps/neuvector/neuvector/ithc/ithc.yaml b/apps/neuvector/neuvector/ithc/ithc.yaml index 747b751f1ee..ce8457c3212 100644 --- 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 index 0025b16f82f..84b01f3d887 100644 --- 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 index 747b751f1ee..ce8457c3212 100644 --- 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 index 1deacbacdaa..2d80fc83aca 100644 --- 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 index 658cd4bcc71..2e681ac06bf 100644 --- 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 \ No newline at end of file + - path: ../../../apps/admin/stg/base/kustomize.yaml + - path: ../../../apps/neuvector/crds/kustomize.yaml \ No newline at end of file diff --git a/clusters/test/base/kustomization.yaml b/clusters/test/base/kustomization.yaml index 670c19ee37f..09758dcbc5e 100644 --- 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