Skip to content

Commit 6604f41

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #402 from mauriciopoppe/flatten-helm-values
Bump default helm chart image to v2.6.0
2 parents 9bbfe57 + c4d8521 commit 6604f41

23 files changed

+44
-43
lines changed

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/onsi/ginkgo/v2 v2.9.1
99
github.com/onsi/gomega v1.27.4
1010
github.com/prometheus/client_golang v1.14.0
11+
github.com/spf13/pflag v1.0.5
1112
golang.org/x/sys v0.6.0
1213
gopkg.in/yaml.v2 v2.4.0
1314
k8s.io/api v0.27.3
@@ -80,7 +81,6 @@ require (
8081
github.com/prometheus/common v0.37.0 // indirect
8182
github.com/prometheus/procfs v0.8.0 // indirect
8283
github.com/spf13/cobra v1.6.0 // indirect
83-
github.com/spf13/pflag v1.0.5 // indirect
8484
github.com/stoewer/go-strcase v1.2.0 // indirect
8585
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
8686
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
@@ -148,6 +148,7 @@ replace (
148148
k8s.io/controller-manager => k8s.io/controller-manager v0.27.3
149149
k8s.io/cri-api => k8s.io/cri-api v0.27.3
150150
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.3
151+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.27.3
151152
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.3
152153
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.3
153154
k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.3

‎helm/CHANGELOG.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
### Breaking changes
44

5-
- Helm Chart values flattened when possible (#393, @mauriciopoppe)
5+
- Helm Chart values flattened when possible ([#393](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner/pull/393), [@mauriciopoppe](https://github.com/mauriciopoppe))
66
- Flattened top level `common` dictionary, all the keys are now at the top level.
77
- Flattened top level `daemonset` dictionary, all the keys are now at the top level.
88
- `rbac.pspEnabled` removed
99
- `useAlphaAPI` removed
1010

1111
### Features
1212

13-
- Add enableWindows helm chart value to control the deployment of Windows manifests (#388, @jennwah)
14-
- Helm chart v1.0.0 uses registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
15-
Add field .Values.daemonset.nodeSelectorWindows to the helm chart. (#353, @mauriciopoppe)
13+
- Add enableWindows helm chart value to control the deployment of Windows manifests ([#388](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner/pull/388), [@jennwah](https://github.com/jennwah))
14+
- Add support for additional volumes ([#401](https://github.com/kubernetes-sigs/sig-storage-local-static-provisioner/pull/401), [@stevehipwell](https://github.com/stevehipwell))

‎helm/generated_examples/additional-volumes.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ spec:
122122
name: signal
123123
containers:
124124
- name: provisioner
125-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
125+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
126126
securityContext:
127127
privileged: true
128128
env:
@@ -135,7 +135,7 @@ spec:
135135
fieldRef:
136136
fieldPath: metadata.namespace
137137
- name: JOB_CONTAINER_IMAGE
138-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
138+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
139139
ports:
140140
- name: metrics
141141
containerPort: 8080

‎helm/generated_examples/baremetal-affinity.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ spec:
131131
- localssd
132132
containers:
133133
- name: provisioner
134-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
134+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.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: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
147+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
148148
ports:
149149
- name: metrics
150150
containerPort: 8080

‎helm/generated_examples/baremetal-cleanbyjobs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ spec:
160160
kubernetes.io/os: linux
161161
containers:
162162
- name: provisioner
163-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
163+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
164164
securityContext:
165165
privileged: true
166166
env:
@@ -173,7 +173,7 @@ spec:
173173
fieldRef:
174174
fieldPath: metadata.namespace
175175
- name: JOB_CONTAINER_IMAGE
176-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
176+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
177177
ports:
178178
- name: metrics
179179
containerPort: 8080

‎helm/generated_examples/baremetal-default-storage.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ spec:
120120
kubernetes.io/os: linux
121121
containers:
122122
- name: provisioner
123-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
123+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
124124
securityContext:
125125
privileged: true
126126
env:
@@ -133,7 +133,7 @@ spec:
133133
fieldRef:
134134
fieldPath: metadata.namespace
135135
- name: JOB_CONTAINER_IMAGE
136-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
136+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
137137
ports:
138138
- name: metrics
139139
containerPort: 8080

‎helm/generated_examples/baremetal-nodeselector.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ spec:
123123
localVolume: present
124124
containers:
125125
- name: provisioner
126-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
126+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
127127
securityContext:
128128
privileged: true
129129
env:
@@ -136,7 +136,7 @@ spec:
136136
fieldRef:
137137
fieldPath: metadata.namespace
138138
- name: JOB_CONTAINER_IMAGE
139-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
139+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
140140
ports:
141141
- name: metrics
142142
containerPort: 8080

‎helm/generated_examples/baremetal-priority-critical.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ spec:
122122
kubernetes.io/os: linux
123123
containers:
124124
- name: provisioner
125-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
125+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
126126
securityContext:
127127
privileged: true
128128
env:
@@ -135,7 +135,7 @@ spec:
135135
fieldRef:
136136
fieldPath: metadata.namespace
137137
- name: JOB_CONTAINER_IMAGE
138-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
138+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
139139
ports:
140140
- name: metrics
141141
containerPort: 8080

‎helm/generated_examples/baremetal-priority-noncritical.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ spec:
122122
kubernetes.io/os: linux
123123
containers:
124124
- name: provisioner
125-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
125+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
126126
securityContext:
127127
privileged: true
128128
env:
@@ -135,7 +135,7 @@ spec:
135135
fieldRef:
136136
fieldPath: metadata.namespace
137137
- name: JOB_CONTAINER_IMAGE
138-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
138+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
139139
ports:
140140
- name: metrics
141141
containerPort: 8080

‎helm/generated_examples/baremetal-prometheus.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ spec:
142142
kubernetes.io/os: linux
143143
containers:
144144
- name: provisioner
145-
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
145+
image: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
146146
securityContext:
147147
privileged: true
148148
env:
@@ -155,7 +155,7 @@ spec:
155155
fieldRef:
156156
fieldPath: metadata.namespace
157157
- name: JOB_CONTAINER_IMAGE
158-
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.5.0
158+
value: registry.k8s.io/sig-storage/local-volume-provisioner:v2.6.0
159159
ports:
160160
- name: metrics
161161
containerPort: 8080

0 commit comments

Comments
 (0)