From de46cc29a98c509b2c303cc5730a7ff0c7d0ab6d Mon Sep 17 00:00:00 2001 From: Simran Sian Date: Thu, 29 Aug 2024 09:25:50 +0100 Subject: [PATCH 1/4] Bump neuvector chart to version 1.5.9 --- apps/neuvector/neuvector/ithc/ithc.yaml | 3 +++ apps/neuvector/neuvector/stg/stg.yaml | 3 +++ apps/neuvector/neuvector/test/test.yaml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/apps/neuvector/neuvector/ithc/ithc.yaml b/apps/neuvector/neuvector/ithc/ithc.yaml index 747b751f1ee..9a9000de6c5 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.9 values: keyvault: name: sdsneuvector diff --git a/apps/neuvector/neuvector/stg/stg.yaml b/apps/neuvector/neuvector/stg/stg.yaml index 0025b16f82f..4383a622e5a 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.9 values: keyvault: name: sdsneuvector diff --git a/apps/neuvector/neuvector/test/test.yaml b/apps/neuvector/neuvector/test/test.yaml index 747b751f1ee..9a9000de6c5 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.9 values: keyvault: name: sdsneuvector From 94e6e29accd1f70027570f98f748f6611cc1a983 Mon Sep 17 00:00:00 2001 From: Simran Sian Date: Thu, 29 Aug 2024 09:52:13 +0100 Subject: [PATCH 2/4] Update neuvector CRDs --- FETCH_HEAD | 0 apps/neuvector/crds/kustomize.yaml | 26 ++++++++++++++++++++++++++ clusters/ithc/base/kustomization.yaml | 3 ++- clusters/stg/base/kustomization.yaml | 3 ++- clusters/test/base/kustomization.yaml | 3 ++- 5 files changed, 32 insertions(+), 3 deletions(-) delete mode 100644 FETCH_HEAD create mode 100644 apps/neuvector/crds/kustomize.yaml diff --git a/FETCH_HEAD b/FETCH_HEAD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/apps/neuvector/crds/kustomize.yaml b/apps/neuvector/crds/kustomize.yaml new file mode 100644 index 00000000000..92e8ff7d1b2 --- /dev/null +++ b/apps/neuvector/crds/kustomize.yaml @@ -0,0 +1,26 @@ +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: 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: 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/clusters/ithc/base/kustomization.yaml b/clusters/ithc/base/kustomization.yaml index 9948e9adee0..6f98ed55c0f 100644 --- a/clusters/ithc/base/kustomization.yaml +++ b/clusters/ithc/base/kustomization.yaml @@ -23,4 +23,5 @@ patches: kind: Kustomization annotationSelector: hmcts.github.com/kustomize-defaults != disabled - path: ../../../apps/toffee/ithc/base/kustomize.yaml - - path: ../../../apps/admin/ithc/base/kustomize.yaml \ No newline at end of file + - path: ../../../apps/admin/ithc/base/kustomize.yaml + - path: ../../../apps/neuvector/crds/kustomize.yaml \ No newline at end of file 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 f3d66ad3cb3..f8945899272 100644 --- a/clusters/test/base/kustomization.yaml +++ b/clusters/test/base/kustomization.yaml @@ -26,4 +26,5 @@ patches: kind: Kustomization annotationSelector: hmcts.github.com/kustomize-defaults != disabled - path: ../../../apps/toffee/test/base/kustomize.yaml - - path: ../../../apps/admin/test/base/kustomize.yaml \ No newline at end of file + - path: ../../../apps/admin/test/base/kustomize.yaml + - path: ../../../apps/neuvector/crds/kustomize.yaml \ No newline at end of file From bc558c2ff498af055270b5805712a565ffd1be15 Mon Sep 17 00:00:00 2001 From: Simran Sian Date: Thu, 29 Aug 2024 09:56:19 +0100 Subject: [PATCH 3/4] Make neuvector crd target unique --- apps/neuvector/crds/kustomize.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/neuvector/crds/kustomize.yaml b/apps/neuvector/crds/kustomize.yaml index 92e8ff7d1b2..c5802003843 100644 --- a/apps/neuvector/crds/kustomize.yaml +++ b/apps/neuvector/crds/kustomize.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: crds + name: neuvector-crds namespace: flux-system spec: interval: 10m @@ -17,7 +17,7 @@ metadata: spec: path: ./apps/neuvector/${ENVIRONMENT}/${CLUSTER} dependsOn: - - name: crds + - name: neuvector-crds postBuild: substitute: NAMESPACE: "neuvector" From b5e6b475c232df714221374f69d5eb714d790313 Mon Sep 17 00:00:00 2001 From: Simran Sian Date: Wed, 11 Dec 2024 11:27:56 +0000 Subject: [PATCH 4/4] Update neuvector chart version --- apps/neuvector/crds/kustomization.yaml | 8 ++++---- apps/neuvector/neuvector/ithc/ithc.yaml | 2 +- apps/neuvector/neuvector/stg/stg.yaml | 2 +- apps/neuvector/neuvector/test/test.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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/neuvector/ithc/ithc.yaml b/apps/neuvector/neuvector/ithc/ithc.yaml index 9a9000de6c5..ce8457c3212 100644 --- a/apps/neuvector/neuvector/ithc/ithc.yaml +++ b/apps/neuvector/neuvector/ithc/ithc.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: spec: - version: 1.5.9 + 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 4383a622e5a..84b01f3d887 100644 --- a/apps/neuvector/neuvector/stg/stg.yaml +++ b/apps/neuvector/neuvector/stg/stg.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: spec: - version: 1.5.9 + 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 9a9000de6c5..ce8457c3212 100644 --- a/apps/neuvector/neuvector/test/test.yaml +++ b/apps/neuvector/neuvector/test/test.yaml @@ -7,7 +7,7 @@ metadata: spec: chart: spec: - version: 1.5.9 + version: 1.5.14 values: keyvault: name: sdsneuvector