From a4dd02a6f5f342c6c18ec05b09184b532d90a610 Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Fri, 21 Mar 2025 06:16:35 +0000
Subject: [PATCH 1/9] SKIP UPDATE CHECK Update Ironbank
---
CHANGELOG.md | 7 +++++++
chart/Chart.yaml | 14 +++++++-------
chart/values.yaml | 2 +-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16ebc90..feb21d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
---
+## [2.8.5-bb.0] (2025-03-21)
+### Changed
+- registry1.dso.mil/ironbank/neuvector/neuvector/controller 5.4.1 -> 5.4.3
+- registry1.dso.mil/ironbank/neuvector/neuvector/enforcer 5.4.1 -> 5.4.3
+- registry1.dso.mil/ironbank/neuvector/neuvector/manager 5.4.1 -> 5.4.3
+- registry1.dso.mil/ironbank/neuvector/neuvector/scanner 5 -> 6
+
## [2.8.3-bb.1] - 2025-02-12
### Changed
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 8eeb44f..a6e639f 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,7 +1,7 @@
name: neuvector
apiVersion: v2
-version: 2.8.3-bb.1
-appVersion: 5.4.1
+version: 2.8.5-bb.0
+appVersion: 5.4.3
description: Helm chart for NeuVector's core services
home: https://neuvector.com
icon: https://avatars2.githubusercontent.com/u/19367275?s=200&v=4
@@ -24,20 +24,20 @@ annotations:
- [Find our upstream chart's CHANGELOG here](https://repo1.dso.mil/big-bang/product/packages/neuvector/-/blob/main/CHANGELOG.md?ref_type=heads)
- [and our upstream application release notes here](https://github.com/neuvector/neuvector/releases)
bigbang.dev/applicationVersions: |
- - NeuVector: 5.4.1
+ - NeuVector: 5.4.3
helm.sh/images: |
- name: controller
condition: controller.enabled
- image: registry1.dso.mil/ironbank/neuvector/neuvector/controller:5.4.1
+ image: registry1.dso.mil/ironbank/neuvector/neuvector/controller:5.4.3
- name: enforcer
condition: enforcer.enabled
- image: registry1.dso.mil/ironbank/neuvector/neuvector/enforcer:5.4.1
+ image: registry1.dso.mil/ironbank/neuvector/neuvector/enforcer:5.4.3
- name: manager
condition: manager.enabled
- image: registry1.dso.mil/ironbank/neuvector/neuvector/manager:5.4.1
+ image: registry1.dso.mil/ironbank/neuvector/neuvector/manager:5.4.3
- name: scanner
condition: cve.scanner.enabled
- image: registry1.dso.mil/ironbank/neuvector/neuvector/scanner:5
+ image: registry1.dso.mil/ironbank/neuvector/neuvector/scanner:6
- name: updater
condition: cve.updater.enabled
image: registry1.dso.mil/ironbank/big-bang/base:2.1.0
diff --git a/chart/values.yaml b/chart/values.yaml
index f7c21f5..5fb2c37 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -4,7 +4,7 @@
openshift: false
registry: registry1.dso.mil
-tag: 5.4.1
+tag: 5.4.3
oem:
imagePullSecrets: private-registry
psp: false
--
GitLab
From c2fa29fab0c68ba2540f5a4e1cfb3c40bcc92bf6 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Tue, 25 Mar 2025 15:24:04 -0400
Subject: [PATCH 2/9] update "chart"
(https://github.com/neuvector/neuvector-helm) from "v2.8.3"
(94c474eb7dc7b917acdd8c21c1193bdd2d2722f2) to "v2.8.5"
(fee6327bffc6eeba782ef18d502f0d9e6a70033f)
---
chart/Kptfile | 4 +-
chart/README.md | 19 ++++++
chart/templates/clusterrole.yaml | 25 +++++++
chart/templates/controller-lease.yaml | 2 +
chart/templates/controller-service.yaml | 3 +
chart/templates/crd-role-least.yaml | 31 +++++++++
chart/templates/crd-role.yaml | 31 +++++++++
chart/templates/crd.yaml | 71 ++++++++++++++++++++
chart/templates/manager-service.yaml | 3 +
chart/templates/registry-adapter-secret.yaml | 2 +-
chart/templates/rolebinding-least.yaml | 2 +-
chart/templates/rolebinding.yaml | 2 +-
chart/templates/scanner-deployment.yaml | 6 ++
chart/templates/upgrader-lease.yaml | 3 +
chart/values.yaml | 35 ++++++----
15 files changed, 222 insertions(+), 17 deletions(-)
diff --git a/chart/Kptfile b/chart/Kptfile
index ca6fa57..2686ab0 100644
--- a/chart/Kptfile
+++ b/chart/Kptfile
@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
- commit: 94c474eb7dc7b917acdd8c21c1193bdd2d2722f2
+ commit: fee6327bffc6eeba782ef18d502f0d9e6a70033f
repo: https://github.com/neuvector/neuvector-helm
directory: charts/core
- ref: v2.8.3
+ ref: v2.8.5
diff --git a/chart/README.md b/chart/README.md
index 4524ca8..1346000 100644
--- a/chart/README.md
+++ b/chart/README.md
@@ -10,6 +10,22 @@ Because the CRD (Custom Resource Definition) policies can be deployed before Neu
Prior to 5.3 release, the user has to specify the correct container runtime type and its socket path. In 5.3.0 release, the enforcer is able to automatically detect the container runtime at its default socket location. The settings of docker/containerd/crio/k8s/bottlerocket become deprecated. If the container runtime socket is not at the default location, please specify it using 'runtimePath' field. In the meantime, the controller does not require the runtime socket to be mounted any more.
+
+## Scan caching
+Scan caching can be enabled by editing values.yaml or creating below override file and pass them with "-f" option on HELM commands.
+```console
+cve:
+ scanner:
+ volumes:
+ - name: scan-cache
+ hostPath:
+ path: /tmp/
+ type: ""
+ volumeMounts:
+ - mountPath: /tmp/images/caches
+ name: scan-cache
+```
+
## Configuration
The following table lists the configurable parameters of the NeuVector chart and their default values.
@@ -76,6 +92,7 @@ Parameter | Description | Default | Notes
`controller.azureFileShare.secretName` | The name of the secret containing the Azure file share storage account name and key | `nil` |
`controller.azureFileShare.shareName` | The name of the Azure file share to use | `nil` |
`controller.apisvc.type` | Controller REST API service type | `nil` |
+`controller.apisvc.nodePort` | Controller REST API service NodePort number | `nil` |
`controller.apisvc.annotations` | Add annotations to controller REST API service | `{}` |
`controller.apisvc.route.enabled` | If true, create a OpenShift route to expose the Controller REST API service | `false` |
`controller.apisvc.route.termination` | Specify TLS termination for OpenShift route for Controller REST API service. Possible passthrough, edge, reencrypt | `passthrough` |
@@ -180,6 +197,7 @@ Parameter | Description | Default | Notes
`CUSTOM_PAGE_FOOTER_CONTENT` | max. 120 characters, base64 encoded. |
`CUSTOM_PAGE_FOOTER_COLOR` | use color name (yellow) or value (#ffff00) |
`manager.svc.type` | set manager service type for native Kubernetes | `NodePort`;<br>if it is OpenShift platform or ingress is enabled, then default is `ClusterIP` | set to LoadBalancer if using cloud providers, such as Azure, Amazon, Google
+`manager.svc.nodePort` | set manager service NodePort number | `nil` |
`manager.svc.loadBalancerIP` | if manager service type is LoadBalancer, this is used to specify the load balancer's IP | `nil` |
`manager.svc.annotations` | Add annotations to manager service | `{}` | see examples in [values.yaml](values.yaml)
`manager.route.enabled` | If true, create a OpenShift route to expose the management console service | `true` |
@@ -297,6 +315,7 @@ Parameter | Description | Default | Notes
`crdwebhooksvc.enabled` | Enable crd service | `true` |
`crdwebhook.enabled` | Create crd resources | `true` |
`crdwebhook.type` | crd webhook type | `ClusterIP` |
+`lease.enabled` | Create lease object or not | `true` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml
index 49228b7..e4612bd 100644
--- a/chart/templates/clusterrole.yaml
+++ b/chart/templates/clusterrole.yaml
@@ -97,6 +97,31 @@ rules:
---
+{{- if $oc3 }}
+apiVersion: authorization.openshift.io/v1
+{{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+{{- else }}
+apiVersion: v1
+{{- end }}
+kind: ClusterRole
+metadata:
+ name: neuvector-binding-nvgroupdefinitions
+ labels:
+ chart: {{ template "neuvector.chart" . }}
+ release: {{ .Release.Name }}
+rules:
+- apiGroups:
+ - neuvector.com
+ resources:
+ - nvgroupdefinitions
+ verbs:
+ - get
+ - list
+ - delete
+
+---
+
{{- if $oc4 }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
diff --git a/chart/templates/controller-lease.yaml b/chart/templates/controller-lease.yaml
index cccde54..0c8fdb7 100644
--- a/chart/templates/controller-lease.yaml
+++ b/chart/templates/controller-lease.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.lease.enabled }}
{{- if .Values.internal.autoGenerateCert }}
apiVersion: coordination.k8s.io/v1
kind: Lease
@@ -6,3 +7,4 @@ metadata:
spec:
leaseTransitions: 0
{{- end }}
+{{- end }}
diff --git a/chart/templates/controller-service.yaml b/chart/templates/controller-service.yaml
index 4705d49..0dc6ab9 100644
--- a/chart/templates/controller-service.yaml
+++ b/chart/templates/controller-service.yaml
@@ -40,6 +40,9 @@ spec:
ports:
- port: 10443
protocol: "TCP"
+{{- if .Values.controller.apisvc.nodePort }}
+ nodePort: {{ .Values.controller.apisvc.nodePort }}
+{{- end }}
name: "controller-api"
appProtocol: HTTPS
selector:
diff --git a/chart/templates/crd-role-least.yaml b/chart/templates/crd-role-least.yaml
index 45222a4..81bb87a 100644
--- a/chart/templates/crd-role-least.yaml
+++ b/chart/templates/crd-role-least.yaml
@@ -400,4 +400,35 @@ userNames:
- system:serviceaccount:{{ .Release.Namespace }}:controller
{{- end }}
+---
+
+# ClusterRoleBinding for NeuVector to manage name referral for common groups
+{{- if $oc3 }}
+apiVersion: authorization.openshift.io/v1
+{{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+{{- else }}
+apiVersion: v1
+{{- end }}
+kind: ClusterRoleBinding
+metadata:
+ name: neuvector-binding-nvgroupdefinitions
+ labels:
+ chart: {{ template "neuvector.chart" . }}
+ release: {{ .Release.Name }}
+roleRef:
+{{- if not $oc3 }}
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+{{- end }}
+ name: neuvector-binding-nvgroupdefinitions
+subjects:
+- kind: ServiceAccount
+ name: controller
+ namespace: {{ .Release.Namespace }}
+{{- if $oc3 }}
+userNames:
+- system:serviceaccount:{{ .Release.Namespace }}:controller
+{{- end }}
+
{{- end }}
diff --git a/chart/templates/crd-role.yaml b/chart/templates/crd-role.yaml
index ffa029c..63feece 100644
--- a/chart/templates/crd-role.yaml
+++ b/chart/templates/crd-role.yaml
@@ -400,4 +400,35 @@ userNames:
- system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.serviceAccount }}
{{- end }}
+---
+
+# Clusterrolebinding for Neuvector to manage name referral for common groups
+{{- if $oc3 }}
+apiVersion: authorization.openshift.io/v1
+{{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
+apiVersion: rbac.authorization.k8s.io/v1
+{{- else }}
+apiVersion: v1
+{{- end }}
+kind: ClusterRoleBinding
+metadata:
+ name: neuvector-binding-nvgroupdefinitions
+ labels:
+ chart: {{ template "neuvector.chart" . }}
+ release: {{ .Release.Name }}
+roleRef:
+{{- if not $oc3 }}
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+{{- end }}
+ name: neuvector-binding-nvgroupdefinitions
+subjects:
+- kind: ServiceAccount
+ name: {{ .Values.serviceAccount }}
+ namespace: {{ .Release.Namespace }}
+{{- if $oc3 }}
+userNames:
+- system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.serviceAccount }}
+{{- end }}
+
{{- end }}
diff --git a/chart/templates/crd.yaml b/chart/templates/crd.yaml
index 15834c9..c97bbdf 100644
--- a/chart/templates/crd.yaml
+++ b/chart/templates/crd.yaml
@@ -72,6 +72,8 @@ spec:
type: array
name:
type: string
+ name_referral:
+ type: boolean
original_name:
type: string
required:
@@ -143,6 +145,8 @@ spec:
type: array
name:
type: string
+ name_referral:
+ type: boolean
original_name:
type: string
required:
@@ -218,6 +222,8 @@ spec:
type: array
name:
type: string
+ name_referral:
+ type: boolean
original_name:
type: string
mon_metric:
@@ -351,6 +357,8 @@ spec:
type: array
name:
type: string
+ name_referral:
+ type: boolean
original_name:
type: string
required:
@@ -422,6 +430,8 @@ spec:
type: array
name:
type: string
+ name_referral:
+ type: boolean
original_name:
type: string
required:
@@ -497,6 +507,8 @@ spec:
type: array
name:
type: string
+ name_referral:
+ type: boolean
original_name:
type: string
mon_metric:
@@ -974,4 +986,63 @@ spec:
type: object
type: object
{{- end }}
+---
+{{- if (semverCompare ">=1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
+apiVersion: apiextensions.k8s.io/v1
+{{- else }}
+apiVersion: apiextensions.k8s.io/v1beta1
+{{- end }}
+kind: CustomResourceDefinition
+metadata:
+ name: nvgroupdefinitions.neuvector.com
+spec:
+ group: neuvector.com
+ names:
+ kind: NvGroupDefinition
+ listKind: NvGroupDefinitionList
+ plural: nvgroupdefinitions
+ singular: nvgroupdefinition
+ scope: Namespaced
+{{- if (semverCompare "<1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
+ version: v1
+{{- end }}
+ versions:
+ - name: v1
+ served: true
+ storage: true
+{{- if (semverCompare ">=1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
+ schema:
+ openAPIV3Schema:
+ properties:
+ spec:
+ properties:
+ selector:
+ properties:
+ comment:
+ type: string
+ criteria:
+ items:
+ properties:
+ key:
+ type: string
+ op:
+ type: string
+ value:
+ type: string
+ required:
+ - key
+ - op
+ - value
+ type: object
+ type: array
+ name:
+ type: string
+ required:
+ - name
+ type: object
+ required:
+ - selector
+ type: object
+ type: object
+{{- end }}
{{- end }}
diff --git a/chart/templates/manager-service.yaml b/chart/templates/manager-service.yaml
index b310f63..b947674 100644
--- a/chart/templates/manager-service.yaml
+++ b/chart/templates/manager-service.yaml
@@ -20,6 +20,9 @@ spec:
- port: 8443
name: manager
protocol: TCP
+{{- if .Values.manager.svc.nodePort }}
+ nodePort: {{ .Values.manager.svc.nodePort }}
+{{- end }}
{{- if or (.Capabilities.KubeVersion.GitVersion | contains "-eks") (.Capabilities.KubeVersion.GitVersion | contains "-gke") }}
{{- if .Values.manager.env.ssl }}
appProtocol: HTTPS
diff --git a/chart/templates/registry-adapter-secret.yaml b/chart/templates/registry-adapter-secret.yaml
index 66f0d80..3317e93 100644
--- a/chart/templates/registry-adapter-secret.yaml
+++ b/chart/templates/registry-adapter-secret.yaml
@@ -5,7 +5,7 @@
{{- $cert = (dict "Key" .Values.cve.adapter.certificate.key "Cert" .Values.cve.adapter.certificate.certificate ) }}
{{- else }}
{{- $cn := "neuvector" }}
-{{- $cert = genSelfSignedCert $cn nil (list $cn "neuvector-service-registry-adapter.cattle-neuvector-system.svc.cluster.local" "neuvector-service-registry-adapter") (.Values.defaultValidityPeriod | int) -}}
+{{- $cert = genSelfSignedCert $cn nil (list $cn (print "neuvector-service-registry-adapter." (default "neuvector" .Release.Namespace) ".svc.cluster.local") "neuvector-service-registry-adapter") (.Values.defaultValidityPeriod | int) -}}
{{- end }}
apiVersion: v1
diff --git a/chart/templates/rolebinding-least.yaml b/chart/templates/rolebinding-least.yaml
index a3effd3..d400853 100644
--- a/chart/templates/rolebinding-least.yaml
+++ b/chart/templates/rolebinding-least.yaml
@@ -98,7 +98,6 @@ subjects:
userNames:
- system:serviceaccount:{{ .Release.Namespace }}:controller
{{- end }}
-{{- end }}
---
{{- if $oc3 }}
apiVersion: authorization.openshift.io/v1
@@ -128,6 +127,7 @@ subjects:
userNames:
- system:serviceaccount:{{ .Release.Namespace }}:cert-upgrader
{{- end }}
+{{- end }}
---
{{- if $oc3 }}
apiVersion: authorization.openshift.io/v1
diff --git a/chart/templates/rolebinding.yaml b/chart/templates/rolebinding.yaml
index 8a721dc..ee2e9f6 100644
--- a/chart/templates/rolebinding.yaml
+++ b/chart/templates/rolebinding.yaml
@@ -110,7 +110,6 @@ subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount }}
namespace: {{ .Release.Namespace }}
-{{- end }}
---
{{- if $oc3 }}
apiVersion: authorization.openshift.io/v1
@@ -170,4 +169,5 @@ userNames:
- system:serviceaccount:{{ .Release.Namespace }}:cert-upgrader
{{- end }}
{{- end }}
+{{- end }}
diff --git a/chart/templates/scanner-deployment.yaml b/chart/templates/scanner-deployment.yaml
index 117f7af..abc498b 100644
--- a/chart/templates/scanner-deployment.yaml
+++ b/chart/templates/scanner-deployment.yaml
@@ -165,6 +165,9 @@ spec:
- mountPath: /etc/neuvector/certs/internal/
name: bigbang-readable-certs
{{- end }}
+ {{- with .Values.cve.scanner.volumeMounts }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
restartPolicy: Always
volumes:
{{- if or .Values.internal.certmanager.enabled .Values.cve.scanner.internal.certificate.secret }}
@@ -179,4 +182,7 @@ spec:
- name: bigbang-readable-certs
emptyDir:
sizeLimit: 50Mi
+ {{- with .Values.cve.scanner.volumes }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- end }}
diff --git a/chart/templates/upgrader-lease.yaml b/chart/templates/upgrader-lease.yaml
index 2afa935..724ed79 100644
--- a/chart/templates/upgrader-lease.yaml
+++ b/chart/templates/upgrader-lease.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.lease.enabled }}
{{- if .Values.internal.autoGenerateCert }}
apiVersion: coordination.k8s.io/v1
kind: Lease
@@ -6,3 +7,5 @@ metadata:
spec:
leaseTransitions: 0
{{- end }}
+{{- end }}
+
diff --git a/chart/values.yaml b/chart/values.yaml
index 5fb2c37..41d52a3 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -63,7 +63,8 @@ internal:
enabled: false
secretname: neuvector-internal
autoGenerateCert: true
- autoRotateCert: false
+ autoRotateCert: true
+
controller:
# If false, controller will not be installed
enabled: true
@@ -111,6 +112,7 @@ controller:
apisvc:
type:
annotations: {}
+ nodePort:
# OpenShift Route configuration
# Controller supports HTTPS only, so edge termination not supported
route:
@@ -327,7 +329,7 @@ controller:
enabled: false
image:
repository: neuvector/compliance-config
- tag: 1.0.1
+ tag: 1.0.4
hash:
enforcer:
# If false, enforcer will not be installed
@@ -380,6 +382,7 @@ manager:
value: "-Dcom.redhat.fips=false"
svc:
type: ClusterIP
+ nodePort:
loadBalancerIP:
annotations: {}
# azure
@@ -465,7 +468,7 @@ cve:
enabled: false
image:
repository: neuvector/registry-adapter
- tag: 0.1.3
+ tag: 0.1.6
hash:
priorityClassName:
resources: {}
@@ -505,7 +508,7 @@ cve:
protocol: https
secretName:
svc:
- type: NodePort # should be set to - ClusterIP
+ type: ClusterIP
loadBalancerIP:
annotations: {}
# azure
@@ -596,7 +599,7 @@ cve:
maxUnavailable: 0
image:
repository: ironbank/neuvector/neuvector/scanner
- tag: "5"
+ tag: "6"
hash:
priorityClassName:
resources: {}
@@ -633,13 +636,16 @@ cve:
capabilities:
drop:
- ALL
-resources: {}
-# limits:
-# cpu: 400m
-# memory: 2792Mi
-# requests:
-# cpu: 100m
-# memory: 2280Mi
+ volumes:
+ volumeMounts:
+resources:
+ {}
+ # limits:
+ # cpu: 400m
+ # memory: 2792Mi
+ # requests:
+ # cpu: 100m
+ # memory: 2280Mi
runtimePath:
# The following runtime type and socket location are deprecated after 5.3.0.
@@ -733,6 +739,9 @@ monitor:
enabled: false
svc:
enabled: false
+lease:
+ enabled: true
+
# Bigbang helm test values default disabled
bbtests:
enabled: false
@@ -752,3 +761,5 @@ bbtests:
URL: "http://neuvector-service-webui.{{ .Release.Namespace }}.svc.cluster.local:8443"
exporter:
enabled: false
+
+
--
GitLab
From e8b7b3f7f5a58e9a0969d7bbdbc733f10816cecb Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Tue, 25 Mar 2025 15:51:15 -0400
Subject: [PATCH 3/9] update gluon
---
CHANGELOG.md | 3 ++-
README.md | 19 ++++++++++++-------
chart/Chart.lock | 6 +++---
chart/Chart.yaml | 2 +-
chart/charts/gluon-0.5.12.tgz | Bin 4658 -> 0 bytes
chart/charts/gluon-0.5.14.tgz | Bin 0 -> 4680 bytes
chart/charts/monitor-2.6.3.tgz | Bin 7546 -> 7545 bytes
7 files changed, 18 insertions(+), 12 deletions(-)
delete mode 100644 chart/charts/gluon-0.5.12.tgz
create mode 100644 chart/charts/gluon-0.5.14.tgz
diff --git a/CHANGELOG.md b/CHANGELOG.md
index feb21d5..7780113 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
---
-## [2.8.5-bb.0] (2025-03-21)
+## [2.8.5-bb.0] (2025-03-25)
### Changed
- registry1.dso.mil/ironbank/neuvector/neuvector/controller 5.4.1 -> 5.4.3
- registry1.dso.mil/ironbank/neuvector/neuvector/enforcer 5.4.1 -> 5.4.3
- registry1.dso.mil/ironbank/neuvector/neuvector/manager 5.4.1 -> 5.4.3
- registry1.dso.mil/ironbank/neuvector/neuvector/scanner 5 -> 6
+- Updated gluon from 0.5.12 to 0.5.14
## [2.8.3-bb.1] - 2025-02-12
diff --git a/README.md b/README.md
index b3ed1e8..fa1746c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
<!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
# neuvector
-  
+  
Helm chart for NeuVector's core services
@@ -44,7 +44,7 @@ helm install neuvector chart/
|-----|------|---------|-------------|
| openshift | bool | `false` | |
| registry | string | `"registry1.dso.mil"` | |
-| tag | string | `"5.4.1"` | |
+| tag | string | `"5.4.3"` | |
| oem | string | `nil` | |
| imagePullSecrets | string | `"private-registry"` | |
| psp | bool | `false` | |
@@ -87,7 +87,7 @@ helm install neuvector chart/
| internal.certmanager.enabled | bool | `false` | |
| internal.certmanager.secretname | string | `"neuvector-internal"` | |
| internal.autoGenerateCert | bool | `true` | |
-| internal.autoRotateCert | bool | `false` | |
+| internal.autoRotateCert | bool | `true` | |
| controller.enabled | bool | `true` | |
| controller.annotations | object | `{}` | |
| controller.strategy.type | string | `"RollingUpdate"` | |
@@ -117,6 +117,7 @@ helm install neuvector chart/
| controller.nodeSelector | object | `{}` | |
| controller.apisvc.type | string | `nil` | |
| controller.apisvc.annotations | object | `{}` | |
+| controller.apisvc.nodePort | string | `nil` | |
| controller.apisvc.route.enabled | bool | `false` | |
| controller.apisvc.route.termination | string | `"passthrough"` | |
| controller.apisvc.route.host | string | `nil` | |
@@ -206,7 +207,7 @@ helm install neuvector chart/
| controller.certupgrader.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | |
| controller.prime.enabled | bool | `false` | |
| controller.prime.image.repository | string | `"neuvector/compliance-config"` | |
-| controller.prime.image.tag | string | `"1.0.1"` | |
+| controller.prime.image.tag | string | `"1.0.4"` | |
| controller.prime.image.hash | string | `nil` | |
| enforcer.enabled | bool | `true` | |
| enforcer.image.repository | string | `"ironbank/neuvector/neuvector/enforcer"` | |
@@ -236,6 +237,7 @@ helm install neuvector chart/
| manager.env.envs[0].name | string | `"JDK_JAVA_OPTIONS"` | |
| manager.env.envs[0].value | string | `"-Dcom.redhat.fips=false"` | |
| manager.svc.type | string | `"ClusterIP"` | |
+| manager.svc.nodePort | string | `nil` | |
| manager.svc.loadBalancerIP | string | `nil` | |
| manager.svc.annotations | object | `{}` | |
| manager.route.enabled | bool | `true` | |
@@ -273,7 +275,7 @@ helm install neuvector chart/
| manager.probes.startupFailureThreshold | int | `30` | |
| cve.adapter.enabled | bool | `false` | |
| cve.adapter.image.repository | string | `"neuvector/registry-adapter"` | |
-| cve.adapter.image.tag | string | `"0.1.3"` | |
+| cve.adapter.image.tag | string | `"0.1.6"` | |
| cve.adapter.image.hash | string | `nil` | |
| cve.adapter.priorityClassName | string | `nil` | |
| cve.adapter.resources | object | `{}` | |
@@ -292,7 +294,7 @@ helm install neuvector chart/
| cve.adapter.certificate.pemFile | string | `"tls.crt"` | |
| cve.adapter.harbor.protocol | string | `"https"` | |
| cve.adapter.harbor.secretName | string | `nil` | |
-| cve.adapter.svc.type | string | `"NodePort"` | |
+| cve.adapter.svc.type | string | `"ClusterIP"` | |
| cve.adapter.svc.loadBalancerIP | string | `nil` | |
| cve.adapter.svc.annotations | object | `{}` | |
| cve.adapter.route.enabled | bool | `true` | |
@@ -338,7 +340,7 @@ helm install neuvector chart/
| cve.scanner.strategy.rollingUpdate.maxSurge | int | `1` | |
| cve.scanner.strategy.rollingUpdate.maxUnavailable | int | `0` | |
| cve.scanner.image.repository | string | `"ironbank/neuvector/neuvector/scanner"` | |
-| cve.scanner.image.tag | string | `"5"` | |
+| cve.scanner.image.tag | string | `"6"` | |
| cve.scanner.image.hash | string | `nil` | |
| cve.scanner.priorityClassName | string | `nil` | |
| cve.scanner.resources | object | `{}` | |
@@ -361,6 +363,8 @@ helm install neuvector chart/
| cve.scanner.containerSecurityContext.runAsGroup | int | `1000` | |
| cve.scanner.containerSecurityContext.runAsNonRoot | bool | `true` | |
| cve.scanner.containerSecurityContext.capabilities.drop[0] | string | `"ALL"` | |
+| cve.scanner.volumes | string | `nil` | |
+| cve.scanner.volumeMounts | string | `nil` | |
| resources | object | `{}` | |
| runtimePath | string | `nil` | |
| docker.path | string | `"/var/run/docker.sock"` | |
@@ -410,6 +414,7 @@ helm install neuvector chart/
| monitor.exporter.enabled | bool | `false` | |
| monitor.exporter.serviceMonitor.enabled | bool | `false` | |
| monitor.exporter.svc.enabled | bool | `false` | |
+| lease.enabled | bool | `true` | |
| bbtests.enabled | bool | `false` | |
| bbtests.cypress.artifacts | bool | `true` | |
| bbtests.cypress.envs.cypress_url | string | `"http://neuvector-service-webui.{{ .Release.Namespace }}.svc.cluster.local:8443"` | |
diff --git a/chart/Chart.lock b/chart/Chart.lock
index b05ec43..1432785 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
version: 2.6.3
- name: gluon
repository: oci://registry1.dso.mil/bigbang
- version: 0.5.12
-digest: sha256:86278d93fc2e07fd36143f17d4569f74b86f3f0a943888e0adfb8d9c3160e999
-generated: "2024-12-03T10:12:38.721016-05:00"
+ version: 0.5.14
+digest: sha256:372ab4cfe8a7985f357ed4016ace221aca8ab39c3f70c374a1c7343952996bfc
+generated: "2025-03-25T15:49:17.156699-04:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index a6e639f..815c92d 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -16,7 +16,7 @@ dependencies:
condition: monitor.install
repository: file://./deps/monitor
- name: gluon
- version: "0.5.12"
+ version: "0.5.14"
repository: "oci://registry1.dso.mil/bigbang"
annotations:
bigbang.dev/maintenanceTrack: bb_integrated
diff --git a/chart/charts/gluon-0.5.12.tgz b/chart/charts/gluon-0.5.12.tgz
deleted file mode 100644
index 002bdc40c2d4eb3144041bde2fab7d61a60c84d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4658
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
diff --git a/chart/charts/gluon-0.5.14.tgz b/chart/charts/gluon-0.5.14.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..c99d9e0f44b4d35311fda2b49ee005cbbea4fb67
GIT binary patch
literal 4680
zcmV-O61VLiiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PH<!bK5wU`K({@mT_e)Z%9h=)vKxAt#p#kWY$SsNhaG<sV)~p
zLK0$<U<05Wx0C(tTL2G%H+A@!tXLICBp)7t2fPFCkY-*)1N-?LF=1UJ-+Ocm*I+Oh
zoE#mg{|AFX@&Cc_==9O>==5kb7z_ueCyxfh(cx(D2nM$?nBo<2f!L$L#(fnh_b+mx
zkbJ_76B>+RG3vRPJB)-v-9LjfGGT~a!{4yygCjQyOeuq3$m|ys%z6Rx@fg$=>WS+R
zkHL!@^cE@3fpu&Rk9zk#&D~XV#r!X@A9_e&ZeK)#cw3ePZTx?Fcv9g1qr=nV9sl3O
zb#r5aeb7_ez*1}PV>ZKZMLZAUkK&5LKcBrhgKU=o3S6L(2qOVvj)7qwdBW;_oD&WL
zT`CAbjG=3wQxJ28F)WZ5VLtAes)?W>I5ZIWt4N<D*g;B_xEThzz>E<WbJ%w=7bHMZ
zH1(UBOc2Mg&uPRQ-0vOO-@o_dBwaiu0S2QuQv(u!JvpTD&oCv73$U`s%OS{@jQamX
zz6bjxaJ<OH@`H=Nf(66ALeYnBvM&^Q0`^_v2<R_+2)!00qgEt>#!ch3(MBh+XHYnB
z<;V8*FY^CnVhYR!w=bOQkYUap8cfN|N8$QHp@sj4ho{3l|BnX8!^0i_-^EpC4YmAM
zvijz7`6XXv%tEGMeNqf<O(v>E{TmAhXyReDA#>)&uy;uUcMQ)}A8%0D^RYlK5@_55
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
KeLEuniU0uMmp>~2
literal 0
HcmV?d00001
diff --git a/chart/charts/monitor-2.6.3.tgz b/chart/charts/monitor-2.6.3.tgz
index bdb8289fd2f7b00a7332aa0fd64a542410c02cc6..3947216749eef8fc39bdaaaf733542306d1b0db6 100644
GIT binary patch
delta 7532
zcmV-y9h2hvI{7+~PJgfgPxrh>fbQgV77ozqm+9mXx$3&Crb?=oR1WUIcYjAx?Tc+7
ztZ|)_V3+o*yX#)rXOu|B*LNqF%hnA0-gjU9X}8<$!N!LE+itguf7=_~-glji&CT|p
zz0uw5f7kAG2b;a`Q2XmorTm0KV*XwG+G7<L_dp&TkaxfZVSjXprkw^3g5+zz)oZmI
z4hWl*K<Za7!1Ix<Pz8+{M{gi}2exD!MQDTs@F}rDG$zc4A(}`Th~fG=g>b4Xwru7%
zh^_jH%kUIS%tg255;+M+p#W|(DuGH>c|Bb3Z1)D6-Oc`gi66V|_CKaSZZv#MsKkT<
z7sEyqfsctdM1LX-0><Tk=SM?`Vl|f$*hC6B0S*oGCYp3(8n3w98nk+iyWWypePa5b
zVlM=7GYnt>{rB3vPJ#Y=o$ls}{%_-Xg7#pHLr)@u0h+E;0%|-##}gtD5eTFAJFj0g
z$Bg?}N^sDac%Ulmf$d=qXo@+(BM$_U42=K<SO{<sp?{JgIRPZW4?HYEv>J_wPwdz>
z3#l9;$4sKp;NTJ=`D}>dPo0({Sj#6~gMmM6G~i4TIq+cvp(p6&7>%(fU=79Z(P!d$
zh%%|>K&X(|^T25!1XRt=8JY$Sgouw_P~9NJAz(rg!fc2LXLN+=Y09-Sp90Q&kP`?+
zGagWPAb+uIIA&K*%bsBBDo7~cNro`ufE`A?8Bz=m{jGt}?(yNPlV6Ya58v#(-X9|D
z_=Lu<4|a}@etUbk7r$;Gq?n>+c}HM}oXFX(;*w`FT0ls5#IFMQ5Ovz^PWtX=&cYz`
z(#8QE5syd$!Zbz5;Vg(hBh*AYuU@GU1Lo{d%6}wQ%wG)Amkae)Ol?!Q1W$zIEPx?;
z!yGtZT<TXI!_IT;VQK?^d0<-NLa%1rC$aQsjX>hoX*dE-LE#Hw>-evbLsNCu97Vk~
z36;Pp_J+ukJOt~y{WL{5q9BLJ!a*RSZ<b!O>F~8-mbJ?l_5_q*vCLGYCw3Vf6E|7p
z6My945qO5m6ipoEI&K+==_;8v8F0;QSOwN6=*Z?cP?R8nPqEihB%`Q9fLzmE9V93n
zlOYoMHj4a10gf3aew(cG33?5Z6Z;VK)Xka=+6RF*Qy&EO1H~EeSW&3%o=|rUjY37H
zW5(5BE(kUGR@5nnajGR4<v?o$84_dxaDQAN%jDh2W21GYDXi}?JM@7X*sSA#w0!3Y
zH?y_%Z1s?Sb`^xWVu*hK7)@r0wMFZQ7k5{y;Dz}&5OO&lV~Y2%n2Z?aPAvjwQ17k<
z)9SgEC)WQG;k<q_0WSb9S~B=bs^9|suiNew?Z19^&|m3)xAA=Wvi?srCH_#!1And3
zDH;BwufSqYV2J*?esR%IwHo_p0j7=?8OnY_Y^*<PbFkHj>NS-NArz36Dv_$Tg_>!(
zmN6~ka(JV<YP~b&hpPE@3Y-%M&^eMkq&6D#^he?!h2t?fLsm2G45*_&n;GtMz!DHn
z#u$g5H$#7h*dt>Cj^f#R?ybgeV1Iho^`#m^twS+!8;1grU_PK<64k-1cuc@^1X9Yb
zM|`4`V6EE{fu4?L8X9|Vj#OPjT_ggqpS2n<$BHEb77^GYJx)Y+w0=jV(OO5K<t)NV
z-By#2W;+MCs#YGrWSqb=E=*t=*Qu?r6wp19_Vm48!0^ZA_cb%m1Qw>3)_<V^lxdvI
zHTU+?6AU<^a*V9Mi{{^jRp`x(dl^it`<%nT%+@NBi5v`STlMxvxMFH)nLBrjbv>(g
zL0Nd4&yfoUoh!S>!!{u6|69m9u`adJyJk(R=N6u_{C8q4@vAw57WscSH@Zdn-yf{}
zzqj%f1V-%BXcbL{R%9)pi+_to!DoC*s53;yGJ1`Jh7S@uSmI&gdZp85)L%2fuBcE1
z*oGnc@@0uBB=ymGDs8gt+!S6Y%Qv!Qv{e&zbdrocL{`Tt%F6n2Bb)ugSk$VSWbd)>
zE#LGUQ9>P{5^ZFd?8QYRfzvddUF#2_AbZ|WK>3MyAX-0zL{?HktbdoPE6yH|fbv7k
z-~TfG$BSt?5O{2+EY53kf(7*7Z+H6z`rjN3IxG6Wji-(XVsdX5=p6@vSWk$4FF}zi
zs*e?zW`)zV8L$c#ummw{Wk}bKQMN)=YQ@AFY2M}D;|detL}Is4Bl51PN=l1YBP&gc
z*jNlvM>_;PJ)oJBkAI~-d6k(YQgB)h0`V$_u?s4JV$r3SIB3((T7<0!SWbp$-8ipA
zT_vV~W^J_xTUJdK<MS){QVqMSLXf<3I0ok;23cs8^2M!U4-xl@U)d9|Petgj3$QsD
z1R&J*LI==Otr4T|TgMSBThFn811u-Vit1|)W<5hKbdJOXcYpf>5&CKWUT*I$v3urO
zh-K<YP8n4tqo?mAr>$|t7~4v4*Jl+6q30dx^<)5EEXg|Z4IyTPYh5=5h!+M|3z7$%
zOo<0>W>NW5oHyo}6$@flmS@WnD{XFHnTh9%>zXamq=Z|^xk?4(mPY}k5ps;+&t&}g
z01H_TvrmC5B7aLdw6drXH;!8}@bksyqzYM?)g`@OT&!nao2FIARKqGAOLyFo*hLo?
zR&GAU{aIofUuDod*<W!c^`oW-edyxi`m;;u>415}o(<8C_ZiPbriQ3Gt;_ZqvC8jD
z6RA7!%W%z3H$NSl`94;H`FCWAiM58Trmg-DsU#k<Lx1j}ra;Z6%_s$1HYM?ag%b5q
z^RyhS(G*i#Rh6819`IqOy|K|l=g8#{pbyrshp+TO(wK$R`Cy@cA%`L10R*W3F9i04
zp%2yzz@D5K_Kn7vc;K|qZ<t6zU4599_TTzosV*oajdznWGl;Gc%;bd89%_bYJrsQ1
zV>b5IM}LGWtvD4lGwWjpFhHky$j20}Pg{2mUY;E7AHI9JyPvCs%%OOe4^)Aqvg7^#
zJ$QR~ynlG2{#5r`5XX9!KXK+4XKF;)A&iHGewNm>nx>1WIR~Zl$^yzRZ8EH$NA%3G
z|Kd~hYrBCK*ngdVccW<kbv9P^->p26riZChZ+`=pOT^T!wGb2IFfyVpYZ)$W6{@L!
zCUR0eJzO+SN~V-DAtN&->!3+HPo(`_+Mj4Cb0jfSO$1JrUZa4bO4Ie#?YpX(58FXc
zGkR^gN9$Flw)HFmT0Zcnc20$n%FtJJBj7iYF=UnCY-A;1-uji8yC4sWRRhi>vza$U
z$A7yAshxh1yjB`e$+%zA7JQ)Mb20yqYFtAMER6r`7yN(ScE8_U@&DU+>fAf|h__m1
zA0Y>!Zp&sIn9#9JMG+A7au<>yzl_Hs6qekz<qs~Z8`d6M#M0&~xIwd<d{pjE?{wT-
za~=`^bpl3cQB>q5!;*kY0v}T^TN3nGDSyWnH7_|2jMvtR-L}@{=2wbTOgk<IF)rnp
zT{u9B3xhe!T5|rpYUcc!bLKZSTNBos@i|6ezDr<2vFTN(kc1MaEz{`Ys{kwQu+j&g
zndbvlY*x=wPg(!V9GHBiF&4&ubV~7`oz5!%=T@G}p8sZ4JMB@t!m)4ajJ*G+zkkM@
zejDIFLr8)(3W+;aVjx!qoukoU1E`J8(Vroc(eQ;tpW1HXDwW+_mpjMw|4Sgp#DlMn
zU*9c3|Gmvp{%?1c|9d-6mbOm=*>YgIKJ8#HnBbVwBh;uM^*Dhx420x>{nP>F5=GxG
ziO#!h=KDkrQF}bt8rWOoL1$yMwSV2;Zg1cLY;V|`&h~b%?`(|*-FDY;wj=5dSY_%=
zMP6QW0-mp1IfUysvmsj7{6MV7(=?rqzsWq`x+kXp!~LDT*ZVEsxq&ej(0{kvF2;X#
zyWLg($E`e1GD-Y8yI)79G#Yi8{{K&8d_GCKf2+}W@+1lY4Y~HGG#bYfK!0QAdF->Q
zDwRHgJR+np!S8Wp^*X>D`yhdfIIAR`m6=48c|v#+`59%bHyQ_VV|0%8(%TC3H&gW-
zy<rkWqZvQw95tI2-{Mb=Px;`HPv|`MWg#5JlbDQ<+${(;^8-eKN@ak4iYEFAoi{$k
z!3nCPZ2jnjKS_4h?aI+2x_=J_zH0t<|8+j0<Q#pX#M4#sfjX-8ju4>_$^8rlm_#6~
z4}H`8=qNMO><o``6V{Mm@gB$P7Rc5)4rvxcQazW$(n7xg1SUB~ZxzA<37rw4hAlL0
zsa5DaM7@rp8md<Ea*QMoVJ#Xzo3@&yeph!=jQmi&B~5f;3dnhh-hWlSO6*p2C$X}t
zKWT$X=9}d-L)G+G0bCC+8S<E`K*M4Ri6bM>QRuoLq$-M2I#iXI7Ic!h$t+Kj&6{bq
z`8oQeYgEi6RxZ^{4zLiP8F%K+B-@uFsK%~BVq2mgDzD%8w<Zy6+aPq-?4Cw$^dcN-
zl6IIaS}RF>cTX(;=YIv4Uw4eT^1svV_WMQsf3VRRtmOY~JYO0JS(#H1YlyyRMcGoK
z+8UzYV~=3sWwb^i@#ITt4N+$;eXC3Z!9s3B(nnOHOag0|tFe|X4~e6SqvVM+AnGF1
zyAcG|(8z%F{e(CbZ;8$5F7p^y{c?ANpSIUfx6@fe-F|-!b$^~^CSd98$sw|`fyw_s
zJ05T;vh~cVa&d7w5!BKbY~&WDPcL@p%!=~sbA=MS3evxST&sptM19qusI6vv8Xp@`
zbqgFK3sAGhMA+DS511cG%;jrF<-{5yJ$JPO!Q_}RPm&;c=@ELGPS*0s6yC7U*=1P)
zrr?PLSz`Fqp?}1Dgs4G>1Ok@JiF3e2zRQW;f=n-JhP}-9vv@(#ceOF?Qr~*$-d6IR
z1$nB_FQe<J)Fgj!$P@`V^Weu1mV`6e#2#_!&;}}jf3W`jfg+^-{q6Tu?R&*s_VH=q
z{;Nw|fA#E#5!W5Ze}B(i4Uu-u0-#MTVskP%ZNDCOpnsGQfsQ<EpDGK0Qt;AlIHvXl
zcvH<yw1ldp=Z3jGAyW|RyY1fKr@{a1{by^pqVJ!Hd=ZY)?y4;LXCLSX`op?IrvJ{O
zg3mN{TR!He4*N{Y$Pjp;OK9Z6P*t~EomM~T!;(a50<co>A8_V`wnVQqVy87Dq*S|T
z#)(E*8h@Qrm9YYyGliu^=)7`cJ>`3j^gB^xI(Ed{zT^Tz6L8512QguuBeKz@7X|(l
z1cbUG!{W{Jr4VFVNduW~q^)SrqM_&I*m_ifg9yDM*GxgDfUS0Cea9-5UliV46uVC#
zF9NU$_VQh1n->^u3ZGgS;*nrpD50<>OGpUHKz}QPEwfA3$P0`8=nC2{vW7^(uDI6R
z_m8#P7*Z{LEXpWUiwhRz-5VahJU8tvV5Yt0m}$44e9ub~18sb^hb2DH2lsg?TE}}m
z#$QK!WZ;*XhZbOQsRl`=@Q+YPGM>f7IFu|~%s7cTs4AW?PX1D+O%|&y4o+yp+e(VC
zY=7+8Wz?{Iz|^Y6MRTWw8ZoaF8TW>jy`87Hvk~!pDZb0C@bVl}t2y~~<d#{h=q+M}
zXf8WMCESKHea6E}`kgKdG-=W4i3oik^Vtc|G2=Gy{E(Kpuuii@;=_pmPM}aldqK27
zFO3t2a+EhHF8K-Te4d;#tdJdCpw3Up;D2Af7{Fd!<h$W8eyJgnVSq95e=Li!{b-Ts
z(BvbcT^3SVmSRHUZ$XMVU=tr}-Ltn6Z*jB7C*H(_ae2G)ZLpkt+xphUn}>yb!{i%9
zAS)>s)wnq+XHUTy#p`;+f^PTSK2o$Z!U9lnz2C5yD|(q$Vs0hot|R8Qmo($rmw%LV
zD?zssbk`De0dpR;CAUX}t%w>NbikZPY{v!I11X_tdsql!*CU7>3d#I(NBE40UF}c@
z=Rd$%)saeEEz4FkK~+@JDJms2hzbupY=a-U_Y1s5R~liy;}Mreb=rkuhvUyja%T3}
zBeW!X#>Dg92G}NYR?*z$*irnehJX3#Iuqi+PrL$B39?p0NFhgZxKmv|C4ZH86e<gC
zy|9;RM*`+0tX93myf|C+_BZ0_W2R1_OegFdk-yYZ`$Z9LV-NO-kerOdXo%8sV`Ptp
zo;znTVV@HTWl@+yX|5u`RPlFFgJMEr`;<_(YAP;gVPMF=1Xe%0n{y|bDt|RG5|svu
zJ7eQ<y{c62?7v$j%H;s`vRYKJ`n&-+IP<#SYF|@D3xL}|rT+R=6}3S@QR{RInp*C~
zyyMG_d8%5aHkNRWYCR~AG7b@ehZFrv#|h*r1X&h3Vp1{nTm?mmui_z<psv=35?+;?
zRdOa6dXg0SRoe4V2`XWiWq<I4)R`P2Q-Nlyzn9jje0=tlPEXPxt`j>5pP|tVJ&m^V
z*@vsR626)`70sfgPhskoV>_<kNl0%I+CBIc{VK2v7015BhiIJ-Tise6{uY~m+Y+yH
zO@Vj!C(FGWIoG|UOX9XX5+?X(<&$^_@^v|%1a^EP)M8E?prk-=_kYDNaXoK@UKiSl
z7g`Y*^$1)MN(Uk|WT9vtI`6%o`HhRnPMz>e*tbXAiEJ{X?Uebr#sde=DmZzCoIuFx
zE*x<Np2t4VAFI36SiOZ~)k(k1P`zu&e#565b1L7eMiVcoUAf?IL*H4Tjy%X%w_+?n
zjYe``6_Qn`+au9Kl7Aq8#H4-HM<f}`JqmYwoNCD`1mJ<lwv{b^-SC1M$=TVyIng=7
z_NmKRNS&2Izfh3o6zXq4k~&00m*Io6|1AWN?`0N@$}3(%tlG>AeL82aV_C2pat>5h
z;HW05sC3SxAC&;Fjc)LWODnmInNj|<ttuj6OgsrZ%Ji%{wtps6$yHfX`Z+qB@3q^t
zlYig`$d?q8LUKagB?M)oZq7!Xf-=g)0?!)F-eAA%@X5$C%VX~RV1a<M0JtQj$&@FQ
z8QCCW%WV5RWuskEH<nOka${tXcg{#=cbjSE<&}oi7&2#+O1*VV&cNAS-WM06v~G6=
zO}BRX5vVGWB7Y02{V7n1jui*I?(Ssx#+(sz=kryotfi+LAPJqTe{(c(b%=cReSSxx
z$g1kSzOx;8g@r^y@!%WS2F-xyLB+umj)@OD;-z5MCV+)3u-m?3xX=v%e$1JFQ|P}e
zQXXk#3>~l%>$^L+NOspy*#jX7HN<*3&@_r~Gb$=eB7Y;T?e^cT#isaH!4%&vnBv7_
z^+9P&<HVk8idUN3W5#4@7o#g%4zL@+rph|1vt*6w%**z%2>p7ySWME3Nh*~$RpA9-
z2g>H54jy|xo3GXBz_Ri(P##z6xa7R;USwbkn={WVj9tH;I211L6Di)<ldh&TAAP6E
z92*aN1b>S}AIWc?*2F4&8~P%i?nZwN^*7AFc5C}t(I_yrdYfyg)7@S}8*No>tEOJR
zy@ooQ-8H0oZMU{JpVecBk{ziz{r>&?_s!R@n|pic#fza|h)~RUTf2FyoY2$CD}5ph
z>DZX2c~d^XQUcf8`dVMCUx=6FAb?NP$(4H-n12#!xIu}Aau!(4l|qq4Q*G_kCLLAp
zxRSpW8(w!(H3uP{?6;q9wA;6b0d+p~%m!6DEtUZ>4gFEUd{01JqqbDIY3`37ZTZO4
zGP-6QZ60$^K=FwC=~b%^IW4c~l3up>Cp(cb*IqF<<6+~N3blMI7j}ArU6+F!UBgzc
zoqycVR)ZO4Yt3cp$LuE~SaWO0$nJ}U<Zin2ffp>{tMtOSi>cyXbsgog6wdVTIzNx4
zX-PNK9H>eRYpuil3`||QR-;8-DRF8`G&0(?<Nm=$bw$ZF_jMHlRy%BT`)XZrawlDN
zDN9y5S3TBYD+|G03Tm<5#h#*#dE3yb-hTr#*k=6(b^6uY)19|By_$_F&(LFTIqN9B
z4sbAc8@FoqaC^=McFF)uwy#qLQe@ZU^FGot4WZuLZRMbPNcZ)kQWu?1x;m@r`D{tb
zP1N}k4!x^&!dW@KS2oX((XP(Q&bE&gMwznnl4H5J=f$qFEJ`jh#f2klu#IMm$A2|g
zc&kI+#WE9QzR6J=b>D7FPA%Z8i|DhGX3*2jk?^y;ZCTBb(NiCvJ)7sNs|HP3n~76n
zv_rIk9&(7y15QHrU|i~9m4v)XLS7{yqX!zsb?qeN(M*E4>-6Iq|8Zw-6!a?n_(26z
z-AMYe4?g3wd<OEjk$?PJul&)cAb($5*}4nm;tF!>l3}%(rZ;d7YIOf6J9l{!`hvKV
zyN%$fmb_O8+*wW{-`qYvzsr4m4Gzg4v{uaF!Np?LZ)v0Wb_s<k>-1de*Csl3SL<E=
zzLsbo&2Oz25TKY7nPFKqiq;KiRBNRP<@C`!lMDzP$0Cfty^o-uuNRhV<$pviEJ%rm
ztQJP9oe2F{wbMUicQOq<3LKA!N90Ti1Eb_cKJa=auM~0jmCpXUb2Yyu;^=GKh4&27
zhFw2ISU+D*gZ4rpfur4b`=xslFLyjT|2#9lO;HR|fpOiQH@T=IWKKQjss@+zI$zcs
z91t+Sv)w=yHj0iC*^T2p(tp9N5#}X_mi`H=S3q5v|M@2U9;&L}m;t0?tJ=92KSy5B
zT)|iLpLDvVc}$4o06j7`U~%=vyOOzww=B#pJax;KPm*d=E>VWoz8`2WaK$gHMUL)5
ziI2}Jy7CFFcpHV}6?%|NYMxT8T`7Jqvg#2OkM8x$&qdd6l_o_)&wtad*Tk)z&2+6+
zw6F(U9>?y<x?s8JPC#6a9a$*UwewjaT9}J9Gw;hdz=1lzwS{4gJ(gjF#&PgA=lx3y
z18hSTp=n=oX%rzL2*7zoXn8^RNefxp`4s;&%tN{PZaD{2bx@j~_#wEZ<J5{Dk*T^5
zuR^`G!~`qDx-w=qFMs+C37^CpO{hbr#0k@s?u(K@(V4jE1kUgoDNtdOW|xmVtYI!?
zb0ZydhR^0jwSNEo1dGWpFw^pT^at2-xHah4p-A>F(ELs__c<2jK+w#D7b+3ea~agl
z#YAyleHJD3nw9q<PF2it=Snr;!MG~#Hgj{i#LRpm-lIBH%YS`esAS)!J2m>5Z095n
z;L6o~tXXHVr4|3!{hLy1%@xwDVl2Pp;_7i@?Pj<B;d|0Ev_EH%N+;|B))3XIV-R)o
zikdBPEgV|FGR#wP8QpRN*PRdKhAm&ThbsKZsDPH$weBKk`mQPGM$RtoAf^1aj!RbL
zS~u{*Lm+fxbbotiM0AUq$HD~YUO55!vi!_w$@9pEt4+RnDqTvqSwbPb%o$<v7wI<&
zPQhYMZfB#^xw-3lFwe8~EhOb$K4tbEd8!tMQC;plt;iv6|FGxUH&NF(Js#MWWDnjR
z=%y@p0{1SnY63znIAWu#qqxj-%SUmKAu;1YU!CR?8h>XM^uNK&(<;UJE&Awg>f)D$
z*ANvih^rj@9;n9GbHH78n0w^MJcNJ=CE;i5FMaI75FO+4e$`|4%EP!|l!YWx&N6xs
z_Xl3N`O1e=H}LJdT<@B$A9U>Y<D={qY1R#VhwjyD^5rFz((Cx?`UOAT=CXde-Z$i@
zD}mqvd4J^c?j53Z#5!-AvN9e>IQ6~quq^~})_eAVfV`Z?>=0ZcB%dK|e+X3Ypsn0y
zndknv%~s*-%ZIOTmFBTHe7)CC<>M-R9j(IG<C0bQdX?-fhOa-An-gv;e!b>Cg;fZ9
zK5Tq@qg{t3<|di^Hs4V2`u0ZWo(8WsqNWOQ6@N~uDRue=ES9h*;Nz49_BPGy_<Ah|
z^HWn(;>;P3B{g}=>_tr`wL03>3sZ|^R3&{2p>eT%Zua9GYfG}|ot0}A5c@P^I7ZSp
z&++0Foy4S_#T=`jQA0cJ?3ZjwFISRgep`J%+rrPb$d*K2=8y4e6kkfE)$a>?>trZv
zkY)MY>1MukH?m(+hoiOWWakxK6Of1hUrY-M>(}GmXd`1r^9I6qpn0KwA8~g&Jy9Co
zh+*!u+iio@)-=Ho%}cD$0H;S1o7``!anbm0^{k%NvwH5+^M3&V0RR8}3cG#)^Z)=$
CwXcEz
delta 7533
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
Dkt5Tw
--
GitLab
From ed1f9f2eed55e136ac57dd54279595c0fadce642 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Tue, 25 Mar 2025 16:34:14 -0400
Subject: [PATCH 4/9] update monitor/chart
---
chart/Chart.lock | 6 +-
chart/Chart.yaml | 4 +-
chart/charts/monitor-2.6.3.tgz | Bin 7545 -> 0 bytes
chart/charts/monitor-2.8.5.tgz | Bin 0 -> 7965 bytes
chart/deps/monitor/Chart.yaml | 4 +-
chart/deps/monitor/Kptfile | 4 +-
chart/deps/monitor/README.md | 3 +-
.../deps/monitor/dashboards/nv_dashboard.json | 582 ++++++++++++------
chart/deps/monitor/templates/dashboard.yaml | 4 +
.../templates/exporter-deployment.yaml | 12 +
.../monitor/templates/exporter-service.yaml | 2 +-
chart/deps/monitor/templates/secret.yaml | 2 +-
chart/deps/monitor/values.yaml | 2 +-
13 files changed, 425 insertions(+), 200 deletions(-)
delete mode 100644 chart/charts/monitor-2.6.3.tgz
create mode 100644 chart/charts/monitor-2.8.5.tgz
diff --git a/chart/Chart.lock b/chart/Chart.lock
index 1432785..ed38636 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -1,9 +1,9 @@
dependencies:
- name: monitor
repository: file://./deps/monitor
- version: 2.6.3
+ version: 2.8.5
- name: gluon
repository: oci://registry1.dso.mil/bigbang
version: 0.5.14
-digest: sha256:372ab4cfe8a7985f357ed4016ace221aca8ab39c3f70c374a1c7343952996bfc
-generated: "2025-03-25T15:49:17.156699-04:00"
+digest: sha256:199b7082c9f4d660326567ed73f7fcd3d764cc205d31533689ee8f489e1a963a
+generated: "2025-03-25T16:33:24.520229-04:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 815c92d..509d293 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -11,7 +11,7 @@ maintainers:
engine: gotpl
dependencies:
- name: monitor
- version: 2.6.3
+ version: 2.8.5
alias: monitor
condition: monitor.install
repository: file://./deps/monitor
@@ -43,4 +43,4 @@ annotations:
image: registry1.dso.mil/ironbank/big-bang/base:2.1.0
- name: exporter
condition: monitor.exporter.enabled
- image: registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:5.3.2
+ image: registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:1.0.0
diff --git a/chart/charts/monitor-2.6.3.tgz b/chart/charts/monitor-2.6.3.tgz
deleted file mode 100644
index 3947216749eef8fc39bdaaaf733542306d1b0db6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7545
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
P00960{R+E&0Q3L=R9dO*
diff --git a/chart/charts/monitor-2.8.5.tgz b/chart/charts/monitor-2.8.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..605ecb1547850e4bdcb927fc959171850bb6a20c
GIT binary patch
literal 7965
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
Tdj5X^00960KeNY801yEHl_#)(
literal 0
HcmV?d00001
diff --git a/chart/deps/monitor/Chart.yaml b/chart/deps/monitor/Chart.yaml
index 849920b..a3635cb 100644
--- a/chart/deps/monitor/Chart.yaml
+++ b/chart/deps/monitor/Chart.yaml
@@ -1,7 +1,7 @@
name: monitor
apiVersion: v1
-version: 2.6.3
-appVersion: 5.3.0
+version: 2.8.5
+appVersion: 1.0.2
description: Helm chart for NeuVector monitor services
home: https://neuvector.com
icon: https://avatars2.githubusercontent.com/u/19367275?s=200&v=4
diff --git a/chart/deps/monitor/Kptfile b/chart/deps/monitor/Kptfile
index ce59fe3..4c6c970 100644
--- a/chart/deps/monitor/Kptfile
+++ b/chart/deps/monitor/Kptfile
@@ -5,7 +5,7 @@ metadata:
upstream:
type: git
git:
- commit: 0f686c8f614b895904a6e94c7d9935d8b6202dd9
+ commit: fee6327bffc6eeba782ef18d502f0d9e6a70033f
repo: https://github.com/neuvector/neuvector-helm
directory: /charts/monitor
- ref: 2.6.3
+ ref: v2.8.5
diff --git a/chart/deps/monitor/README.md b/chart/deps/monitor/README.md
index b1bd3f8..3566c0d 100644
--- a/chart/deps/monitor/README.md
+++ b/chart/deps/monitor/README.md
@@ -15,8 +15,9 @@ Parameter | Description | Default | Notes
`exporter.enabled` | If true, create Prometheus exporter | `false` |
`exporter.image.repository` | exporter image name | `neuvector/prometheus-exporter` |
`exporter.image.tag` | exporter image tag | `latest` |
+`exporter.ctrlSecretName` | existing secret that have CTRL_USERNAME and CTRL_PASSWORD fields to login to the controller. | `nil` | if parameter exists then `exporter.CTRL_USERNAME` & `exporter.CTRL_PASSWORD` will be skipped
`exporter.CTRL_USERNAME` | Username to login to the controller. Suggest to replace the default admin user to a read-only user | `admin` |
`exporter.CTRL_PASSWORD` | Password to login to the controller. | `admin` |
-
+`exporter.enforcerStats.enabled` | If true, enable the Enforcers stats | `false` | For the performance reason, by default the exporter does NOT pull CPU/memory usage from enforcers.
---
Contact <support@neuvector.com> for access to Docker Hub and docs.
diff --git a/chart/deps/monitor/dashboards/nv_dashboard.json b/chart/deps/monitor/dashboards/nv_dashboard.json
index ad7ce63..1da8b12 100644
--- a/chart/deps/monitor/dashboards/nv_dashboard.json
+++ b/chart/deps/monitor/dashboards/nv_dashboard.json
@@ -1,4 +1,59 @@
{
+ "__inputs": [
+ {
+ "name": "datasource",
+ "label": "Prometheus",
+ "description": "",
+ "type": "datasource",
+ "pluginId": "prometheus",
+ "pluginName": "Prometheus"
+ }
+ ],
+ "__elements": {},
+ "__requires": [
+ {
+ "type": "grafana",
+ "id": "grafana",
+ "name": "Grafana",
+ "version": "10.2.3"
+ },
+ {
+ "type": "panel",
+ "id": "piechart",
+ "name": "Pie chart",
+ "version": ""
+ },
+ {
+ "type": "datasource",
+ "id": "prometheus",
+ "name": "Prometheus",
+ "version": "1.0.0"
+ },
+ {
+ "type": "panel",
+ "id": "stat",
+ "name": "Stat",
+ "version": ""
+ },
+ {
+ "type": "panel",
+ "id": "table",
+ "name": "Table",
+ "version": ""
+ },
+ {
+ "type": "panel",
+ "id": "text",
+ "name": "Text",
+ "version": ""
+ },
+ {
+ "type": "panel",
+ "id": "timeseries",
+ "name": "Time series",
+ "version": ""
+ }
+ ],
"annotations": {
"list": [
{
@@ -24,6 +79,7 @@
"editable": true,
"fiscalYearStartMonth": 0,
"graphTooltip": 0,
+ "id": null,
"links": [],
"liveNow": false,
"panels": [
@@ -40,17 +96,22 @@
},
"id": 38,
"options": {
+ "code": {
+ "language": "plaintext",
+ "showLineNumbers": false,
+ "showMiniMap": false
+ },
"content": "<div style=\"text-align:center\">\n \n <br>\n <br>\n [Documentation](https://open-docs.neuvector.com)<br>\n </br>\n [Users Slack Channel](https://rancher-users.slack.com/archives/C036F6JDZ8C)<br>\n </br>\n [GitHub](https://github.com/neuvector)\n\n</div>",
"mode": "markdown"
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"title": "NeuVector Product Links",
"type": "text"
},
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -103,14 +164,15 @@
"values": false
},
"text": {},
- "textMode": "auto"
+ "textMode": "auto",
+ "wideLayout": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "nv_summary_enforcers",
@@ -128,7 +190,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -182,14 +244,15 @@
"values": false
},
"text": {},
- "textMode": "auto"
+ "textMode": "auto",
+ "wideLayout": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "nv_summary_cvedbVersion",
@@ -207,7 +270,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -261,14 +324,15 @@
"values": false
},
"text": {},
- "textMode": "auto"
+ "textMode": "auto",
+ "wideLayout": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "nv_summary_pods",
@@ -286,7 +350,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -294,6 +358,7 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
@@ -307,6 +372,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
@@ -366,7 +432,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"editorMode": "code",
"exemplar": true,
@@ -385,7 +451,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -442,14 +508,15 @@
"values": false
},
"text": {},
- "textMode": "auto"
+ "textMode": "auto",
+ "wideLayout": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "nv_admission_denied",
@@ -467,7 +534,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -538,14 +605,15 @@
"values": false
},
"text": {},
- "textMode": "auto"
+ "textMode": "auto",
+ "wideLayout": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "nv_summary_controllers",
@@ -563,7 +631,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -621,14 +689,15 @@
"values": false
},
"text": {},
- "textMode": "value"
+ "textMode": "value",
+ "wideLayout": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "nv_summary_disconnectedEnforcers",
@@ -652,7 +721,7 @@
],
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -661,7 +730,9 @@
},
"custom": {
"align": "center",
- "displayMode": "auto",
+ "cellOptions": {
+ "type": "auto"
+ },
"filterable": false,
"inspect": false,
"width": 300
@@ -690,8 +761,10 @@
"value": 101
},
{
- "id": "custom.displayMode",
- "value": "color-text"
+ "id": "custom.cellOptions",
+ "value": {
+ "type": "color-text"
+ }
},
{
"id": "color",
@@ -778,7 +851,9 @@
"id": 29,
"links": [],
"options": {
+ "cellHeight": "sm",
"footer": {
+ "countRows": false,
"enablePagination": true,
"fields": "",
"reducer": [
@@ -794,7 +869,7 @@
}
]
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"scroll": true,
"showHeader": true,
"sort": {
@@ -839,7 +914,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"editorMode": "code",
"exemplar": false,
@@ -947,7 +1022,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -955,6 +1030,7 @@
"mode": "palette-classic"
},
"custom": {
+ "axisBorderShow": false,
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "",
@@ -968,6 +1044,7 @@
"tooltip": false,
"viz": false
},
+ "insertNulls": false,
"lineInterpolation": "linear",
"lineWidth": 1,
"pointSize": 5,
@@ -1027,7 +1104,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"editorMode": "code",
"exemplar": true,
@@ -1046,7 +1123,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -1140,7 +1217,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"expr": "sum(nv_container_vulnerabilityHigh) by (service)",
"format": "table",
@@ -1153,7 +1230,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"expr": "sum(nv_container_vulnerabilityMedium) by (service)",
"format": "table",
@@ -1186,102 +1263,151 @@
"type": "piechart"
},
{
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "percentunit"
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byValue",
+ "options": {
+ "op": "gte",
+ "reducer": "allIsZero",
+ "value": 0
+ }
+ },
+ "properties": [
+ {
+ "id": "custom.hideFrom",
+ "value": {
+ "legend": true,
+ "tooltip": true,
+ "viz": false
+ }
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byValue",
+ "options": {
+ "op": "gte",
+ "reducer": "allIsNull",
+ "value": 0
+ }
+ },
+ "properties": [
+ {
+ "id": "custom.hideFrom",
+ "value": {
+ "legend": true,
+ "tooltip": true,
+ "viz": false
+ }
+ }
+ ]
+ }
+ ]
},
- "fill": 0,
- "fillGradient": 0,
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 12
},
- "hiddenSeries": false,
"id": 10,
- "legend": {
- "avg": false,
- "current": false,
- "hideEmpty": true,
- "hideZero": true,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
"links": [],
- "nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "desc"
+ }
},
- "percentage": false,
- "pluginVersion": "9.1.5",
- "pointradius": 2,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
+ "editorMode": "code",
"exemplar": true,
"expr": "max(nv_enforcer_cpu) by (display)\n",
"format": "time_series",
"interval": "",
"intervalFactor": 1,
"legendFormat": "{{display}}",
+ "range": true,
"refId": "A"
}
],
- "thresholds": [],
- "timeRegions": [],
"title": "Enforcer CPU Usage",
- "tooltip": {
- "shared": true,
- "sort": 2,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "$$hashKey": "object:865",
- "format": "percentunit",
- "logBase": 1,
- "show": true
- },
- {
- "$$hashKey": "object:866",
- "format": "short",
- "logBase": 1,
- "show": true
- }
- ],
- "yaxis": {
- "align": false
- }
+ "type": "timeseries"
},
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -1290,7 +1416,9 @@
},
"custom": {
"align": "center",
- "displayMode": "auto",
+ "cellOptions": {
+ "type": "auto"
+ },
"inspect": false,
"width": 101
},
@@ -1353,8 +1481,10 @@
}
},
{
- "id": "custom.displayMode",
- "value": "color-text"
+ "id": "custom.cellOptions",
+ "value": {
+ "type": "color-text"
+ }
}
]
},
@@ -1365,8 +1495,10 @@
},
"properties": [
{
- "id": "custom.displayMode",
- "value": "color-text"
+ "id": "custom.cellOptions",
+ "value": {
+ "type": "color-text"
+ }
},
{
"id": "displayName",
@@ -1421,7 +1553,9 @@
"id": 36,
"links": [],
"options": {
+ "cellHeight": "sm",
"footer": {
+ "countRows": false,
"enablePagination": true,
"fields": "",
"reducer": [
@@ -1432,12 +1566,12 @@
"showHeader": true,
"sortBy": []
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(nv_container_vulnerabilityHigh) by (exported_service)",
@@ -1451,7 +1585,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"editorMode": "code",
"expr": "sum(nv_container_vulnerabilityMedium) by (exported_service)",
@@ -1487,7 +1621,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"fieldConfig": {
"defaults": {
@@ -1496,7 +1630,9 @@
},
"custom": {
"align": "center",
- "displayMode": "auto",
+ "cellOptions": {
+ "type": "auto"
+ },
"filterable": false,
"inspect": false,
"minWidth": 50
@@ -1556,8 +1692,10 @@
"value": "none"
},
{
- "id": "custom.displayMode",
- "value": "color-text"
+ "id": "custom.cellOptions",
+ "value": {
+ "type": "color-text"
+ }
},
{
"id": "color"
@@ -1595,8 +1733,10 @@
"value": "none"
},
{
- "id": "custom.displayMode",
- "value": "color-text"
+ "id": "custom.cellOptions",
+ "value": {
+ "type": "color-text"
+ }
},
{
"id": "thresholds",
@@ -1630,7 +1770,9 @@
"id": 33,
"links": [],
"options": {
+ "cellHeight": "sm",
"footer": {
+ "countRows": false,
"enablePagination": true,
"fields": "",
"reducer": [
@@ -1640,12 +1782,12 @@
},
"showHeader": true
},
- "pluginVersion": "9.1.5",
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"expr": "sum(nv_image_vulnerabilityHigh) by (name)",
"format": "table",
@@ -1658,7 +1800,7 @@
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"expr": "sum(nv_image_vulnerabilityMedium) by (name)",
"format": "table",
@@ -1691,56 +1833,132 @@
"type": "table"
},
{
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
+ },
+ "fieldConfig": {
+ "defaults": {
+ "color": {
+ "mode": "palette-classic"
+ },
+ "custom": {
+ "axisBorderShow": false,
+ "axisCenteredZero": false,
+ "axisColorMode": "text",
+ "axisLabel": "",
+ "axisPlacement": "auto",
+ "barAlignment": 0,
+ "drawStyle": "line",
+ "fillOpacity": 0,
+ "gradientMode": "none",
+ "hideFrom": {
+ "legend": false,
+ "tooltip": false,
+ "viz": false
+ },
+ "insertNulls": false,
+ "lineInterpolation": "linear",
+ "lineWidth": 1,
+ "pointSize": 5,
+ "scaleDistribution": {
+ "type": "linear"
+ },
+ "showPoints": "never",
+ "spanNulls": false,
+ "stacking": {
+ "group": "A",
+ "mode": "none"
+ },
+ "thresholdsStyle": {
+ "mode": "off"
+ }
+ },
+ "mappings": [],
+ "thresholds": {
+ "mode": "absolute",
+ "steps": [
+ {
+ "color": "green",
+ "value": null
+ },
+ {
+ "color": "red",
+ "value": 80
+ }
+ ]
+ },
+ "unit": "bytes"
+ },
+ "overrides": [
+ {
+ "matcher": {
+ "id": "byValue",
+ "options": {
+ "op": "gte",
+ "reducer": "allIsZero",
+ "value": 0
+ }
+ },
+ "properties": [
+ {
+ "id": "custom.hideFrom",
+ "value": {
+ "legend": true,
+ "tooltip": true,
+ "viz": false
+ }
+ }
+ ]
+ },
+ {
+ "matcher": {
+ "id": "byValue",
+ "options": {
+ "op": "gte",
+ "reducer": "allIsNull",
+ "value": 0
+ }
+ },
+ "properties": [
+ {
+ "id": "custom.hideFrom",
+ "value": {
+ "legend": true,
+ "tooltip": true,
+ "viz": false
+ }
+ }
+ ]
+ }
+ ]
},
- "fill": 0,
- "fillGradient": 0,
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 18
},
- "hiddenSeries": false,
"id": 35,
- "legend": {
- "avg": false,
- "current": false,
- "hideEmpty": true,
- "hideZero": true,
- "max": false,
- "min": false,
- "show": true,
- "total": false,
- "values": false
- },
- "lines": true,
- "linewidth": 1,
"links": [],
- "nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "legend": {
+ "calcs": [],
+ "displayMode": "list",
+ "placement": "bottom",
+ "showLegend": true
+ },
+ "tooltip": {
+ "mode": "multi",
+ "sort": "desc"
+ }
},
- "percentage": false,
- "pluginVersion": "9.1.5",
- "pointradius": 2,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
+ "pluginVersion": "10.2.3",
"targets": [
{
"datasource": {
"type": "prometheus",
- "uid": "prometheus"
+ "uid": "${datasource}"
},
"exemplar": true,
"expr": "max(nv_enforcer_memory) by (display)",
@@ -1751,45 +1969,35 @@
"refId": "A"
}
],
- "thresholds": [],
- "timeRegions": [],
"title": "Enforcer Memory Usage",
- "tooltip": {
- "shared": true,
- "sort": 2,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "mode": "time",
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "$$hashKey": "object:940",
- "format": "bytes",
- "logBase": 1,
- "show": true
- },
- {
- "$$hashKey": "object:941",
- "format": "short",
- "logBase": 1,
- "show": true
- }
- ],
- "yaxis": {
- "align": false
- }
+ "type": "timeseries"
}
],
"refresh": "15s",
- "schemaVersion": 37,
- "style": "dark",
+ "schemaVersion": 39,
"tags": [],
"templating": {
- "list": []
+ "list": [
+ {
+ "current": {
+ "selected": false,
+ "text": "Prometheus",
+ "value": "prometheus"
+ },
+ "hide": 0,
+ "includeAll": false,
+ "label": "Data Source",
+ "multi": false,
+ "name": "datasource",
+ "options": [],
+ "query": "prometheus",
+ "queryValue": "",
+ "refresh": 1,
+ "regex": "",
+ "skipUrlSync": false,
+ "type": "datasource"
+ }
+ ]
},
"time": {
"from": "now-5m",
@@ -1823,6 +2031,6 @@
"timezone": "UTC",
"title": "NeuVector",
"uid": "nv_dashboard0001",
- "version": 2,
+ "version": 1,
"weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/chart/deps/monitor/templates/dashboard.yaml b/chart/deps/monitor/templates/dashboard.yaml
index 72c5d9f..9a6840a 100644
--- a/chart/deps/monitor/templates/dashboard.yaml
+++ b/chart/deps/monitor/templates/dashboard.yaml
@@ -9,6 +9,10 @@ metadata:
{{- if .Values.exporter.grafanaDashboard.labels }}
{{- toYaml .Values.exporter.grafanaDashboard.labels | nindent 4}}
{{- end }}
+{{- if .Values.exporter.grafanaDashboard.annotations }}
+ annotations:
+ {{- toYaml .Values.exporter.grafanaDashboard.annotations | nindent 4}}
+{{- end }}
data:
nv_dashboard.json: |
{{ .Files.Get "dashboards/nv_dashboard.json" | indent 4 }}
diff --git a/chart/deps/monitor/templates/exporter-deployment.yaml b/chart/deps/monitor/templates/exporter-deployment.yaml
index c436596..d9ab4da 100644
--- a/chart/deps/monitor/templates/exporter-deployment.yaml
+++ b/chart/deps/monitor/templates/exporter-deployment.yaml
@@ -39,6 +39,10 @@ spec:
serviceAccountName: {{ .Values.serviceAccount }}
serviceAccount: {{ .Values.serviceAccount }}
{{- end }}
+ {{- with .Values.exporter.securityContext }}
+ securityContext:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: neuvector-prometheus-exporter-pod
{{ if eq .Values.registry "docker.io/neuvector" }}
@@ -59,8 +63,16 @@ spec:
value: neuvector-svc-controller:10443
- name: EXPORTER_PORT
value: "8068"
+ {{- if .Values.exporter.enforcerStats.enabled }}
+ - name: ENFORCER_STATS
+ value: "{{ .Values.exporter.enforcerStats.enabled | default 'false' }}"
+ {{- end }}
envFrom:
- secretRef:
+ {{- if .Values.exporter.ctrlSecretName }}
+ name: {{ .Values.exporter.ctrlSecretName }}
+ {{ else }}
name: neuvector-prometheus-exporter-pod-secret
+ {{- end }}
restartPolicy: Always
{{- end }}
diff --git a/chart/deps/monitor/templates/exporter-service.yaml b/chart/deps/monitor/templates/exporter-service.yaml
index e67e168..9d15b11 100644
--- a/chart/deps/monitor/templates/exporter-service.yaml
+++ b/chart/deps/monitor/templates/exporter-service.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.exporter.enabled .Values.exporter.svc.enabled -}}
+{{- if and .Values.exporter.enabled .Values.exporter.svc.enabled }}
apiVersion: v1
kind: Service
metadata:
diff --git a/chart/deps/monitor/templates/secret.yaml b/chart/deps/monitor/templates/secret.yaml
index 9a04ac4..a751795 100644
--- a/chart/deps/monitor/templates/secret.yaml
+++ b/chart/deps/monitor/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.exporter.enabled -}}
+{{- if and (.Values.exporter.enabled) (not .Values.exporter.ctrlSecretName) -}}
apiVersion: v1
kind: Secret
metadata:
diff --git a/chart/deps/monitor/values.yaml b/chart/deps/monitor/values.yaml
index 544df54..06412ce 100644
--- a/chart/deps/monitor/values.yaml
+++ b/chart/deps/monitor/values.yaml
@@ -12,7 +12,7 @@ exporter:
enabled: false
image:
repository: ironbank/neuvector/neuvector/prometheus-exporter
- tag: 5.3.2
+ tag: 1.1.0
# changes this to a readonly user !
CTRL_USERNAME: admin
CTRL_PASSWORD: admin
--
GitLab
From 11cbaa50faa8ffae95657236bd082c87de78aa47 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Tue, 25 Mar 2025 16:36:34 -0400
Subject: [PATCH 5/9] test/images.txt
---
tests/images.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/images.txt b/tests/images.txt
index 6333b26..4c9cba9 100644
--- a/tests/images.txt
+++ b/tests/images.txt
@@ -1 +1 @@
-registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:5.3.2
+registry1.dso.mil/ironbank/neuvector/neuvector/prometheus-exporter:1.0.0
--
GitLab
From 3ef15f8ae4ff276faa39037f1417d3d967ed8673 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Tue, 25 Mar 2025 17:14:42 -0400
Subject: [PATCH 6/9] update scanner-deployment.yaml
---
chart/templates/scanner-deployment.yaml | 37 +------------------------
1 file changed, 1 insertion(+), 36 deletions(-)
diff --git a/chart/templates/scanner-deployment.yaml b/chart/templates/scanner-deployment.yaml
index abc498b..257de01 100644
--- a/chart/templates/scanner-deployment.yaml
+++ b/chart/templates/scanner-deployment.yaml
@@ -67,42 +67,7 @@ spec:
{{- if .Values.cve.scanner.securityContext.runAsUser }}
securityContext:
{{- toYaml $.Values.cve.scanner.securityContext | nindent 8 }}
- {{- end }}
- initContainers:
- - name: init-cert-permissions
- {{- if .Values.global.azure.enabled }}
- image: "{{ .Values.global.azure.images.scanner.registry }}/{{ .Values.global.azure.images.scanner.image }}:{{ .Values.global.azure.images.scanner.tag }}"
- {{- else }}
- {{- if eq .Values.registry "registry.neuvector.com" }}
- {{- if .Values.oem }}
- image: "{{ .Values.registry }}/{{ .Values.oem }}/scanner:{{ .Values.cve.scanner.image.tag }}"
- {{- else }}
- image: "{{ .Values.registry }}/scanner:{{ .Values.cve.scanner.image.tag }}"
- {{- end }}
- {{- else }}
- {{- if .Values.cve.scanner.image.hash }}
- image: "{{ .Values.registry }}/{{ .Values.cve.scanner.image.repository }}@{{ .Values.cve.scanner.image.hash }}"
- {{- else if .Values.cve.scanner.image.registry }}
- image: "{{ .Values.cve.scanner.image.registry }}/{{ .Values.cve.scanner.image.repository }}:{{ .Values.cve.scanner.image.tag }}"
- {{- else }}
- image: "{{ .Values.registry }}/{{ .Values.cve.scanner.image.repository }}:{{ .Values.cve.scanner.image.tag }}"
- {{- end }}
- {{- end }}
- {{- end }}
- imagePullPolicy: Always
- securityContext:
- runAsUser: 0
- runAsNonRoot: false
- command:
- - /bin/sh
- - -cx
- - |
- cp -a /etc/neuvector/certs/internal/* /newcerts
- chmod 660 /newcerts/*
- chown scanner:scanner /newcerts/*
- volumeMounts:
- - mountPath: /newcerts
- name: bigbang-readable-certs
+ {{- end }}
containers:
- name: neuvector-scanner-pod
{{- if .Values.global.azure.enabled }}
--
GitLab
From 90ec7c6eb8f672ce167c179a2255924786731a38 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Tue, 25 Mar 2025 17:36:34 -0400
Subject: [PATCH 7/9] update value.yaml
---
chart/deps/monitor/values.yaml | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/chart/deps/monitor/values.yaml b/chart/deps/monitor/values.yaml
index 06412ce..d2f1e48 100644
--- a/chart/deps/monitor/values.yaml
+++ b/chart/deps/monitor/values.yaml
@@ -2,17 +2,16 @@
# This is a YAML-formatted file.
# Declare variables to be passed into the templates.
-serviceAccount: default
-
registry: registry1.dso.mil
-oem:
+oem: ''
+leastPrivilege: false
exporter:
# If false, exporter will not be installed
enabled: false
image:
repository: ironbank/neuvector/neuvector/prometheus-exporter
- tag: 1.1.0
+ tag: 1.0.0
# changes this to a readonly user !
CTRL_USERNAME: admin
CTRL_PASSWORD: admin
@@ -27,13 +26,20 @@ exporter:
podAnnotations: {}
svc:
- enabled: false
- type: NodePort
- loadBalancerIP:
+ enabled: true
+ type: ClusterIP
+ loadBalancerIP: ''
annotations: {}
# service.beta.kubernetes.io/azure-load-balancer-internal: "true"
# service.beta.kubernetes.io/azure-load-balancer-internal-subnet: "apps-subnet"
+ grafanaDashboard:
+ enabled: false
+ namespace: "" # Release namespace, if empty
+ labels: {}
+ # annotations: {}
+ # k8s-sidecar-target-directory: /tmp/dashboards/neuvector
+
serviceMonitor:
enabled: false
scheme: ""
@@ -50,7 +56,3 @@ exporter:
# RelabelConfigs to apply to samples before scraping
# ref: https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#relabelconfig
relabelings: []
-
- grafanaDashboard:
- enabled: false
- labels: {}
--
GitLab
From 2b279ed490dc1dcb34cb4e3f89f2b65d0844c697 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Wed, 26 Mar 2025 15:05:06 -0400
Subject: [PATCH 8/9] update values.yaml
---
chart/values.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chart/values.yaml b/chart/values.yaml
index 41d52a3..f417577 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -647,7 +647,8 @@ resources:
# cpu: 100m
# memory: 2280Mi
-runtimePath:
+runtimePath: /run/k3s/containerd/containerd.sock
+
# The following runtime type and socket location are deprecated after 5.3.0.
# If the socket path is not at the default location, use above 'runtimePath' to specify the location.
docker:
--
GitLab
From 3c09d3ec0382c22953cd816d19b49d43e5e07160 Mon Sep 17 00:00:00 2001
From: bimbola81 <aabiola@oteemo.com>
Date: Mon, 31 Mar 2025 17:25:55 -0400
Subject: [PATCH 9/9] update values.yaml
---
chart/values.yaml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/chart/values.yaml b/chart/values.yaml
index f417577..0639c70 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -647,20 +647,20 @@ resources:
# cpu: 100m
# memory: 2280Mi
-runtimePath: /run/k3s/containerd/containerd.sock
+runtimePath: /var/run/containerd/containerd.sock
# The following runtime type and socket location are deprecated after 5.3.0.
# If the socket path is not at the default location, use above 'runtimePath' to specify the location.
docker:
path: /var/run/docker.sock
k3s:
- enabled: false
- runtimePath: /run/k3s/containerd/containerd.sock
+ enabled: true
+ runtimePath: /var/run/containerd/containerd.sock
bottlerocket:
enabled: false
runtimePath: /run/dockershim.sock
containerd:
- enabled: false
+ enabled: true
path: /var/run/containerd/containerd.sock
crio:
enabled: false
--
GitLab