Skip to content

Commit e7a32d1

Browse files
committed
Respect fullnameOverride in Helm chart
1 parent 678eb86 commit e7a32d1

File tree

2 files changed

+39
-9
lines changed

2 files changed

+39
-9
lines changed

deploy/helm/templates/static-resources.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ServiceAccount
33
metadata:
44
labels:
55
app: '{{.Release.Name}}'
6-
name: security-profiles-operator
6+
name: '{{ include "security-profiles-operator.name" . }}'
77
namespace: '{{ .Release.Namespace }}'
88
---
99
apiVersion: v1
@@ -27,7 +27,7 @@ kind: ClusterRole
2727
metadata:
2828
labels:
2929
app: '{{.Release.Name}}'
30-
name: security-profiles-operator
30+
name: '{{ include "security-profiles-operator.name" . }}'
3131
rules:
3232
- apiGroups:
3333
- ""
@@ -219,7 +219,7 @@ kind: Role
219219
metadata:
220220
labels:
221221
app: '{{.Release.Name}}'
222-
name: security-profiles-operator
222+
name: '{{ include "security-profiles-operator.name" . }}'
223223
namespace: '{{ .Release.Namespace }}'
224224
rules:
225225
- apiGroups:
@@ -456,30 +456,30 @@ kind: ClusterRoleBinding
456456
metadata:
457457
labels:
458458
app: '{{.Release.Name}}'
459-
name: security-profiles-operator
459+
name: '{{ include "security-profiles-operator.name" . }}'
460460
roleRef:
461461
apiGroup: rbac.authorization.k8s.io
462462
kind: ClusterRole
463-
name: security-profiles-operator
463+
name: '{{ include "security-profiles-operator.name" . }}'
464464
subjects:
465465
- kind: ServiceAccount
466-
name: security-profiles-operator
466+
name: '{{ include "security-profiles-operator.name" . }}'
467467
namespace: '{{ .Release.Namespace }}'
468468
---
469469
apiVersion: rbac.authorization.k8s.io/v1
470470
kind: RoleBinding
471471
metadata:
472472
labels:
473473
app: '{{.Release.Name}}'
474-
name: security-profiles-operator
474+
name: '{{ include "security-profiles-operator.name" . }}'
475475
namespace: '{{ .Release.Namespace }}'
476476
roleRef:
477477
apiGroup: rbac.authorization.k8s.io
478478
kind: Role
479-
name: security-profiles-operator
479+
name: '{{ include "security-profiles-operator.name" . }}'
480480
subjects:
481481
- kind: ServiceAccount
482-
name: security-profiles-operator
482+
name: '{{ include "security-profiles-operator.name" . }}'
483483
namespace: '{{ .Release.Namespace }}'
484484
---
485485
apiVersion: rbac.authorization.k8s.io/v1

deploy/overlays/helm/kustomization.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,36 @@ patches:
3939
kind: Deployment
4040
name: security-profiles-operator-webhook
4141

42+
# Respect fullnameOverride
43+
- target: { name: security-profiles-operator }
44+
patch: |
45+
- op: replace
46+
path: /metadata/name
47+
value: '{{ include "security-profiles-operator.name" . }}'
48+
- target: { name: security-profiles-operator-webhook }
49+
patch: |
50+
- op: replace
51+
path: /metadata/name
52+
value: &name '{{ include "security-profiles-operator.name" . }}-webhook'
53+
- op: replace
54+
path: /spec/template/metadata/labels/name
55+
value: *name
56+
- op: replace
57+
path: /spec/selector/matchLabels/name
58+
value: *name
59+
- target: { kind: Deployment, name: security-profiles-operator }
60+
patch: |
61+
- op: replace
62+
path: /spec/template/metadata/labels/name
63+
value: &name '{{ include "security-profiles-operator.name" . }}'
64+
- op: replace
65+
path: /spec/selector/matchLabels/name
66+
value: *name
67+
- target: { name: webhook-service }
68+
patch: |
69+
- op: replace
70+
path: /spec/selector/name
71+
value: '{{ include "security-profiles-operator.name" . }}-webhook'
4272
4373
# Remove the namespace resource.
4474
- path: delete-ns.yaml

0 commit comments

Comments
 (0)