From d1bc69622b078f2959c384d1a8131376a04bef5d Mon Sep 17 00:00:00 2001 From: "venkatesh.jayagopal" Date: Mon, 30 Oct 2023 18:05:09 +0000 Subject: [PATCH 1/3] Changing .Release.Service to Helm for AWS Addon fix --- .../templates/admission-webhook-service.yaml | 2 +- charts/core/templates/clusterrole.yaml | 8 ++++---- .../templates/clusterrolebinding-least.yaml | 10 +++++----- charts/core/templates/clusterrolebinding.yaml | 10 +++++----- .../core/templates/controller-deployment.yaml | 2 +- charts/core/templates/controller-ingress.yaml | 12 +++++------ charts/core/templates/controller-route.yaml | 6 +++--- charts/core/templates/controller-service.yaml | 8 ++++---- charts/core/templates/crd-role-least.yaml | 20 +++++++++---------- charts/core/templates/crd-role.yaml | 20 +++++++++---------- charts/core/templates/crd.yaml | 12 +++++------ charts/core/templates/csp-clusterrole.yaml | 4 ++-- .../templates/csp-clusterrolebinding.yaml | 4 ++-- charts/core/templates/csp-crd.yaml | 2 +- charts/core/templates/csp-deployment.yaml | 2 +- charts/core/templates/csp-role.yaml | 2 +- charts/core/templates/csp-rolebinding.yaml | 2 +- charts/core/templates/csp-serviceaccount.yaml | 2 +- charts/core/templates/enforcer-daemonset.yaml | 2 +- charts/core/templates/init-configmap.yaml | 2 +- charts/core/templates/init-secret.yaml | 2 +- charts/core/templates/manager-deployment.yaml | 2 +- charts/core/templates/manager-ingress.yaml | 4 ++-- charts/core/templates/manager-route.yaml | 2 +- charts/core/templates/manager-service.yaml | 2 +- charts/core/templates/psp.yaml | 6 +++--- charts/core/templates/pvc.yaml | 2 +- .../templates/registry-adapter-ingress.yaml | 6 +++--- charts/core/templates/registry-adapter.yaml | 4 ++-- charts/core/templates/role-least.yaml | 2 +- charts/core/templates/rolebinding-least.yaml | 4 ++-- charts/core/templates/rolebinding.yaml | 4 ++-- charts/core/templates/scanner-deployment.yaml | 2 +- .../core/templates/serviceaccount-least.yaml | 8 ++++---- charts/core/templates/serviceaccount.yaml | 2 +- charts/core/templates/updater-cronjob.yaml | 2 +- charts/crd/templates/crd.yaml | 12 +++++------ charts/crd/templates/csp-crd.yaml | 2 +- .../templates/exporter-deployment.yaml | 2 +- .../monitor/templates/exporter-service.yaml | 2 +- .../templates/exporter-servicemonitor.yaml | 2 +- charts/monitor/templates/secret.yaml | 2 +- 42 files changed, 104 insertions(+), 104 deletions(-) diff --git a/charts/core/templates/admission-webhook-service.yaml b/charts/core/templates/admission-webhook-service.yaml index 8a0a76aa..d45132d0 100644 --- a/charts/core/templates/admission-webhook-service.yaml +++ b/charts/core/templates/admission-webhook-service.yaml @@ -6,7 +6,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: ports: - port: 443 diff --git a/charts/core/templates/clusterrole.yaml b/charts/core/templates/clusterrole.yaml index cce7a825..36a260df 100644 --- a/charts/core/templates/clusterrole.yaml +++ b/charts/core/templates/clusterrole.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - "" @@ -44,7 +44,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: {{- if .Values.openshift }} - apiGroups: @@ -83,7 +83,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - admissionregistration.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - config.openshift.io diff --git a/charts/core/templates/clusterrolebinding-least.yaml b/charts/core/templates/clusterrolebinding-least.yaml index 915c99b9..877a1415 100644 --- a/charts/core/templates/clusterrolebinding-least.yaml +++ b/charts/core/templates/clusterrolebinding-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -134,7 +134,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/clusterrolebinding.yaml b/charts/core/templates/clusterrolebinding.yaml index 598151b0..fcb351c1 100644 --- a/charts/core/templates/clusterrolebinding.yaml +++ b/charts/core/templates/clusterrolebinding.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -134,7 +134,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/controller-deployment.yaml b/charts/core/templates/controller-deployment.yaml index 01b0aa99..eba52a27 100644 --- a/charts/core/templates/controller-deployment.yaml +++ b/charts/core/templates/controller-deployment.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} {{- with .Values.controller.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/core/templates/controller-ingress.yaml b/charts/core/templates/controller-ingress.yaml index b36fbbdc..5e22baae 100644 --- a/charts/core/templates/controller-ingress.yaml +++ b/charts/core/templates/controller-ingress.yaml @@ -13,7 +13,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.ingress.ingressClassName | quote }} @@ -50,7 +50,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.ingress.tls }} tls: @@ -85,7 +85,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.federation.mastersvc.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.federation.mastersvc.ingress.ingressClassName | quote }} @@ -123,7 +123,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.federation.mastersvc.ingress.tls }} tls: @@ -158,7 +158,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.federation.managedsvc.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.federation.managedsvc.ingress.ingressClassName | quote }} @@ -196,7 +196,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.federation.managedsvc.ingress.tls }} tls: diff --git a/charts/core/templates/controller-route.yaml b/charts/core/templates/controller-route.yaml index 686a77ec..e4440878 100644 --- a/charts/core/templates/controller-route.yaml +++ b/charts/core/templates/controller-route.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.apisvc.route.host }} host: {{ .Values.controller.apisvc.route.host }} @@ -45,7 +45,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.federation.mastersvc.route.host }} host: {{ .Values.controller.federation.mastersvc.route.host }} @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.controller.federation.managedsvc.route.host }} host: {{ .Values.controller.federation.managedsvc.route.host }} diff --git a/charts/core/templates/controller-service.yaml b/charts/core/templates/controller-service.yaml index d4040a78..aa38bab6 100644 --- a/charts/core/templates/controller-service.yaml +++ b/charts/core/templates/controller-service.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: clusterIP: None ports: @@ -36,7 +36,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: type: {{ .Values.controller.apisvc.type }} ports: @@ -60,7 +60,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: type: {{ .Values.controller.federation.mastersvc.type }} ports: @@ -84,7 +84,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: type: {{ .Values.controller.federation.managedsvc.type }} ports: diff --git a/charts/core/templates/crd-role-least.yaml b/charts/core/templates/crd-role-least.yaml index 219c2622..16081fe6 100644 --- a/charts/core/templates/crd-role-least.yaml +++ b/charts/core/templates/crd-role-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - apiextensions.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -75,7 +75,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -103,7 +103,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -135,7 +135,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -162,7 +162,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -189,7 +189,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -221,7 +221,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -253,7 +253,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -280,7 +280,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/crd-role.yaml b/charts/core/templates/crd-role.yaml index 6a366133..b6b6b75d 100644 --- a/charts/core/templates/crd-role.yaml +++ b/charts/core/templates/crd-role.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - apiextensions.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -75,7 +75,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -103,7 +103,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -135,7 +135,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -162,7 +162,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -189,7 +189,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -221,7 +221,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -253,7 +253,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - neuvector.com @@ -280,7 +280,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/crd.yaml b/charts/core/templates/crd.yaml index 60640ce8..5a6b340e 100644 --- a/charts/core/templates/crd.yaml +++ b/charts/core/templates/crd.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -278,7 +278,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -544,7 +544,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -630,7 +630,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -749,7 +749,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -832,7 +832,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: ports: - port: 443 diff --git a/charts/core/templates/csp-clusterrole.yaml b/charts/core/templates/csp-clusterrole.yaml index 717a03dc..298e6a96 100644 --- a/charts/core/templates/csp-clusterrole.yaml +++ b/charts/core/templates/csp-clusterrole.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - susecloud.net @@ -41,7 +41,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - susecloud.net diff --git a/charts/core/templates/csp-clusterrolebinding.yaml b/charts/core/templates/csp-clusterrolebinding.yaml index fa2f6227..e59ce03b 100644 --- a/charts/core/templates/csp-clusterrolebinding.yaml +++ b/charts/core/templates/csp-clusterrolebinding.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/csp-crd.yaml b/charts/core/templates/csp-crd.yaml index 9263bc38..98eb247d 100644 --- a/charts/core/templates/csp-crd.yaml +++ b/charts/core/templates/csp-crd.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: susecloud.net names: diff --git a/charts/core/templates/csp-deployment.yaml b/charts/core/templates/csp-deployment.yaml index eae91b16..d390cd89 100644 --- a/charts/core/templates/csp-deployment.yaml +++ b/charts/core/templates/csp-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} {{- with .Values.global.aws.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/core/templates/csp-role.yaml b/charts/core/templates/csp-role.yaml index f70c3adb..166df97e 100644 --- a/charts/core/templates/csp-role.yaml +++ b/charts/core/templates/csp-role.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - "" diff --git a/charts/core/templates/csp-rolebinding.yaml b/charts/core/templates/csp-rolebinding.yaml index be2d402d..f59ad658 100644 --- a/charts/core/templates/csp-rolebinding.yaml +++ b/charts/core/templates/csp-rolebinding.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/charts/core/templates/csp-serviceaccount.yaml b/charts/core/templates/csp-serviceaccount.yaml index e17d0290..17edced8 100644 --- a/charts/core/templates/csp-serviceaccount.yaml +++ b/charts/core/templates/csp-serviceaccount.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} annotations: {{- if .Values.global.aws.enabled }} eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.global.aws.accountNumber }}:role/{{ .Values.global.aws.roleName }} diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml index f046ca52..9590f4d5 100644 --- a/charts/core/templates/enforcer-daemonset.yaml +++ b/charts/core/templates/enforcer-daemonset.yaml @@ -10,7 +10,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} release: {{ .Release.Name }} spec: updateStrategy: {{- toYaml .Values.enforcer.updateStrategy | nindent 4 }} diff --git a/charts/core/templates/init-configmap.yaml b/charts/core/templates/init-configmap.yaml index 5cc1bb5c..732a3eea 100644 --- a/charts/core/templates/init-configmap.yaml +++ b/charts/core/templates/init-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} data: {{ toYaml .Values.controller.configmap.data | indent 2 }} {{- end }} diff --git a/charts/core/templates/init-secret.yaml b/charts/core/templates/init-secret.yaml index 8a508140..55679caf 100644 --- a/charts/core/templates/init-secret.yaml +++ b/charts/core/templates/init-secret.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} data: {{- range $key, $val := .Values.controller.secret.data }} {{ $key }}: | {{ toYaml $val | b64enc | nindent 4 }} diff --git a/charts/core/templates/manager-deployment.yaml b/charts/core/templates/manager-deployment.yaml index 0defb0f4..c316a313 100644 --- a/charts/core/templates/manager-deployment.yaml +++ b/charts/core/templates/manager-deployment.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: replicas: 1 selector: diff --git a/charts/core/templates/manager-ingress.yaml b/charts/core/templates/manager-ingress.yaml index d6e2e335..cb79629d 100644 --- a/charts/core/templates/manager-ingress.yaml +++ b/charts/core/templates/manager-ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.manager.ingress.ingressClassName }} ingressClassName: {{ .Values.manager.ingress.ingressClassName | quote }} @@ -49,7 +49,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.manager.ingress.tls }} tls: diff --git a/charts/core/templates/manager-route.yaml b/charts/core/templates/manager-route.yaml index 784a4ae2..58ec5eac 100644 --- a/charts/core/templates/manager-route.yaml +++ b/charts/core/templates/manager-route.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.manager.route.host }} host: {{ .Values.manager.route.host }} diff --git a/charts/core/templates/manager-service.yaml b/charts/core/templates/manager-service.yaml index e18e55c3..402ce687 100644 --- a/charts/core/templates/manager-service.yaml +++ b/charts/core/templates/manager-service.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: type: {{ .Values.manager.svc.type }} {{- if and .Values.manager.svc.loadBalancerIP (eq .Values.manager.svc.type "LoadBalancer") }} diff --git a/charts/core/templates/psp.yaml b/charts/core/templates/psp.yaml index 96c46771..4c9584e2 100644 --- a/charts/core/templates/psp.yaml +++ b/charts/core/templates/psp.yaml @@ -7,7 +7,7 @@ metadata: seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*' labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} release: {{ .Release.Name }} spec: privileged: true @@ -44,7 +44,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} release: {{ .Release.Name }} rules: - apiGroups: @@ -64,7 +64,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} release: {{ .Release.Name }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/pvc.yaml b/charts/core/templates/pvc.yaml index 3821d048..08a9d7b2 100644 --- a/charts/core/templates/pvc.yaml +++ b/charts/core/templates/pvc.yaml @@ -8,7 +8,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: accessModes: {{ toYaml .Values.controller.pvc.accessModes | indent 4 }} diff --git a/charts/core/templates/registry-adapter-ingress.yaml b/charts/core/templates/registry-adapter-ingress.yaml index 22c7244a..2c8f24bc 100644 --- a/charts/core/templates/registry-adapter-ingress.yaml +++ b/charts/core/templates/registry-adapter-ingress.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.cve.adapter.ingress.ingressClassName }} ingressClassName: {{ .Values.cve.adapter.ingress.ingressClassName | quote }} @@ -51,7 +51,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.cve.adapter.ingress.tls }} tls: @@ -87,7 +87,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: {{- if .Values.cve.adapter.route.host }} host: {{ .Values.cve.adapter.route.host }} diff --git a/charts/core/templates/registry-adapter.yaml b/charts/core/templates/registry-adapter.yaml index 60828150..100a24f6 100644 --- a/charts/core/templates/registry-adapter.yaml +++ b/charts/core/templates/registry-adapter.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: replicas: 1 selector: @@ -172,7 +172,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: type: {{ .Values.cve.adapter.svc.type }} {{- if and .Values.cve.adapter.svc.loadBalancerIP (eq .Values.cve.adapter.svc.type "LoadBalancer") }} diff --git a/charts/core/templates/role-least.yaml b/charts/core/templates/role-least.yaml index b6324d73..309da186 100644 --- a/charts/core/templates/role-least.yaml +++ b/charts/core/templates/role-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} rules: - apiGroups: - apps diff --git a/charts/core/templates/rolebinding-least.yaml b/charts/core/templates/rolebinding-least.yaml index 163a0530..f60420db 100644 --- a/charts/core/templates/rolebinding-least.yaml +++ b/charts/core/templates/rolebinding-least.yaml @@ -16,7 +16,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/rolebinding.yaml b/charts/core/templates/rolebinding.yaml index 257c35c9..91637257 100644 --- a/charts/core/templates/rolebinding.yaml +++ b/charts/core/templates/rolebinding.yaml @@ -16,7 +16,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/scanner-deployment.yaml b/charts/core/templates/scanner-deployment.yaml index e93756f7..6e7eabea 100644 --- a/charts/core/templates/scanner-deployment.yaml +++ b/charts/core/templates/scanner-deployment.yaml @@ -10,7 +10,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} release: {{ .Release.Name }} spec: strategy: diff --git a/charts/core/templates/serviceaccount-least.yaml b/charts/core/templates/serviceaccount-least.yaml index 9d728abe..a214f9e1 100644 --- a/charts/core/templates/serviceaccount-least.yaml +++ b/charts/core/templates/serviceaccount-least.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} --- @@ -19,7 +19,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} --- @@ -31,7 +31,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} --- @@ -43,5 +43,5 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} {{- end }} diff --git a/charts/core/templates/serviceaccount.yaml b/charts/core/templates/serviceaccount.yaml index 595914ca..88993849 100644 --- a/charts/core/templates/serviceaccount.yaml +++ b/charts/core/templates/serviceaccount.yaml @@ -8,6 +8,6 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} {{- end }} {{- end }} diff --git a/charts/core/templates/updater-cronjob.yaml b/charts/core/templates/updater-cronjob.yaml index f1d1d46c..3a1e6642 100644 --- a/charts/core/templates/updater-cronjob.yaml +++ b/charts/core/templates/updater-cronjob.yaml @@ -13,7 +13,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: schedule: {{ .Values.cve.updater.schedule | quote }} jobTemplate: diff --git a/charts/crd/templates/crd.yaml b/charts/crd/templates/crd.yaml index 01acfc96..321e6f89 100644 --- a/charts/crd/templates/crd.yaml +++ b/charts/crd/templates/crd.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -277,7 +277,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -543,7 +543,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -629,7 +629,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -748,7 +748,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: neuvector.com names: @@ -831,7 +831,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: ports: - port: 443 diff --git a/charts/crd/templates/csp-crd.yaml b/charts/crd/templates/csp-crd.yaml index f74115fa..36909074 100644 --- a/charts/crd/templates/csp-crd.yaml +++ b/charts/crd/templates/csp-crd.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: group: susecloud.net names: diff --git a/charts/monitor/templates/exporter-deployment.yaml b/charts/monitor/templates/exporter-deployment.yaml index b95222d0..798751e1 100644 --- a/charts/monitor/templates/exporter-deployment.yaml +++ b/charts/monitor/templates/exporter-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} spec: replicas: 1 selector: diff --git a/charts/monitor/templates/exporter-service.yaml b/charts/monitor/templates/exporter-service.yaml index b3045627..eae0c1c5 100644 --- a/charts/monitor/templates/exporter-service.yaml +++ b/charts/monitor/templates/exporter-service.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} app: neuvector-prometheus-exporter spec: type: {{ .Values.exporter.svc.type }} diff --git a/charts/monitor/templates/exporter-servicemonitor.yaml b/charts/monitor/templates/exporter-servicemonitor.yaml index 25ca23d1..84e383f0 100644 --- a/charts/monitor/templates/exporter-servicemonitor.yaml +++ b/charts/monitor/templates/exporter-servicemonitor.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} {{- if .Values.exporter.serviceMonitor.labels }} {{- toYaml .Values.exporter.serviceMonitor.labels | nindent 4}} {{- end }} diff --git a/charts/monitor/templates/secret.yaml b/charts/monitor/templates/secret.yaml index 9a04ac47..e8e1c705 100644 --- a/charts/monitor/templates/secret.yaml +++ b/charts/monitor/templates/secret.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: {{ Helm }} type: Opaque data: CTRL_USERNAME: {{ .Values.exporter.CTRL_USERNAME | b64enc | quote }} From 08802c592b8b9f1206c5f934c1711d7e0c17bc9b Mon Sep 17 00:00:00 2001 From: "venkatesh.jayagopal" Date: Mon, 30 Oct 2023 18:56:43 +0000 Subject: [PATCH 2/3] Reverting the change --- .../templates/admission-webhook-service.yaml | 2 +- charts/core/templates/clusterrole.yaml | 8 ++++---- .../templates/clusterrolebinding-least.yaml | 10 +++++----- charts/core/templates/clusterrolebinding.yaml | 10 +++++----- .../core/templates/controller-deployment.yaml | 2 +- charts/core/templates/controller-ingress.yaml | 12 +++++------ charts/core/templates/controller-route.yaml | 6 +++--- charts/core/templates/controller-service.yaml | 8 ++++---- charts/core/templates/crd-role-least.yaml | 20 +++++++++---------- charts/core/templates/crd-role.yaml | 20 +++++++++---------- charts/core/templates/crd.yaml | 12 +++++------ charts/core/templates/csp-clusterrole.yaml | 4 ++-- .../templates/csp-clusterrolebinding.yaml | 4 ++-- charts/core/templates/csp-crd.yaml | 2 +- charts/core/templates/csp-deployment.yaml | 2 +- charts/core/templates/csp-role.yaml | 2 +- charts/core/templates/csp-rolebinding.yaml | 2 +- charts/core/templates/csp-serviceaccount.yaml | 2 +- charts/core/templates/enforcer-daemonset.yaml | 2 +- charts/core/templates/init-configmap.yaml | 2 +- charts/core/templates/init-secret.yaml | 2 +- charts/core/templates/manager-deployment.yaml | 2 +- charts/core/templates/manager-ingress.yaml | 4 ++-- charts/core/templates/manager-route.yaml | 2 +- charts/core/templates/manager-service.yaml | 2 +- charts/core/templates/psp.yaml | 6 +++--- charts/core/templates/pvc.yaml | 2 +- .../templates/registry-adapter-ingress.yaml | 6 +++--- charts/core/templates/registry-adapter.yaml | 4 ++-- charts/core/templates/role-least.yaml | 2 +- charts/core/templates/rolebinding-least.yaml | 4 ++-- charts/core/templates/rolebinding.yaml | 4 ++-- charts/core/templates/scanner-deployment.yaml | 2 +- .../core/templates/serviceaccount-least.yaml | 8 ++++---- charts/core/templates/serviceaccount.yaml | 2 +- charts/core/templates/updater-cronjob.yaml | 2 +- charts/crd/templates/crd.yaml | 12 +++++------ charts/crd/templates/csp-crd.yaml | 2 +- .../templates/exporter-deployment.yaml | 2 +- .../monitor/templates/exporter-service.yaml | 2 +- .../templates/exporter-servicemonitor.yaml | 2 +- charts/monitor/templates/secret.yaml | 2 +- 42 files changed, 104 insertions(+), 104 deletions(-) diff --git a/charts/core/templates/admission-webhook-service.yaml b/charts/core/templates/admission-webhook-service.yaml index d45132d0..8a0a76aa 100644 --- a/charts/core/templates/admission-webhook-service.yaml +++ b/charts/core/templates/admission-webhook-service.yaml @@ -6,7 +6,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: ports: - port: 443 diff --git a/charts/core/templates/clusterrole.yaml b/charts/core/templates/clusterrole.yaml index 36a260df..cce7a825 100644 --- a/charts/core/templates/clusterrole.yaml +++ b/charts/core/templates/clusterrole.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - "" @@ -44,7 +44,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: {{- if .Values.openshift }} - apiGroups: @@ -83,7 +83,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - admissionregistration.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - config.openshift.io diff --git a/charts/core/templates/clusterrolebinding-least.yaml b/charts/core/templates/clusterrolebinding-least.yaml index 877a1415..915c99b9 100644 --- a/charts/core/templates/clusterrolebinding-least.yaml +++ b/charts/core/templates/clusterrolebinding-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -134,7 +134,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/clusterrolebinding.yaml b/charts/core/templates/clusterrolebinding.yaml index fcb351c1..598151b0 100644 --- a/charts/core/templates/clusterrolebinding.yaml +++ b/charts/core/templates/clusterrolebinding.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -134,7 +134,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/controller-deployment.yaml b/charts/core/templates/controller-deployment.yaml index eba52a27..01b0aa99 100644 --- a/charts/core/templates/controller-deployment.yaml +++ b/charts/core/templates/controller-deployment.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} {{- with .Values.controller.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/core/templates/controller-ingress.yaml b/charts/core/templates/controller-ingress.yaml index 5e22baae..b36fbbdc 100644 --- a/charts/core/templates/controller-ingress.yaml +++ b/charts/core/templates/controller-ingress.yaml @@ -13,7 +13,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.ingress.ingressClassName | quote }} @@ -50,7 +50,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.ingress.tls }} tls: @@ -85,7 +85,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.federation.mastersvc.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.federation.mastersvc.ingress.ingressClassName | quote }} @@ -123,7 +123,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.federation.mastersvc.ingress.tls }} tls: @@ -158,7 +158,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.federation.managedsvc.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.federation.managedsvc.ingress.ingressClassName | quote }} @@ -196,7 +196,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.federation.managedsvc.ingress.tls }} tls: diff --git a/charts/core/templates/controller-route.yaml b/charts/core/templates/controller-route.yaml index e4440878..686a77ec 100644 --- a/charts/core/templates/controller-route.yaml +++ b/charts/core/templates/controller-route.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.apisvc.route.host }} host: {{ .Values.controller.apisvc.route.host }} @@ -45,7 +45,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.federation.mastersvc.route.host }} host: {{ .Values.controller.federation.mastersvc.route.host }} @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.controller.federation.managedsvc.route.host }} host: {{ .Values.controller.federation.managedsvc.route.host }} diff --git a/charts/core/templates/controller-service.yaml b/charts/core/templates/controller-service.yaml index aa38bab6..d4040a78 100644 --- a/charts/core/templates/controller-service.yaml +++ b/charts/core/templates/controller-service.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: clusterIP: None ports: @@ -36,7 +36,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: type: {{ .Values.controller.apisvc.type }} ports: @@ -60,7 +60,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: type: {{ .Values.controller.federation.mastersvc.type }} ports: @@ -84,7 +84,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: type: {{ .Values.controller.federation.managedsvc.type }} ports: diff --git a/charts/core/templates/crd-role-least.yaml b/charts/core/templates/crd-role-least.yaml index 16081fe6..219c2622 100644 --- a/charts/core/templates/crd-role-least.yaml +++ b/charts/core/templates/crd-role-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - apiextensions.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -75,7 +75,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -103,7 +103,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -135,7 +135,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -162,7 +162,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -189,7 +189,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -221,7 +221,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -253,7 +253,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -280,7 +280,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/crd-role.yaml b/charts/core/templates/crd-role.yaml index b6b6b75d..6a366133 100644 --- a/charts/core/templates/crd-role.yaml +++ b/charts/core/templates/crd-role.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - apiextensions.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -75,7 +75,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -103,7 +103,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -135,7 +135,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -162,7 +162,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -189,7 +189,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -221,7 +221,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -253,7 +253,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - neuvector.com @@ -280,7 +280,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/crd.yaml b/charts/core/templates/crd.yaml index 5a6b340e..60640ce8 100644 --- a/charts/core/templates/crd.yaml +++ b/charts/core/templates/crd.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -278,7 +278,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -544,7 +544,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -630,7 +630,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -749,7 +749,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -832,7 +832,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: ports: - port: 443 diff --git a/charts/core/templates/csp-clusterrole.yaml b/charts/core/templates/csp-clusterrole.yaml index 298e6a96..717a03dc 100644 --- a/charts/core/templates/csp-clusterrole.yaml +++ b/charts/core/templates/csp-clusterrole.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - susecloud.net @@ -41,7 +41,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - susecloud.net diff --git a/charts/core/templates/csp-clusterrolebinding.yaml b/charts/core/templates/csp-clusterrolebinding.yaml index e59ce03b..fa2f6227 100644 --- a/charts/core/templates/csp-clusterrolebinding.yaml +++ b/charts/core/templates/csp-clusterrolebinding.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/csp-crd.yaml b/charts/core/templates/csp-crd.yaml index 98eb247d..9263bc38 100644 --- a/charts/core/templates/csp-crd.yaml +++ b/charts/core/templates/csp-crd.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: susecloud.net names: diff --git a/charts/core/templates/csp-deployment.yaml b/charts/core/templates/csp-deployment.yaml index d390cd89..eae91b16 100644 --- a/charts/core/templates/csp-deployment.yaml +++ b/charts/core/templates/csp-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} {{- with .Values.global.aws.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/core/templates/csp-role.yaml b/charts/core/templates/csp-role.yaml index 166df97e..f70c3adb 100644 --- a/charts/core/templates/csp-role.yaml +++ b/charts/core/templates/csp-role.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - "" diff --git a/charts/core/templates/csp-rolebinding.yaml b/charts/core/templates/csp-rolebinding.yaml index f59ad658..be2d402d 100644 --- a/charts/core/templates/csp-rolebinding.yaml +++ b/charts/core/templates/csp-rolebinding.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/charts/core/templates/csp-serviceaccount.yaml b/charts/core/templates/csp-serviceaccount.yaml index 17edced8..e17d0290 100644 --- a/charts/core/templates/csp-serviceaccount.yaml +++ b/charts/core/templates/csp-serviceaccount.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} annotations: {{- if .Values.global.aws.enabled }} eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.global.aws.accountNumber }}:role/{{ .Values.global.aws.roleName }} diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml index 9590f4d5..f046ca52 100644 --- a/charts/core/templates/enforcer-daemonset.yaml +++ b/charts/core/templates/enforcer-daemonset.yaml @@ -10,7 +10,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} spec: updateStrategy: {{- toYaml .Values.enforcer.updateStrategy | nindent 4 }} diff --git a/charts/core/templates/init-configmap.yaml b/charts/core/templates/init-configmap.yaml index 732a3eea..5cc1bb5c 100644 --- a/charts/core/templates/init-configmap.yaml +++ b/charts/core/templates/init-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} data: {{ toYaml .Values.controller.configmap.data | indent 2 }} {{- end }} diff --git a/charts/core/templates/init-secret.yaml b/charts/core/templates/init-secret.yaml index 55679caf..8a508140 100644 --- a/charts/core/templates/init-secret.yaml +++ b/charts/core/templates/init-secret.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} data: {{- range $key, $val := .Values.controller.secret.data }} {{ $key }}: | {{ toYaml $val | b64enc | nindent 4 }} diff --git a/charts/core/templates/manager-deployment.yaml b/charts/core/templates/manager-deployment.yaml index c316a313..0defb0f4 100644 --- a/charts/core/templates/manager-deployment.yaml +++ b/charts/core/templates/manager-deployment.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: replicas: 1 selector: diff --git a/charts/core/templates/manager-ingress.yaml b/charts/core/templates/manager-ingress.yaml index cb79629d..d6e2e335 100644 --- a/charts/core/templates/manager-ingress.yaml +++ b/charts/core/templates/manager-ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.manager.ingress.ingressClassName }} ingressClassName: {{ .Values.manager.ingress.ingressClassName | quote }} @@ -49,7 +49,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.manager.ingress.tls }} tls: diff --git a/charts/core/templates/manager-route.yaml b/charts/core/templates/manager-route.yaml index 58ec5eac..784a4ae2 100644 --- a/charts/core/templates/manager-route.yaml +++ b/charts/core/templates/manager-route.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.manager.route.host }} host: {{ .Values.manager.route.host }} diff --git a/charts/core/templates/manager-service.yaml b/charts/core/templates/manager-service.yaml index 402ce687..e18e55c3 100644 --- a/charts/core/templates/manager-service.yaml +++ b/charts/core/templates/manager-service.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: type: {{ .Values.manager.svc.type }} {{- if and .Values.manager.svc.loadBalancerIP (eq .Values.manager.svc.type "LoadBalancer") }} diff --git a/charts/core/templates/psp.yaml b/charts/core/templates/psp.yaml index 4c9584e2..96c46771 100644 --- a/charts/core/templates/psp.yaml +++ b/charts/core/templates/psp.yaml @@ -7,7 +7,7 @@ metadata: seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*' labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} spec: privileged: true @@ -44,7 +44,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} rules: - apiGroups: @@ -64,7 +64,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/pvc.yaml b/charts/core/templates/pvc.yaml index 08a9d7b2..3821d048 100644 --- a/charts/core/templates/pvc.yaml +++ b/charts/core/templates/pvc.yaml @@ -8,7 +8,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: accessModes: {{ toYaml .Values.controller.pvc.accessModes | indent 4 }} diff --git a/charts/core/templates/registry-adapter-ingress.yaml b/charts/core/templates/registry-adapter-ingress.yaml index 2c8f24bc..22c7244a 100644 --- a/charts/core/templates/registry-adapter-ingress.yaml +++ b/charts/core/templates/registry-adapter-ingress.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.cve.adapter.ingress.ingressClassName }} ingressClassName: {{ .Values.cve.adapter.ingress.ingressClassName | quote }} @@ -51,7 +51,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.cve.adapter.ingress.tls }} tls: @@ -87,7 +87,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: {{- if .Values.cve.adapter.route.host }} host: {{ .Values.cve.adapter.route.host }} diff --git a/charts/core/templates/registry-adapter.yaml b/charts/core/templates/registry-adapter.yaml index 100a24f6..60828150 100644 --- a/charts/core/templates/registry-adapter.yaml +++ b/charts/core/templates/registry-adapter.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: replicas: 1 selector: @@ -172,7 +172,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: type: {{ .Values.cve.adapter.svc.type }} {{- if and .Values.cve.adapter.svc.loadBalancerIP (eq .Values.cve.adapter.svc.type "LoadBalancer") }} diff --git a/charts/core/templates/role-least.yaml b/charts/core/templates/role-least.yaml index 309da186..b6324d73 100644 --- a/charts/core/templates/role-least.yaml +++ b/charts/core/templates/role-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} rules: - apiGroups: - apps diff --git a/charts/core/templates/rolebinding-least.yaml b/charts/core/templates/rolebinding-least.yaml index f60420db..163a0530 100644 --- a/charts/core/templates/rolebinding-least.yaml +++ b/charts/core/templates/rolebinding-least.yaml @@ -16,7 +16,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/rolebinding.yaml b/charts/core/templates/rolebinding.yaml index 91637257..257c35c9 100644 --- a/charts/core/templates/rolebinding.yaml +++ b/charts/core/templates/rolebinding.yaml @@ -16,7 +16,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/scanner-deployment.yaml b/charts/core/templates/scanner-deployment.yaml index 6e7eabea..e93756f7 100644 --- a/charts/core/templates/scanner-deployment.yaml +++ b/charts/core/templates/scanner-deployment.yaml @@ -10,7 +10,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} release: {{ .Release.Name }} spec: strategy: diff --git a/charts/core/templates/serviceaccount-least.yaml b/charts/core/templates/serviceaccount-least.yaml index a214f9e1..9d728abe 100644 --- a/charts/core/templates/serviceaccount-least.yaml +++ b/charts/core/templates/serviceaccount-least.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} --- @@ -19,7 +19,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} --- @@ -31,7 +31,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} --- @@ -43,5 +43,5 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} {{- end }} diff --git a/charts/core/templates/serviceaccount.yaml b/charts/core/templates/serviceaccount.yaml index 88993849..595914ca 100644 --- a/charts/core/templates/serviceaccount.yaml +++ b/charts/core/templates/serviceaccount.yaml @@ -8,6 +8,6 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} {{- end }} {{- end }} diff --git a/charts/core/templates/updater-cronjob.yaml b/charts/core/templates/updater-cronjob.yaml index 3a1e6642..f1d1d46c 100644 --- a/charts/core/templates/updater-cronjob.yaml +++ b/charts/core/templates/updater-cronjob.yaml @@ -13,7 +13,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: schedule: {{ .Values.cve.updater.schedule | quote }} jobTemplate: diff --git a/charts/crd/templates/crd.yaml b/charts/crd/templates/crd.yaml index 321e6f89..01acfc96 100644 --- a/charts/crd/templates/crd.yaml +++ b/charts/crd/templates/crd.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -277,7 +277,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -543,7 +543,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -629,7 +629,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -748,7 +748,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: neuvector.com names: @@ -831,7 +831,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: ports: - port: 443 diff --git a/charts/crd/templates/csp-crd.yaml b/charts/crd/templates/csp-crd.yaml index 36909074..f74115fa 100644 --- a/charts/crd/templates/csp-crd.yaml +++ b/charts/crd/templates/csp-crd.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: group: susecloud.net names: diff --git a/charts/monitor/templates/exporter-deployment.yaml b/charts/monitor/templates/exporter-deployment.yaml index 798751e1..b95222d0 100644 --- a/charts/monitor/templates/exporter-deployment.yaml +++ b/charts/monitor/templates/exporter-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} spec: replicas: 1 selector: diff --git a/charts/monitor/templates/exporter-service.yaml b/charts/monitor/templates/exporter-service.yaml index eae0c1c5..b3045627 100644 --- a/charts/monitor/templates/exporter-service.yaml +++ b/charts/monitor/templates/exporter-service.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} app: neuvector-prometheus-exporter spec: type: {{ .Values.exporter.svc.type }} diff --git a/charts/monitor/templates/exporter-servicemonitor.yaml b/charts/monitor/templates/exporter-servicemonitor.yaml index 84e383f0..25ca23d1 100644 --- a/charts/monitor/templates/exporter-servicemonitor.yaml +++ b/charts/monitor/templates/exporter-servicemonitor.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} {{- if .Values.exporter.serviceMonitor.labels }} {{- toYaml .Values.exporter.serviceMonitor.labels | nindent 4}} {{- end }} diff --git a/charts/monitor/templates/secret.yaml b/charts/monitor/templates/secret.yaml index e8e1c705..9a04ac47 100644 --- a/charts/monitor/templates/secret.yaml +++ b/charts/monitor/templates/secret.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ Helm }} + heritage: {{ .Release.Service }} type: Opaque data: CTRL_USERNAME: {{ .Values.exporter.CTRL_USERNAME | b64enc | quote }} From 2bd8a081c01496e4638385c513ce3b09abefb909 Mon Sep 17 00:00:00 2001 From: "venkatesh.jayagopal" Date: Mon, 30 Oct 2023 18:59:02 +0000 Subject: [PATCH 3/3] Changing only on CORE charts --- .../templates/admission-webhook-service.yaml | 2 +- charts/core/templates/clusterrole.yaml | 8 ++++---- .../templates/clusterrolebinding-least.yaml | 10 +++++----- charts/core/templates/clusterrolebinding.yaml | 10 +++++----- .../core/templates/controller-deployment.yaml | 2 +- charts/core/templates/controller-ingress.yaml | 12 +++++------ charts/core/templates/controller-route.yaml | 6 +++--- charts/core/templates/controller-service.yaml | 8 ++++---- charts/core/templates/crd-role-least.yaml | 20 +++++++++---------- charts/core/templates/crd-role.yaml | 20 +++++++++---------- charts/core/templates/crd.yaml | 12 +++++------ charts/core/templates/csp-clusterrole.yaml | 4 ++-- .../templates/csp-clusterrolebinding.yaml | 4 ++-- charts/core/templates/csp-crd.yaml | 2 +- charts/core/templates/csp-deployment.yaml | 2 +- charts/core/templates/csp-role.yaml | 2 +- charts/core/templates/csp-rolebinding.yaml | 2 +- charts/core/templates/csp-serviceaccount.yaml | 2 +- charts/core/templates/enforcer-daemonset.yaml | 2 +- charts/core/templates/init-configmap.yaml | 2 +- charts/core/templates/init-secret.yaml | 2 +- charts/core/templates/manager-deployment.yaml | 2 +- charts/core/templates/manager-ingress.yaml | 4 ++-- charts/core/templates/manager-route.yaml | 2 +- charts/core/templates/manager-service.yaml | 2 +- charts/core/templates/psp.yaml | 6 +++--- charts/core/templates/pvc.yaml | 2 +- .../templates/registry-adapter-ingress.yaml | 6 +++--- charts/core/templates/registry-adapter.yaml | 4 ++-- charts/core/templates/role-least.yaml | 2 +- charts/core/templates/rolebinding-least.yaml | 4 ++-- charts/core/templates/rolebinding.yaml | 4 ++-- charts/core/templates/scanner-deployment.yaml | 2 +- .../core/templates/serviceaccount-least.yaml | 8 ++++---- charts/core/templates/serviceaccount.yaml | 2 +- charts/core/templates/updater-cronjob.yaml | 2 +- 36 files changed, 93 insertions(+), 93 deletions(-) diff --git a/charts/core/templates/admission-webhook-service.yaml b/charts/core/templates/admission-webhook-service.yaml index 8a0a76aa..0d92eec7 100644 --- a/charts/core/templates/admission-webhook-service.yaml +++ b/charts/core/templates/admission-webhook-service.yaml @@ -6,7 +6,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: ports: - port: 443 diff --git a/charts/core/templates/clusterrole.yaml b/charts/core/templates/clusterrole.yaml index cce7a825..54f33a90 100644 --- a/charts/core/templates/clusterrole.yaml +++ b/charts/core/templates/clusterrole.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - "" @@ -44,7 +44,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: {{- if .Values.openshift }} - apiGroups: @@ -83,7 +83,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - admissionregistration.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - config.openshift.io diff --git a/charts/core/templates/clusterrolebinding-least.yaml b/charts/core/templates/clusterrolebinding-least.yaml index 915c99b9..bcfca9a2 100644 --- a/charts/core/templates/clusterrolebinding-least.yaml +++ b/charts/core/templates/clusterrolebinding-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -134,7 +134,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/clusterrolebinding.yaml b/charts/core/templates/clusterrolebinding.yaml index 598151b0..7147a9ff 100644 --- a/charts/core/templates/clusterrolebinding.yaml +++ b/charts/core/templates/clusterrolebinding.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -108,7 +108,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -134,7 +134,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/controller-deployment.yaml b/charts/core/templates/controller-deployment.yaml index 01b0aa99..7a242770 100644 --- a/charts/core/templates/controller-deployment.yaml +++ b/charts/core/templates/controller-deployment.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm {{- with .Values.controller.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/core/templates/controller-ingress.yaml b/charts/core/templates/controller-ingress.yaml index b36fbbdc..1ea0cdce 100644 --- a/charts/core/templates/controller-ingress.yaml +++ b/charts/core/templates/controller-ingress.yaml @@ -13,7 +13,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.ingress.ingressClassName | quote }} @@ -50,7 +50,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.ingress.tls }} tls: @@ -85,7 +85,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.federation.mastersvc.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.federation.mastersvc.ingress.ingressClassName | quote }} @@ -123,7 +123,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.federation.mastersvc.ingress.tls }} tls: @@ -158,7 +158,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.federation.managedsvc.ingress.ingressClassName }} ingressClassName: {{ .Values.controller.federation.managedsvc.ingress.ingressClassName | quote }} @@ -196,7 +196,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.federation.managedsvc.ingress.tls }} tls: diff --git a/charts/core/templates/controller-route.yaml b/charts/core/templates/controller-route.yaml index 686a77ec..377917af 100644 --- a/charts/core/templates/controller-route.yaml +++ b/charts/core/templates/controller-route.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.apisvc.route.host }} host: {{ .Values.controller.apisvc.route.host }} @@ -45,7 +45,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.federation.mastersvc.route.host }} host: {{ .Values.controller.federation.mastersvc.route.host }} @@ -77,7 +77,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.controller.federation.managedsvc.route.host }} host: {{ .Values.controller.federation.managedsvc.route.host }} diff --git a/charts/core/templates/controller-service.yaml b/charts/core/templates/controller-service.yaml index d4040a78..e342a958 100644 --- a/charts/core/templates/controller-service.yaml +++ b/charts/core/templates/controller-service.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: clusterIP: None ports: @@ -36,7 +36,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: type: {{ .Values.controller.apisvc.type }} ports: @@ -60,7 +60,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: type: {{ .Values.controller.federation.mastersvc.type }} ports: @@ -84,7 +84,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: type: {{ .Values.controller.federation.managedsvc.type }} ports: diff --git a/charts/core/templates/crd-role-least.yaml b/charts/core/templates/crd-role-least.yaml index 219c2622..428bc31d 100644 --- a/charts/core/templates/crd-role-least.yaml +++ b/charts/core/templates/crd-role-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - apiextensions.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -75,7 +75,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -103,7 +103,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -135,7 +135,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -162,7 +162,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -189,7 +189,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -221,7 +221,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -253,7 +253,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -280,7 +280,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/crd-role.yaml b/charts/core/templates/crd-role.yaml index 6a366133..77d175e1 100644 --- a/charts/core/templates/crd-role.yaml +++ b/charts/core/templates/crd-role.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - apiextensions.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -75,7 +75,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -103,7 +103,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -135,7 +135,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -162,7 +162,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -189,7 +189,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -221,7 +221,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -253,7 +253,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - neuvector.com @@ -280,7 +280,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/crd.yaml b/charts/core/templates/crd.yaml index 60640ce8..675bb9e8 100644 --- a/charts/core/templates/crd.yaml +++ b/charts/core/templates/crd.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: group: neuvector.com names: @@ -278,7 +278,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: group: neuvector.com names: @@ -544,7 +544,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: group: neuvector.com names: @@ -630,7 +630,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: group: neuvector.com names: @@ -749,7 +749,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: group: neuvector.com names: @@ -832,7 +832,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: ports: - port: 443 diff --git a/charts/core/templates/csp-clusterrole.yaml b/charts/core/templates/csp-clusterrole.yaml index 717a03dc..5e5dea5c 100644 --- a/charts/core/templates/csp-clusterrole.yaml +++ b/charts/core/templates/csp-clusterrole.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - susecloud.net @@ -41,7 +41,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - susecloud.net diff --git a/charts/core/templates/csp-clusterrolebinding.yaml b/charts/core/templates/csp-clusterrolebinding.yaml index fa2f6227..244e7b43 100644 --- a/charts/core/templates/csp-clusterrolebinding.yaml +++ b/charts/core/templates/csp-clusterrolebinding.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/csp-crd.yaml b/charts/core/templates/csp-crd.yaml index 9263bc38..a0ddf655 100644 --- a/charts/core/templates/csp-crd.yaml +++ b/charts/core/templates/csp-crd.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: group: susecloud.net names: diff --git a/charts/core/templates/csp-deployment.yaml b/charts/core/templates/csp-deployment.yaml index eae91b16..dd1d8467 100644 --- a/charts/core/templates/csp-deployment.yaml +++ b/charts/core/templates/csp-deployment.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm {{- with .Values.global.aws.annotations }} annotations: {{ toYaml . | indent 4 }} diff --git a/charts/core/templates/csp-role.yaml b/charts/core/templates/csp-role.yaml index f70c3adb..573cab68 100644 --- a/charts/core/templates/csp-role.yaml +++ b/charts/core/templates/csp-role.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - "" diff --git a/charts/core/templates/csp-rolebinding.yaml b/charts/core/templates/csp-rolebinding.yaml index be2d402d..946b2c52 100644 --- a/charts/core/templates/csp-rolebinding.yaml +++ b/charts/core/templates/csp-rolebinding.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/charts/core/templates/csp-serviceaccount.yaml b/charts/core/templates/csp-serviceaccount.yaml index e17d0290..0f777c2b 100644 --- a/charts/core/templates/csp-serviceaccount.yaml +++ b/charts/core/templates/csp-serviceaccount.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm annotations: {{- if .Values.global.aws.enabled }} eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.global.aws.accountNumber }}:role/{{ .Values.global.aws.roleName }} diff --git a/charts/core/templates/enforcer-daemonset.yaml b/charts/core/templates/enforcer-daemonset.yaml index f046ca52..dcac4266 100644 --- a/charts/core/templates/enforcer-daemonset.yaml +++ b/charts/core/templates/enforcer-daemonset.yaml @@ -10,7 +10,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: Helm release: {{ .Release.Name }} spec: updateStrategy: {{- toYaml .Values.enforcer.updateStrategy | nindent 4 }} diff --git a/charts/core/templates/init-configmap.yaml b/charts/core/templates/init-configmap.yaml index 5cc1bb5c..1300794a 100644 --- a/charts/core/templates/init-configmap.yaml +++ b/charts/core/templates/init-configmap.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm data: {{ toYaml .Values.controller.configmap.data | indent 2 }} {{- end }} diff --git a/charts/core/templates/init-secret.yaml b/charts/core/templates/init-secret.yaml index 8a508140..d4bfca59 100644 --- a/charts/core/templates/init-secret.yaml +++ b/charts/core/templates/init-secret.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm data: {{- range $key, $val := .Values.controller.secret.data }} {{ $key }}: | {{ toYaml $val | b64enc | nindent 4 }} diff --git a/charts/core/templates/manager-deployment.yaml b/charts/core/templates/manager-deployment.yaml index 0defb0f4..e4dca15d 100644 --- a/charts/core/templates/manager-deployment.yaml +++ b/charts/core/templates/manager-deployment.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: replicas: 1 selector: diff --git a/charts/core/templates/manager-ingress.yaml b/charts/core/templates/manager-ingress.yaml index d6e2e335..52826fc5 100644 --- a/charts/core/templates/manager-ingress.yaml +++ b/charts/core/templates/manager-ingress.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.manager.ingress.ingressClassName }} ingressClassName: {{ .Values.manager.ingress.ingressClassName | quote }} @@ -49,7 +49,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.manager.ingress.tls }} tls: diff --git a/charts/core/templates/manager-route.yaml b/charts/core/templates/manager-route.yaml index 784a4ae2..77262d5b 100644 --- a/charts/core/templates/manager-route.yaml +++ b/charts/core/templates/manager-route.yaml @@ -12,7 +12,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.manager.route.host }} host: {{ .Values.manager.route.host }} diff --git a/charts/core/templates/manager-service.yaml b/charts/core/templates/manager-service.yaml index e18e55c3..ab6e6597 100644 --- a/charts/core/templates/manager-service.yaml +++ b/charts/core/templates/manager-service.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: type: {{ .Values.manager.svc.type }} {{- if and .Values.manager.svc.loadBalancerIP (eq .Values.manager.svc.type "LoadBalancer") }} diff --git a/charts/core/templates/psp.yaml b/charts/core/templates/psp.yaml index 96c46771..9f1f16f3 100644 --- a/charts/core/templates/psp.yaml +++ b/charts/core/templates/psp.yaml @@ -7,7 +7,7 @@ metadata: seccomp.security.alpha.kubernetes.io/allowedProfileNames: '*' labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: Helm release: {{ .Release.Name }} spec: privileged: true @@ -44,7 +44,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: Helm release: {{ .Release.Name }} rules: - apiGroups: @@ -64,7 +64,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: Helm release: {{ .Release.Name }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/core/templates/pvc.yaml b/charts/core/templates/pvc.yaml index 3821d048..b7e97e7d 100644 --- a/charts/core/templates/pvc.yaml +++ b/charts/core/templates/pvc.yaml @@ -8,7 +8,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: accessModes: {{ toYaml .Values.controller.pvc.accessModes | indent 4 }} diff --git a/charts/core/templates/registry-adapter-ingress.yaml b/charts/core/templates/registry-adapter-ingress.yaml index 22c7244a..aec7161c 100644 --- a/charts/core/templates/registry-adapter-ingress.yaml +++ b/charts/core/templates/registry-adapter-ingress.yaml @@ -14,7 +14,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.cve.adapter.ingress.ingressClassName }} ingressClassName: {{ .Values.cve.adapter.ingress.ingressClassName | quote }} @@ -51,7 +51,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.cve.adapter.ingress.tls }} tls: @@ -87,7 +87,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: {{- if .Values.cve.adapter.route.host }} host: {{ .Values.cve.adapter.route.host }} diff --git a/charts/core/templates/registry-adapter.yaml b/charts/core/templates/registry-adapter.yaml index 60828150..276f8bf5 100644 --- a/charts/core/templates/registry-adapter.yaml +++ b/charts/core/templates/registry-adapter.yaml @@ -11,7 +11,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: replicas: 1 selector: @@ -172,7 +172,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: type: {{ .Values.cve.adapter.svc.type }} {{- if and .Values.cve.adapter.svc.loadBalancerIP (eq .Values.cve.adapter.svc.type "LoadBalancer") }} diff --git a/charts/core/templates/role-least.yaml b/charts/core/templates/role-least.yaml index b6324d73..85202c9b 100644 --- a/charts/core/templates/role-least.yaml +++ b/charts/core/templates/role-least.yaml @@ -15,7 +15,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm rules: - apiGroups: - apps diff --git a/charts/core/templates/rolebinding-least.yaml b/charts/core/templates/rolebinding-least.yaml index 163a0530..4f19b62f 100644 --- a/charts/core/templates/rolebinding-least.yaml +++ b/charts/core/templates/rolebinding-least.yaml @@ -16,7 +16,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -46,7 +46,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/rolebinding.yaml b/charts/core/templates/rolebinding.yaml index 257c35c9..c2fa8503 100644 --- a/charts/core/templates/rolebinding.yaml +++ b/charts/core/templates/rolebinding.yaml @@ -16,7 +16,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: {{- if not $oc3 }} apiGroup: rbac.authorization.k8s.io @@ -43,7 +43,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/core/templates/scanner-deployment.yaml b/charts/core/templates/scanner-deployment.yaml index e93756f7..473c90fe 100644 --- a/charts/core/templates/scanner-deployment.yaml +++ b/charts/core/templates/scanner-deployment.yaml @@ -10,7 +10,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: chart: {{ template "neuvector.chart" . }} - heritage: {{ .Release.Service }} + heritage: Helm release: {{ .Release.Name }} spec: strategy: diff --git a/charts/core/templates/serviceaccount-least.yaml b/charts/core/templates/serviceaccount-least.yaml index 9d728abe..38723220 100644 --- a/charts/core/templates/serviceaccount-least.yaml +++ b/charts/core/templates/serviceaccount-least.yaml @@ -7,7 +7,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm --- @@ -19,7 +19,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm --- @@ -31,7 +31,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm --- @@ -43,5 +43,5 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm {{- end }} diff --git a/charts/core/templates/serviceaccount.yaml b/charts/core/templates/serviceaccount.yaml index 595914ca..46a3027c 100644 --- a/charts/core/templates/serviceaccount.yaml +++ b/charts/core/templates/serviceaccount.yaml @@ -8,6 +8,6 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm {{- end }} {{- end }} diff --git a/charts/core/templates/updater-cronjob.yaml b/charts/core/templates/updater-cronjob.yaml index f1d1d46c..65c84b3f 100644 --- a/charts/core/templates/updater-cronjob.yaml +++ b/charts/core/templates/updater-cronjob.yaml @@ -13,7 +13,7 @@ metadata: labels: chart: {{ template "neuvector.chart" . }} release: {{ .Release.Name }} - heritage: {{ .Release.Service }} + heritage: Helm spec: schedule: {{ .Values.cve.updater.schedule | quote }} jobTemplate: