Skip to content

NVSHAS-9748 [Helm] NV helm update for supporting name referral for common groups in CRD #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
venkateshjayagopal merged 1 commit into from
Mar 7, 2025
Merged

NVSHAS-9748 [Helm] NV helm update for supporting name referral for common groups in CRD #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions charts/core/templates/clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,31 @@ rules:

---

{{- if $oc3 }}
apiVersion: authorization.openshift.io/v1
{{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
apiVersion: rbac.authorization.k8s.io/v1
{{- else }}
apiVersion: v1
{{- end }}
kind: ClusterRole
metadata:
name: neuvector-binding-nvgroupdefinitions
labels:
chart: {{ template "neuvector.chart" . }}
release: {{ .Release.Name }}
rules:
- apiGroups:
- neuvector.com
resources:
- nvgroupdefinitions
verbs:
- get
- list
- delete

---

{{- if $oc4 }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
Expand Down
31 changes: 31 additions & 0 deletions charts/core/templates/crd-role-least.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,35 @@ userNames:
- system:serviceaccount:{{ .Release.Namespace }}:controller
{{- end }}

---

# ClusterRoleBinding for NeuVector to manage name referral for common groups
{{- if $oc3 }}
apiVersion: authorization.openshift.io/v1
{{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
apiVersion: rbac.authorization.k8s.io/v1
{{- else }}
apiVersion: v1
{{- end }}
kind: ClusterRoleBinding
metadata:
name: neuvector-binding-nvgroupdefinitions
labels:
chart: {{ template "neuvector.chart" . }}
release: {{ .Release.Name }}
roleRef:
{{- if not $oc3 }}
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
{{- end }}
name: neuvector-binding-nvgroupdefinitions
subjects:
- kind: ServiceAccount
name: controller
namespace: {{ .Release.Namespace }}
{{- if $oc3 }}
userNames:
- system:serviceaccount:{{ .Release.Namespace }}:controller
{{- end }}

{{- end }}
31 changes: 31 additions & 0 deletions charts/core/templates/crd-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,4 +400,35 @@ userNames:
- system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.serviceAccount }}
{{- end }}

---

# Clusterrolebinding for Neuvector to manage name referral for common groups
{{- if $oc3 }}
apiVersion: authorization.openshift.io/v1
{{- else if (semverCompare ">=1.8-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
apiVersion: rbac.authorization.k8s.io/v1
{{- else }}
apiVersion: v1
{{- end }}
kind: ClusterRoleBinding
metadata:
name: neuvector-binding-nvgroupdefinitions
labels:
chart: {{ template "neuvector.chart" . }}
release: {{ .Release.Name }}
roleRef:
{{- if not $oc3 }}
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
{{- end }}
name: neuvector-binding-nvgroupdefinitions
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount }}
namespace: {{ .Release.Namespace }}
{{- if $oc3 }}
userNames:
- system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.serviceAccount }}
{{- end }}

{{- end }}
71 changes: 71 additions & 0 deletions charts/core/templates/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -143,6 +145,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -218,6 +222,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
mon_metric:
Expand Down Expand Up @@ -351,6 +357,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -422,6 +430,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -497,6 +507,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
mon_metric:
Expand Down Expand Up @@ -974,4 +986,63 @@ spec:
type: object
type: object
{{- end }}
---
{{- if (semverCompare ">=1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
apiVersion: apiextensions.k8s.io/v1
{{- else }}
apiVersion: apiextensions.k8s.io/v1beta1
{{- end }}
kind: CustomResourceDefinition
metadata:
name: nvgroupdefinitions.neuvector.com
spec:
group: neuvector.com
names:
kind: NvGroupDefinition
listKind: NvGroupDefinitionList
plural: nvgroupdefinitions
singular: nvgroupdefinition
scope: Namespaced
{{- if (semverCompare "<1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
version: v1
{{- end }}
versions:
- name: v1
served: true
storage: true
{{- if (semverCompare ">=1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
schema:
openAPIV3Schema:
properties:
spec:
properties:
selector:
properties:
comment:
type: string
criteria:
items:
properties:
key:
type: string
op:
type: string
value:
type: string
required:
- key
- op
- value
type: object
type: array
name:
type: string
required:
- name
type: object
required:
- selector
type: object
type: object
{{- end }}
{{- end }}
71 changes: 71 additions & 0 deletions charts/crd/templates/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ spec:
type: string
original_name:
type: string
name_referral:
type: boolean
required:
- name
type: object
Expand Down Expand Up @@ -143,6 +145,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -218,6 +222,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
mon_metric:
Expand Down Expand Up @@ -352,6 +358,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -423,6 +431,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
required:
Expand Down Expand Up @@ -498,6 +508,8 @@ spec:
type: array
name:
type: string
name_referral:
type: boolean
original_name:
type: string
mon_metric:
Expand Down Expand Up @@ -980,3 +992,62 @@ spec:
type: object
type: object
{{- end }}
---
{{- if (semverCompare ">=1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
apiVersion: apiextensions.k8s.io/v1
{{- else }}
apiVersion: apiextensions.k8s.io/v1beta1
{{- end }}
kind: CustomResourceDefinition
metadata:
name: nvgroupdefinitions.neuvector.com
spec:
group: neuvector.com
names:
kind: NvGroupDefinition
listKind: NvGroupDefinitionList
plural: nvgroupdefinitions
singular: nvgroupdefinition
scope: Namespaced
{{- if (semverCompare "<1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
version: v1
{{- end }}
versions:
- name: v1
served: true
storage: true
{{- if (semverCompare ">=1.19-0" (substr 1 -1 .Capabilities.KubeVersion.GitVersion)) }}
schema:
openAPIV3Schema:
properties:
spec:
properties:
selector:
properties:
comment:
type: string
criteria:
items:
properties:
key:
type: string
op:
type: string
value:
type: string
required:
- key
- op
- value
type: object
type: array
name:
type: string
required:
- name
type: object
required:
- selector
type: object
type: object
{{- end }}
4 changes: 2 additions & 2 deletions test/crd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestCRD(t *testing.T) {
out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/crd.yaml"})
outs := splitYaml(out)

if len(outs) != 7 {
if len(outs) != 8 {
t.Errorf("Resource count is wrong. count=%v\n", len(outs))
}
}
Expand All @@ -33,7 +33,7 @@ func TestCoreCRD(t *testing.T) {
out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/crd.yaml"})
outs := splitYaml(out)

if len(outs) != 7 {
if len(outs) != 8 {
t.Errorf("Resource count is wrong. count=%v\n", len(outs))
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestClusterRole(t *testing.T) {
out := helm.RenderTemplate(t, options, helmChartPath, nvRel, []string{"templates/clusterrole.yaml"})
outs := splitYaml(out)

if len(outs) != 3 {
if len(outs) != 4 {
t.Errorf("Resource count is wrong. count=%v\n", len(outs))
}
}
Expand Down
Loading