Skip to content

Commit e556aef

Browse files
committed
zed-csi -> metal-csi
1 parent 5c3d054 commit e556aef

18 files changed

+96
-96
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 zed-csi
3+
Copyright (c) 2021 metal-csi
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Zed CSI Helm Chart
1+
# Metal CSI Helm Chart
22

33
TODO
File renamed without changes.

charts/metal-csi/Chart.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v2
2+
name: metal-csi
3+
description: CSI Driver for bare metal cluster storage
4+
5+
type: application
6+
version: '0.0.1-alpha22'
7+
appVersion: 'v0.0.1-alpha22'
File renamed without changes.

charts/zed-csi/templates/_helpers.tpl charts/metal-csi/templates/_helpers.tpl

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{{/*
22
Expand the name of the chart.
33
*/}}
4-
{{- define "zed-csi.name" -}}
4+
{{- define "metal-csi.name" -}}
55
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
66
{{- end }}
77

88
{{/*
99
Expand the name of the chart.
1010
*/}}
11-
{{- define "zed-csi.drivername" -}}
11+
{{- define "metal-csi.drivername" -}}
1212
{{- .Values.csidriver.name }}
1313
{{- end }}
1414

@@ -17,7 +17,7 @@ Create a default fully qualified app name.
1717
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1818
If release name contains chart name it will be used as a full name.
1919
*/}}
20-
{{- define "zed-csi.fullname" -}}
20+
{{- define "metal-csi.fullname" -}}
2121
{{- if .Values.fullnameOverride }}
2222
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
2323
{{- else }}
@@ -33,16 +33,16 @@ If release name contains chart name it will be used as a full name.
3333
{{/*
3434
Create chart name and version as used by the chart label.
3535
*/}}
36-
{{- define "zed-csi.chart" -}}
36+
{{- define "metal-csi.chart" -}}
3737
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
3838
{{- end }}
3939

4040
{{/*
4141
Common labels
4242
*/}}
43-
{{- define "zed-csi.labels" -}}
44-
helm.sh/chart: {{ include "zed-csi.chart" . }}
45-
{{ include "zed-csi.selectorLabels" . }}
43+
{{- define "metal-csi.labels" -}}
44+
helm.sh/chart: {{ include "metal-csi.chart" . }}
45+
{{ include "metal-csi.selectorLabels" . }}
4646
{{- if .Chart.AppVersion }}
4747
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
4848
{{- end }}
@@ -52,17 +52,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
5252
{{/*
5353
Selector labels
5454
*/}}
55-
{{- define "zed-csi.selectorLabels" -}}
56-
app.kubernetes.io/name: {{ include "zed-csi.name" . }}
55+
{{- define "metal-csi.selectorLabels" -}}
56+
app.kubernetes.io/name: {{ include "metal-csi.name" . }}
5757
app.kubernetes.io/instance: {{ .Release.Name }}
5858
{{- end }}
5959

6060
{{/*
6161
Create the name of the service account to use
6262
*/}}
63-
{{- define "zed-csi.serviceAccountName" -}}
63+
{{- define "metal-csi.serviceAccountName" -}}
6464
{{- if .Values.rbac.create }}
65-
{{- default (include "zed-csi.fullname" .) .Values.serviceAccount.name }}
65+
{{- default (include "metal-csi.fullname" .) .Values.serviceAccount.name }}
6666
{{- else }}
6767
{{- default "default" .Values.serviceAccount.name }}
6868
{{- end }}
@@ -71,9 +71,9 @@ Create the name of the service account to use
7171
{{/*
7272
Create the name of the service account to use
7373
*/}}
74-
{{- define "zed-csi.clusterRoleName" -}}
74+
{{- define "metal-csi.clusterRoleName" -}}
7575
{{- if .Values.rbac.create }}
76-
{{- default (include "zed-csi.fullname" .) .Values.clusterRole.name }}
76+
{{- default (include "metal-csi.fullname" .) .Values.clusterRole.name }}
7777
{{- else }}
7878
{{- default "default" .Values.clusterRole.name }}
7979
{{- end }}
@@ -82,15 +82,15 @@ Create the name of the service account to use
8282
{{/*
8383
Common arguments used for CSI helpers, such as node-driver-registrar
8484
*/}}
85-
{{- define "zed-csi.csiHelperArgs" -}}
85+
{{- define "metal-csi.csiHelperArgs" -}}
8686
- '--v=5'
8787
- '--csi-address=$(ADDRESS)'
8888
{{- end }}
8989

9090
{{/*
9191
Common arguments used for CSI helpers, such as node-driver-registrar
9292
*/}}
93-
{{- define "zed-csi.csiHelperLeaderArgs" -}}
93+
{{- define "metal-csi.csiHelperLeaderArgs" -}}
9494
- --leader-election
9595
- --leader-election-namespace={{ .Release.Namespace }}
9696
- --timeout=90s
@@ -99,7 +99,7 @@ Common arguments used for CSI helpers, such as node-driver-registrar
9999
{{/*
100100
Common env vars used for CSI helpers, such as node-driver-registrar
101101
*/}}
102-
{{- define "zed-csi.csiHelperEnv" -}}
102+
{{- define "metal-csi.csiHelperEnv" -}}
103103
- name: ADDRESS
104104
value: /plugin/csi.sock
105105
- name: KUBE_NODE_NAME
@@ -111,7 +111,7 @@ Common env vars used for CSI helpers, such as node-driver-registrar
111111
{{/*
112112
Common env vars used for CSI helpers, such as node-driver-registrar
113113
*/}}
114-
{{- define "zed-csi.csiControllerHelperEnv" -}}
114+
{{- define "metal-csi.csiControllerHelperEnv" -}}
115115
- name: ADDRESS
116116
value: /plugin/csi-controller.sock
117117
- name: KUBE_NODE_NAME
@@ -123,7 +123,7 @@ Common env vars used for CSI helpers, such as node-driver-registrar
123123
{{/*
124124
Common env vars used for CSI helpers, such as node-driver-registrar
125125
*/}}
126-
{{- define "zed-csi.csiHelperVolumeMounts" -}}
126+
{{- define "metal-csi.csiHelperVolumeMounts" -}}
127127
- name: plugin-dir
128128
mountPath: /plugin
129129
- name: registration-dir
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apiVersion: v1
22
kind: ConfigMap
33
metadata:
4-
name: {{ include "zed-csi.fullname" . }}
4+
name: {{ include "metal-csi.fullname" . }}
55
labels:
6-
{{- include "zed-csi.labels" . | nindent 4 }}
6+
{{- include "metal-csi.labels" . | nindent 4 }}
77
data:
88
{{- with .Values.config }}
9-
zed-csi.yml: |
9+
metal-csi.yml: |
1010
{{- toYaml . | nindent 4 }}
1111
{{- end }}

charts/zed-csi/templates/controller.yaml charts/metal-csi/templates/controller.yaml

+22-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ include "zed-csi.fullname" . }}-controller
4+
name: {{ include "metal-csi.fullname" . }}-controller
55
labels:
6-
{{- include "zed-csi.labels" . | nindent 4 }}
6+
{{- include "metal-csi.labels" . | nindent 4 }}
77
spec:
88
selector:
99
matchLabels:
10-
{{- include "zed-csi.selectorLabels" . | nindent 6 }}
10+
{{- include "metal-csi.selectorLabels" . | nindent 6 }}
1111
template:
1212
metadata:
1313
{{- with .Values.podAnnotations }}
1414
annotations:
1515
{{- toYaml . | nindent 8 }}
1616
{{- end }}
1717
labels:
18-
{{- include "zed-csi.selectorLabels" . | nindent 8 }}
18+
{{- include "metal-csi.selectorLabels" . | nindent 8 }}
1919

2020
spec:
2121
hostNetwork: true
22-
serviceAccountName: {{ include "zed-csi.serviceAccountName" . }}
22+
serviceAccountName: {{ include "metal-csi.serviceAccountName" . }}
2323

2424
{{- with .Values.nodeSelector }}
2525
nodeSelector:
@@ -40,30 +40,30 @@ spec:
4040
- name: csi-provisioner
4141
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
4242
args:
43-
{{- include "zed-csi.csiHelperArgs" . | nindent 12 }}
44-
{{- include "zed-csi.csiHelperLeaderArgs" . | nindent 12 }}
43+
{{- include "metal-csi.csiHelperArgs" . | nindent 12 }}
44+
{{- include "metal-csi.csiHelperLeaderArgs" . | nindent 12 }}
4545
- --extra-create-metadata
4646
- --volume-name-prefix
47-
- {{ include "zed-csi.drivername" . }}
47+
- {{ include "metal-csi.drivername" . }}
4848
env:
49-
{{- include "zed-csi.csiControllerHelperEnv" . | nindent 12 }}
49+
{{- include "metal-csi.csiControllerHelperEnv" . | nindent 12 }}
5050
volumeMounts:
51-
{{- include "zed-csi.csiHelperVolumeMounts" . | nindent 12 }}
51+
{{- include "metal-csi.csiHelperVolumeMounts" . | nindent 12 }}
5252

5353
- name: csi-attacher
5454
image: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0
5555
args:
56-
{{- include "zed-csi.csiHelperArgs" . | nindent 12 }}
57-
{{- include "zed-csi.csiHelperLeaderArgs" . | nindent 12 }}
56+
{{- include "metal-csi.csiHelperArgs" . | nindent 12 }}
57+
{{- include "metal-csi.csiHelperLeaderArgs" . | nindent 12 }}
5858
env:
59-
{{- include "zed-csi.csiControllerHelperEnv" . | nindent 12 }}
59+
{{- include "metal-csi.csiControllerHelperEnv" . | nindent 12 }}
6060
volumeMounts:
61-
{{- include "zed-csi.csiHelperVolumeMounts" . | nindent 12 }}
61+
{{- include "metal-csi.csiHelperVolumeMounts" . | nindent 12 }}
6262

63-
- name: zed-csi-controller
63+
- name: metal-csi-controller
6464
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
6565
imagePullPolicy: {{ .Values.image.pullPolicy }}
66-
args: [-l, debug, --node-id, $(KUBE_NODE_NAME), --csi-path, /plugin/csi-controller.sock, --csi-name, {{ include "zed-csi.drivername" . }}]
66+
args: [-l, debug, --node-id, $(KUBE_NODE_NAME), --csi-path, /plugin/csi-controller.sock, --csi-name, {{ include "metal-csi.drivername" . }}]
6767
env:
6868
- name: KUBE_NODE_NAME
6969
valueFrom:
@@ -83,14 +83,14 @@ spec:
8383
- name: pods-mount-dir
8484
mountPath: /var/lib/kubelet/pods
8585
mountPropagation: 'Bidirectional'
86-
- name: zed-csi-yml
87-
mountPath: /etc/zed-csi.yml
88-
subPath: zed-csi.yml
86+
- name: metal-csi-yml
87+
mountPath: /etc/metal-csi.yml
88+
subPath: metal-csi.yml
8989

9090
volumes:
9191
- name: plugin-dir
9292
hostPath:
93-
path: /var/lib/kubelet/plugins_registry/zed-csi
93+
path: /var/lib/kubelet/plugins_registry/metal-csi
9494
type: DirectoryOrCreate
9595

9696
- name: registration-dir
@@ -103,6 +103,6 @@ spec:
103103
path: /var/lib/kubelet/pods
104104
type: Directory
105105

106-
- name: zed-csi-yml
106+
- name: metal-csi-yml
107107
configMap:
108-
name: {{ include "zed-csi.fullname" . }}
108+
name: {{ include "metal-csi.fullname" . }}

charts/zed-csi/templates/csidriver.yaml charts/metal-csi/templates/csidriver.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: storage.k8s.io/v1
22
kind: CSIDriver
33
metadata:
4-
name: {{ include "zed-csi.drivername" . }}
4+
name: {{ include "metal-csi.drivername" . }}
55
labels:
6-
{{- include "zed-csi.labels" . | nindent 4 }}
6+
{{- include "metal-csi.labels" . | nindent 4 }}
77
spec:
88
attachRequired: true
99
podInfoOnMount: true

charts/zed-csi/templates/node.yaml charts/metal-csi/templates/node.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
apiVersion: apps/v1
22
kind: DaemonSet
33
metadata:
4-
name: {{ include "zed-csi.fullname" . }}-node
4+
name: {{ include "metal-csi.fullname" . }}-node
55
labels:
6-
{{- include "zed-csi.labels" . | nindent 4 }}
6+
{{- include "metal-csi.labels" . | nindent 4 }}
77
spec:
88
selector:
99
matchLabels:
10-
{{- include "zed-csi.selectorLabels" . | nindent 6 }}
10+
{{- include "metal-csi.selectorLabels" . | nindent 6 }}
1111
template:
1212
metadata:
1313
{{- with .Values.podAnnotations }}
1414
annotations:
1515
{{- toYaml . | nindent 8 }}
1616
{{- end }}
1717
labels:
18-
{{- include "zed-csi.selectorLabels" . | nindent 8 }}
18+
{{- include "metal-csi.selectorLabels" . | nindent 8 }}
1919

2020
spec:
2121
hostNetwork: true
22-
serviceAccountName: {{ include "zed-csi.serviceAccountName" . }}
22+
serviceAccountName: {{ include "metal-csi.serviceAccountName" . }}
2323

2424
{{- with .Values.nodeSelector }}
2525
nodeSelector:
@@ -40,17 +40,17 @@ spec:
4040
- name: csi-node-driver-registrar
4141
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
4242
args:
43-
{{- include "zed-csi.csiHelperArgs" . | nindent 12 }}
44-
- '--kubelet-registration-path=/var/lib/kubelet/plugins_registry/zed-csi/csi.sock'
43+
{{- include "metal-csi.csiHelperArgs" . | nindent 12 }}
44+
- '--kubelet-registration-path=/var/lib/kubelet/plugins_registry/metal-csi/csi.sock'
4545
env:
46-
{{- include "zed-csi.csiHelperEnv" . | nindent 12 }}
46+
{{- include "metal-csi.csiHelperEnv" . | nindent 12 }}
4747
volumeMounts:
48-
{{- include "zed-csi.csiHelperVolumeMounts" . | nindent 12 }}
48+
{{- include "metal-csi.csiHelperVolumeMounts" . | nindent 12 }}
4949

50-
- name: zed-csi-node
50+
- name: metal-csi-node
5151
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
5252
imagePullPolicy: {{ .Values.image.pullPolicy }}
53-
args: [-l, debug, --node-id, $(KUBE_NODE_NAME), --csi-path, /plugin/csi.sock, --csi-name, {{ include "zed-csi.drivername" . }}]
53+
args: [-l, debug, --node-id, $(KUBE_NODE_NAME), --csi-path, /plugin/csi.sock, --csi-name, {{ include "metal-csi.drivername" . }}]
5454
env:
5555
- name: KUBE_NODE_NAME
5656
valueFrom:
@@ -73,14 +73,14 @@ spec:
7373
- name: node-root
7474
mountPath: /node
7575
mountPropagation: 'Bidirectional'
76-
- name: zed-csi-yml
77-
mountPath: /etc/zed-csi.yml
78-
subPath: zed-csi.yml
76+
- name: metal-csi-yml
77+
mountPath: /etc/metal-csi.yml
78+
subPath: metal-csi.yml
7979

8080
volumes:
8181
- name: plugin-dir
8282
hostPath:
83-
path: /var/lib/kubelet/plugins_registry/zed-csi
83+
path: /var/lib/kubelet/plugins_registry/metal-csi
8484
type: DirectoryOrCreate
8585

8686
- name: registration-dir
@@ -98,6 +98,6 @@ spec:
9898
path: /
9999
type: Directory
100100

101-
- name: zed-csi-yml
101+
- name: metal-csi-yml
102102
configMap:
103-
name: {{ include "zed-csi.fullname" . }}
103+
name: {{ include "metal-csi.fullname" . }}

0 commit comments

Comments
 (0)