Skip to content

Commit 3216a7c

Browse files
committed
Add ofen-daemon resources: create ClusterRole, ClusterRoleBinding, DaemonSet, and ServiceAccount; update values.yaml for service account and image configurations
Signed-off-by: zeroalphat <taichi-takemura@cybozu.co.jp>
1 parent 8fa3d59 commit 3216a7c

File tree

6 files changed

+37
-41
lines changed

6 files changed

+37
-41
lines changed

charts/ofen/templates/ofend/clusterrole.yaml renamed to charts/ofen/templates/ofen-daemon/clusterrole.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
name: ofend
6-
labels:
7-
app.kubernetes.io/part-of: ofend
5+
name: {{ template "ofen.fullname" . }}-daemon-clusterrole
86
rules:
97
- apiGroups:
108
- ""

charts/ofen/templates/ofend/clusterrole_binding.yaml renamed to charts/ofen/templates/ofen-daemon/clusterrole_binding.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4-
name: ofend
5-
labels:
6-
app.kubernetes.io/part-of: ofend
4+
name: {{ template "ofen.fullname" . }}-daemon-clusterrolebinding
75
roleRef:
86
apiGroup: rbac.authorization.k8s.io
97
kind: ClusterRole
10-
name: ofend
8+
name: {{ template "ofen.fullname" . }}-daemon-clusterrole
119
subjects:
1210
- kind: ServiceAccount
1311
name: {{ .Values.serviceAccount.ofend.name }}

charts/ofen/templates/ofend/daemonset.yaml renamed to charts/ofen/templates/ofen-daemon/daemonset.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
apiVersion: apps/v1
22
kind: DaemonSet
33
metadata:
4-
name: ofend
4+
name: ofend-daemon
55
namespace: {{ .Release.Namespace }}
66
labels:
7-
app.kubernetes.io/part-of: ofen
8-
app.kubernetes.io/name: ofend
7+
app.kubernetes.io/component: daemon
8+
app.kubernetes.io/name: {{ include "ofen.name" . }}-daemon
99
{{- include "ofen.labels" . | nindent 4 }}
1010
spec:
1111
selector:
1212
matchLabels:
13-
app.kubernetes.io/part-of: ofen
14-
app.kubernetes.io/name: ofend
13+
app.kubernetes.io/component: daemon
14+
app.kubernetes.io/name: {{ include "ofen.name" . }}-daemon
1515
template:
1616
metadata:
1717
labels:
18-
app.kubernetes.io/part-of: ofen
19-
app.kubernetes.io/name: ofend
18+
app.kubernetes.io/component: daemon
19+
app.kubernetes.io/name: {{ include "ofen.name" . }}-daemon
2020
spec:
2121
containers:
2222
- name: ofend
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
labels:
5+
{{- include "ofen.labels" . | nindent 4 }}
6+
name: {{ .Values.serviceAccount.daemon.name }}
7+
namespace: {{ .Release.Namespace }}

charts/ofen/templates/ofend/service_account.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

charts/ofen/values.yaml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ controller:
77
replicas: 2
88

99
image:
10-
# image.repository -- ofen-controller image repository to use.
10+
# controller.image.repository -- ofen-controller image repository to use.
1111
repository: ghcr.io/cybozu-go/ofen
1212

13-
# image.pullPolicy -- ofen-controller image pulling policy.
13+
# controller.image.pullPolicy -- ofen-controller image pulling policy.
1414
pullPolicy: IfNotPresent
1515

16-
# image.tag -- ofen-controller image tag to use.
16+
# controller.image.tag -- ofen-controller image tag to use.
1717
# @default -- `{{ .Chart.AppVersion }}`
1818
tag: # 0.1.0
1919

20-
# imagePullSecrets -- Secrets for pulling ofen-controller image from private repository.
20+
# controller.imagePullSecrets -- Secrets for pulling ofen-controller image from private repository.
2121
imagePullSecrets: []
2222

23-
# controller.resources -- Specify resources.
23+
# controller.resources -- Resource requests and limits for the ofen-controller deployment.
2424
resources:
2525
requests:
2626
cpu: 100m
@@ -31,42 +31,43 @@ controller:
3131

3232
daemon:
3333
image:
34-
# image.repository -- ofend image repository to use.
34+
# daemon.image.repository -- ofen-daemon image repository to use.
3535
repository: ghcr.io/cybozu-go/ofend
3636

37-
# image.pullPolicy -- ofend image pulling policy.
37+
# daemon.image.pullPolicy -- ofen-daemon image pulling policy.
3838
pullPolicy: IfNotPresent
3939

40-
# image.tag -- ofend image tag to use.
40+
# daemon.image.tag -- ofen-daemon image tag to use.
4141
# @default -- `{{ .Chart.AppVersion }}`
4242
tag: # 0.1.0
4343

44-
# imagePullSecrets -- Secrets for pulling ofend image from private repository.
44+
# daemon.imagePullSecrets -- Secrets for pulling ofen-daemon image from private repository.
4545
imagePullSecrets: []
4646

47-
# resources -- resources used by ofend.
47+
# daemon.resources -- resources used by ofen-daemon.
4848
resources:
4949
requests:
5050
cpu: 100m
5151
memory: 20Mi
5252

53-
# extraArgs -- Additional command line flags to pass to ofend binary.
53+
# daemon.extraArgs -- Additional command line flags to pass to ofen-daemon binary.
5454
extraArgs: []
55-
56-
# containerdSockPath -- Path to the containerd socket.
55+
56+
# daemon.containerdSockPath -- Path to the containerd socket.
5757
containerdSockPath: /run/containerd/containerd.sock
5858

59-
# containerdHostDirPath -- Path to the host directory for containerd.
59+
# daemon.containerdHostDirPath -- Path to the host directory for containerd.
6060
containerdHostDirPath: /etc/containerd/certs.d
6161

6262
serviceAccount:
6363
controller:
64-
# serviceAccount.ofen.name -- Name of the ServiceAccount for ofen-controller.
64+
# serviceAccount.controller.name -- Name of the ServiceAccount for ofen-controller.
6565
name: ofen-controller
6666

67-
ofend:
68-
# serviceAccount.ofend.name -- Name of the ServiceAccount for ofend DaemonSet
69-
name: ofend-daemon
67+
daemon:
68+
# serviceAccount.daemon.name -- Name of the ServiceAccount for ofen-daemon DaemonSet
69+
name: ofen-daemon
7070

7171
vap:
72-
enabled: true
72+
# vap.enabled -- Enable ValidatingAdmissionPolicy for enhanced security.
73+
enabled: false

0 commit comments

Comments
 (0)