Skip to content

Commit ad2bfba

Browse files
authored
Merge pull request #353 from mauriciopoppe/chart-update
Use latest image in daemonset, add node selector for Windows
2 parents 80b6d87 + 6631e94 commit ad2bfba

24 files changed

+745
-639
lines changed

helm/README.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,21 @@ helm upgrade ./helm/provisioner -f <path-to-your-values-file> <release-name>
110110

111111
### helm version >= v3.0.0
112112

113-
Install via helm template:
113+
Install by adding the repo as a Helm repo:
114+
115+
```sh
116+
helm repo add sig-storage-local-static-provisioner https://kubernetes-sigs.github.io/sig-storage-local-static-provisioner
117+
helm template --debug sig-storage-local-static-provisioner/local-static-provisioner --version <version> --namespace <namespace> > local-volume-provisioner.generated.yaml
118+
# edit local-volume-provisioner.generated.yaml if necessary
119+
kubectl create -f local-volume-provisioner.generated.yaml
120+
```
121+
122+
Or install by cloning the repo locally:
114123

115124
```console
116125
git clone --depth=1 https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner.git
117126
helm template -f <path-to-your-values-file> <release-name> --namespace <namespace> ./helm/provisioner > local-volume-provisioner.generated.yaml
118-
edit local-volume-provisioner.generated.yaml if necessary
127+
# edit local-volume-provisioner.generated.yaml if necessary
119128
kubectl create -f local-volume-provisioner.generated.yaml
120129
```
121130

helm/generated_examples/baremetal-affinity.yaml

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
---
2-
# Source: provisioner/templates/serviceaccount.yaml
2+
# Source: local-static-provisioner/templates/serviceaccount.yaml
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:
66
name: local-static-provisioner
77
namespace: default
88
labels:
9-
helm.sh/chart: provisioner-2.6.0-alpha.1
10-
app.kubernetes.io/name: provisioner
9+
helm.sh/chart: local-static-provisioner-1.0.0
10+
app.kubernetes.io/name: local-static-provisioner
1111
app.kubernetes.io/managed-by: Helm
1212
app.kubernetes.io/instance: local-static-provisioner
1313
---
14-
# Source: provisioner/templates/configmap.yaml
14+
# Source: local-static-provisioner/templates/configmap.yaml
1515
apiVersion: v1
1616
kind: ConfigMap
1717
metadata:
1818
name: local-static-provisioner-config
1919
namespace: default
2020
labels:
21-
helm.sh/chart: provisioner-2.6.0-alpha.1
22-
app.kubernetes.io/name: provisioner
21+
helm.sh/chart: local-static-provisioner-1.0.0
22+
app.kubernetes.io/name: local-static-provisioner
2323
app.kubernetes.io/managed-by: Helm
2424
app.kubernetes.io/instance: local-static-provisioner
2525
data:
@@ -32,28 +32,28 @@ data:
3232
- "2"
3333
volumeMode: Block
3434
---
35-
# Source: provisioner/templates/storageclass.yaml
35+
# Source: local-static-provisioner/templates/storageclass.yaml
3636
apiVersion: storage.k8s.io/v1
3737
kind: StorageClass
3838
metadata:
3939
name: local-storage
4040
labels:
41-
helm.sh/chart: provisioner-2.6.0-alpha.1
42-
app.kubernetes.io/name: provisioner
41+
helm.sh/chart: local-static-provisioner-1.0.0
42+
app.kubernetes.io/name: local-static-provisioner
4343
app.kubernetes.io/managed-by: Helm
4444
app.kubernetes.io/instance: local-static-provisioner
4545
provisioner: kubernetes.io/no-provisioner
4646
volumeBindingMode: WaitForFirstConsumer
4747
reclaimPolicy: Delete
4848
---
49-
# Source: provisioner/templates/rbac.yaml
49+
# Source: local-static-provisioner/templates/rbac.yaml
5050
apiVersion: rbac.authorization.k8s.io/v1
5151
kind: ClusterRole
5252
metadata:
5353
name: local-static-provisioner-node-clusterrole
5454
labels:
55-
helm.sh/chart: provisioner-2.6.0-alpha.1
56-
app.kubernetes.io/name: provisioner
55+
helm.sh/chart: local-static-provisioner-1.0.0
56+
app.kubernetes.io/name: local-static-provisioner
5757
app.kubernetes.io/managed-by: Helm
5858
app.kubernetes.io/instance: local-static-provisioner
5959
rules:
@@ -73,14 +73,14 @@ rules:
7373
resources: ["nodes"]
7474
verbs: ["get"]
7575
---
76-
# Source: provisioner/templates/rbac.yaml
76+
# Source: local-static-provisioner/templates/rbac.yaml
7777
apiVersion: rbac.authorization.k8s.io/v1
7878
kind: ClusterRoleBinding
7979
metadata:
8080
name: local-static-provisioner-node-binding
8181
labels:
82-
helm.sh/chart: provisioner-2.6.0-alpha.1
83-
app.kubernetes.io/name: provisioner
82+
helm.sh/chart: local-static-provisioner-1.0.0
83+
app.kubernetes.io/name: local-static-provisioner
8484
app.kubernetes.io/managed-by: Helm
8585
app.kubernetes.io/instance: local-static-provisioner
8686
subjects:
@@ -92,29 +92,29 @@ roleRef:
9292
name: local-static-provisioner-node-clusterrole
9393
apiGroup: rbac.authorization.k8s.io
9494
---
95-
# Source: provisioner/templates/daemonset_linux.yaml
95+
# Source: local-static-provisioner/templates/daemonset_linux.yaml
9696
apiVersion: apps/v1
9797
kind: DaemonSet
9898
metadata:
9999
name: local-static-provisioner
100100
namespace: default
101101
labels:
102-
helm.sh/chart: provisioner-2.6.0-alpha.1
103-
app.kubernetes.io/name: provisioner
102+
helm.sh/chart: local-static-provisioner-1.0.0
103+
app.kubernetes.io/name: local-static-provisioner
104104
app.kubernetes.io/managed-by: Helm
105105
app.kubernetes.io/instance: local-static-provisioner
106106
spec:
107107
selector:
108108
matchLabels:
109-
app.kubernetes.io/name: provisioner
109+
app.kubernetes.io/name: local-static-provisioner
110110
app.kubernetes.io/instance: local-static-provisioner
111111
template:
112112
metadata:
113113
labels:
114-
app.kubernetes.io/name: provisioner
114+
app.kubernetes.io/name: local-static-provisioner
115115
app.kubernetes.io/instance: local-static-provisioner
116116
annotations:
117-
checksum/config: 49fd0db6c0e3bc6c0607d6f94132b4bd3a4b7445efd977e564038e93320045cf
117+
checksum/config: 26ec1983f036e7702e8b97e6294f51995f9e78c8bb812e7ca5468a45a2df2a04
118118
spec:
119119
serviceAccountName: local-static-provisioner
120120
nodeSelector:
@@ -131,7 +131,7 @@ spec:
131131
- localssd
132132
containers:
133133
- name: provisioner
134-
image: k8s.gcr.io/sig-storage/local-volume-provisioner:v2.4.0
134+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
135135
securityContext:
136136
privileged: true
137137
env:
@@ -144,7 +144,7 @@ spec:
144144
fieldRef:
145145
fieldPath: metadata.namespace
146146
- name: JOB_CONTAINER_IMAGE
147-
value: k8s.gcr.io/sig-storage/local-volume-provisioner:v2.4.0
147+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
148148
ports:
149149
- name: metrics
150150
containerPort: 8080
@@ -168,29 +168,29 @@ spec:
168168
hostPath:
169169
path: /mnt/disks
170170
---
171-
# Source: provisioner/templates/daemonset_windows.yaml
171+
# Source: local-static-provisioner/templates/daemonset_windows.yaml
172172
apiVersion: apps/v1
173173
kind: DaemonSet
174174
metadata:
175175
name: local-static-provisioner-win
176176
namespace: default
177177
labels:
178-
helm.sh/chart: provisioner-2.6.0-alpha.1
179-
app.kubernetes.io/name: provisioner
178+
helm.sh/chart: local-static-provisioner-1.0.0
179+
app.kubernetes.io/name: local-static-provisioner
180180
app.kubernetes.io/managed-by: Helm
181181
app.kubernetes.io/instance: local-static-provisioner
182182
spec:
183183
selector:
184184
matchLabels:
185-
app.kubernetes.io/name: provisioner
185+
app.kubernetes.io/name: local-static-provisioner
186186
app.kubernetes.io/instance: local-static-provisioner
187187
template:
188188
metadata:
189189
labels:
190-
app.kubernetes.io/name: provisioner
190+
app.kubernetes.io/name: local-static-provisioner
191191
app.kubernetes.io/instance: local-static-provisioner
192192
annotations:
193-
checksum/config: 49fd0db6c0e3bc6c0607d6f94132b4bd3a4b7445efd977e564038e93320045cf
193+
checksum/config: 26ec1983f036e7702e8b97e6294f51995f9e78c8bb812e7ca5468a45a2df2a04
194194
spec:
195195
serviceAccountName: local-static-provisioner
196196
nodeSelector:
@@ -211,7 +211,7 @@ spec:
211211
- localssd
212212
containers:
213213
- name: provisioner
214-
image: k8s.gcr.io/sig-storage/local-volume-provisioner:v2.4.0
214+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
215215
env:
216216
- name: MY_NODE_NAME
217217
valueFrom:
@@ -222,7 +222,7 @@ spec:
222222
fieldRef:
223223
fieldPath: metadata.namespace
224224
- name: JOB_CONTAINER_IMAGE
225-
value: k8s.gcr.io/sig-storage/local-volume-provisioner:v2.4.0
225+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
226226
ports:
227227
- name: metrics
228228
containerPort: 8080

0 commit comments

Comments
 (0)