Skip to content

Commit ddf580e

Browse files
SkalaNetworksSkalaNetworks
committed
feat(helm): new chart design
1 parent b197ad3 commit ddf580e

32 files changed

+714
-3025
lines changed

‎charts/kube-ovn/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 1.13.0
18+
version: 2.0.0
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

‎charts/kube-ovn/templates/_helpers.tpl

+56
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,59 @@
1+
{/*
2+
Expand the name of the chart.
3+
*/}}
4+
{{- define "kubeovn.name" -}}
5+
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
6+
{{- end }}
7+
8+
{{/*
9+
Create a default fully qualified app name.
10+
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
11+
If release name contains chart name it will be used as a full name.
12+
*/}}
13+
{{- define "kubeovn.fullname" -}}
14+
{{- if .Values.fullnameOverride }}
15+
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
16+
{{- else }}
17+
{{- $name := default .Chart.Name .Values.nameOverride }}
18+
{{- if contains $name .Release.Name }}
19+
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
20+
{{- else }}
21+
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
22+
{{- end }}
23+
{{- end }}
24+
{{- end }}
25+
26+
{{/*
27+
Create chart name and version as used by the chart label.
28+
*/}}
29+
{{- define "kubeovn.chart" -}}
30+
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
31+
{{- end }}
32+
33+
{{/*
34+
Common labels
35+
*/}}
36+
{{- define "kubeovn.labels" -}}
37+
helm.sh/chart: {{ include "kubeovn.chart" . }}
38+
{{- if .Chart.AppVersion }}
39+
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
40+
{{- end }}
41+
app.kubernetes.io/managed-by: {{ .Release.Service }}
42+
{{- end }}
43+
44+
45+
{{/*
46+
Create the name of the service account to use
47+
*/}}
48+
{{- define "kubeovn.serviceAccountName" -}}
49+
{{- if .Values.serviceAccount.create }}
50+
{{- default (include "kubeovn.fullname" .) .Values.serviceAccount.name }}
51+
{{- else }}
52+
{{- default "default" .Values.serviceAccount.name }}
53+
{{- end }}
54+
{{- end }}
55+
56+
157
{{/*
258
Get IP-addresses of master nodes
359
*/}}

‎charts/kube-ovn/templates/agent/agent-clusterrole.yaml

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRole
4+
metadata:
5+
annotations:
6+
rbac.authorization.k8s.io/system-only: "true"
7+
{{- with .Values.agent.annotations }}
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
10+
{{- with .Values.agent.labels }}
11+
labels:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
14+
name: system:kube-ovn-cni
15+
rules:
16+
- apiGroups:
17+
- "kubeovn.io"
18+
resources:
19+
- subnets
20+
- vlans
21+
- provider-networks
22+
verbs:
23+
- get
24+
- list
25+
- watch
26+
- apiGroups:
27+
- ""
28+
- "kubeovn.io"
29+
resources:
30+
- ovn-eips
31+
- ovn-eips/status
32+
- nodes
33+
- pods
34+
verbs:
35+
- get
36+
- list
37+
- patch
38+
- watch
39+
- apiGroups:
40+
- "kubeovn.io"
41+
resources:
42+
- ips
43+
verbs:
44+
- get
45+
- update
46+
- apiGroups:
47+
- ""
48+
resources:
49+
- events
50+
verbs:
51+
- create
52+
- patch
53+
- update
54+
- apiGroups:
55+
- ""
56+
resources:
57+
- configmaps
58+
verbs:
59+
- get
60+
- list
61+
- watch
62+
- apiGroups:
63+
- authentication.k8s.io
64+
resources:
65+
- tokenreviews
66+
verbs:
67+
- create
68+
- apiGroups:
69+
- authorization.k8s.io
70+
resources:
71+
- subjectaccessreviews
72+
verbs:
73+
- create
74+
- apiGroups:
75+
- "certificates.k8s.io"
76+
resources:
77+
- "certificatesigningrequests"
78+
verbs:
79+
- "create"
80+
- "get"
81+
- "list"
82+
- "watch"
83+
- "delete"
84+
- apiGroups:
85+
- ""
86+
resources:
87+
- "secrets"
88+
verbs:
89+
- "get"

‎charts/kube-ovn/templates/agent/agent-clusterrolebinding.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: ClusterRoleBinding
4+
metadata:
5+
name: kube-ovn-cni
6+
{{- with .Values.agent.annotations }}
7+
annotations:
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
10+
{{- with .Values.agent.labels }}
11+
labels:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
14+
roleRef:
15+
name: system:kube-ovn-cni
16+
kind: ClusterRole
17+
apiGroup: rbac.authorization.k8s.io
18+
subjects:
19+
- kind: ServiceAccount
20+
name: kube-ovn-cni
21+
namespace: {{ .Values.namespace }}

‎charts/kube-ovn/templates/ovncni-ds.yaml ‎charts/kube-ovn/templates/agent/agent-daemonset.yaml

+22-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
1-
kind: DaemonSet
21
apiVersion: apps/v1
2+
kind: DaemonSet
33
metadata:
44
name: kube-ovn-cni
55
namespace: {{ .Values.namespace }}
6+
{{- with .Values.agent.annotations }}
67
annotations:
7-
kubernetes.io/description: |
8-
This daemon set launches the kube-ovn cni daemon.
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
10+
{{- with .Values.agent.labels }}
11+
labels:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
914
spec:
1015
selector:
1116
matchLabels:
12-
app: kube-ovn-cni
17+
app.kubernetes.io/name: kube-ovn-cni
18+
app.kubernetes.io/part-of: kube-ovn
1319
template:
1420
metadata:
21+
{{- with .Values.agent.podAnnotations }}
22+
annotations:
23+
{{- toYaml . | nindent 8 }}
24+
{{- end }}
1525
labels:
16-
app: kube-ovn-cni
17-
component: network
18-
type: infra
26+
app.kubernetes.io/name: kube-ovn-cni
27+
app.kubernetes.io/part-of: kube-ovn
28+
{{- with .Values.agent.podLabels }}
29+
{{- toYaml . | nindent 8 }}
30+
{{- end }}
1931
spec:
2032
tolerations:
2133
- effect: NoSchedule
@@ -216,13 +228,10 @@ spec:
216228
- --port=10665
217229
- --tls={{- .Values.func.SECURE_SERVING }}
218230
timeoutSeconds: 5
231+
{{- with .Values.agent.resources }}
219232
resources:
220-
requests:
221-
cpu: {{ index .Values "kube-ovn-cni" "requests" "cpu" }}
222-
memory: {{ index .Values "kube-ovn-cni" "requests" "memory" }}
223-
limits:
224-
cpu: {{ index .Values "kube-ovn-cni" "limits" "cpu" }}
225-
memory: {{ index .Values "kube-ovn-cni" "limits" "memory" }}
233+
{{- toYaml . | trim | nindent 10 }}
234+
{{- end }}
226235
nodeSelector:
227236
kubernetes.io/os: "linux"
228237
volumes:

‎charts/kube-ovn/templates/agent/agent-rolebinding.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
apiVersion: rbac.authorization.k8s.io/v1
3+
kind: RoleBinding
4+
metadata:
5+
name: kube-ovn-cni
6+
namespace: {{ .Values.namespace }}
7+
{{- with .Values.agent.annotations }}
8+
annotations:
9+
{{- toYaml . | nindent 4 }}
10+
{{- end }}
11+
{{- with .Values.agent.labels }}
12+
labels:
13+
{{- toYaml . | nindent 4 }}
14+
{{- end }}
15+
roleRef:
16+
apiGroup: rbac.authorization.k8s.io
17+
kind: Role
18+
name: extension-apiserver-authentication-reader
19+
subjects:
20+
- kind: ServiceAccount
21+
name: kube-ovn-cni
22+
namespace: {{ .Values.namespace }}

‎charts/kube-ovn/templates/agent/agent-service.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
kind: Service
2+
apiVersion: v1
3+
metadata:
4+
name: kube-ovn-cni
5+
namespace: {{ .Values.namespace }}
6+
{{- with .Values.agent.annotations }}
7+
annotations:
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
10+
{{- with .Values.agent.labels }}
11+
labels:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
14+
spec:
15+
selector:
16+
app.kubernetes.io/name: kube-ovn-cni
17+
app.kubernetes.io/part-of: kube-ovn
18+
ports:
19+
- port: {{ .Values.agent.metrics.port }}
20+
name: metrics
21+
{{- if eq .Values.networking.NET_STACK "dual_stack" }}
22+
ipFamilyPolicy: PreferDualStack
23+
{{- end }}

‎charts/kube-ovn/templates/agent/agent-serviceaccount.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: kube-ovn-cni
6+
namespace: {{ .Values.namespace }}
7+
{{- with .Values.agent.annotations }}
8+
annotations:
9+
{{- toYaml . | nindent 4 }}
10+
{{- end }}
11+
{{- with .Values.agent.labels }}
12+
labels:
13+
{{- toYaml . | nindent 4 }}
14+
{{- end }}

‎charts/kube-ovn/templates/central-deploy.yaml ‎charts/kube-ovn/templates/central/central-deployment.yaml

+22-14
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ kind: Deployment
22
apiVersion: apps/v1
33
metadata:
44
name: ovn-central
5-
namespace: {{ .Values.namespace }}
5+
{{- with .Values.central.annotations }}
66
annotations:
7-
kubernetes.io/description: |
8-
OVN components: northd, nb and sb.
7+
{{- toYaml . | nindent 4 }}
8+
{{- end }}
9+
{{- with .Values.central.labels }}
10+
labels:
11+
{{- toYaml . | nindent 4 }}
12+
{{- end }}
913
spec:
1014
replicas: {{ include "kubeovn.nodeCount" . }}
1115
strategy:
@@ -15,13 +19,20 @@ spec:
1519
type: RollingUpdate
1620
selector:
1721
matchLabels:
18-
app: ovn-central
22+
app.kubernetes.io/name: ovn-central
23+
app.kubernetes.io/part-of: kube-ovn
1924
template:
2025
metadata:
26+
{{- with .Values.central.podAnnotations }}
27+
annotations:
28+
{{- toYaml . | nindent 8 }}
29+
{{- end }}
2130
labels:
22-
app: ovn-central
23-
component: network
24-
type: infra
31+
app.kubernetes.io/name: ovn-central
32+
app.kubernetes.io/part-of: kube-ovn
33+
{{- with .Values.central.podLabels }}
34+
{{- toYaml . | nindent 8 }}
35+
{{- end }}
2536
spec:
2637
tolerations:
2738
- effect: NoSchedule
@@ -35,7 +46,7 @@ spec:
3546
requiredDuringSchedulingIgnoredDuringExecution:
3647
- labelSelector:
3748
matchLabels:
38-
app: ovn-central
49+
app.kubernetes.io/name: ovn-central
3950
topologyKey: kubernetes.io/hostname
4051
priorityClassName: system-cluster-critical
4152
serviceAccountName: ovn-ovs
@@ -111,13 +122,10 @@ spec:
111122
value: "{{ .Values.networking.ENABLE_COMPACT }}"
112123
- name: OVN_VERSION_COMPATIBILITY
113124
value: '{{ include "kubeovn.ovn.versionCompatibility" . }}'
125+
{{- with .Values.central.resources }}
114126
resources:
115-
requests:
116-
cpu: {{ index .Values "ovn-central" "requests" "cpu" }}
117-
memory: {{ index .Values "ovn-central" "requests" "memory" }}
118-
limits:
119-
cpu: {{ index .Values "ovn-central" "limits" "cpu" }}
120-
memory: {{ index .Values "ovn-central" "limits" "memory" }}
127+
{{- toYaml . | trim | nindent 12 }}
128+
{{- end }}
121129
volumeMounts:
122130
- mountPath: /var/run/ovn
123131
name: host-run-ovn

‎charts/kube-ovn/templates/nb-svc.yaml ‎charts/kube-ovn/templates/central/northbound-service.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ apiVersion: v1
33
metadata:
44
name: ovn-nb
55
namespace: {{ .Values.namespace }}
6+
{{- with .Values.central.annotations }}
7+
annotations:
8+
{{- toYaml . | nindent 4 }}
9+
{{- end }}
10+
{{- with .Values.central.labels }}
11+
labels:
12+
{{- toYaml . | nindent 4 }}
13+
{{- end }}
614
spec:
715
ports:
816
- name: ovn-nb
@@ -14,6 +22,7 @@ spec:
1422
ipFamilyPolicy: PreferDualStack
1523
{{- end }}
1624
selector:
17-
app: ovn-central
25+
app.kubernetes.io/name: ovn-central
26+
app.kubernetes.io/part-of: kube-ovn
1827
ovn-nb-leader: "true"
1928
sessionAffinity: None

0 commit comments

Comments
 (0)