Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update registry.k8s.io/sig-storage/csi-resizer docker tag to v1.13.1 #847

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

deps: update registry.k8s.io/sig-storage/csi-resizer docker tag to v1.13.1 #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6476348
deps: update registry.k8s.io/sig-storage/csi-resizer docker tag to v1…
renovate[bot] Jan 14, 2025
225d1ed
fix(helm-chart): incompatible default feature gate
lukasmetzner Jan 28, 2025
c4429ac
fix(helm-charts): updated snapshots
lukasmetzner Jan 28, 2025
640b700
fix(helm-chart): fix linting errors
lukasmetzner Jan 28, 2025
f56bdc8
fix(helm-chart): render args empty if no condition applies
lukasmetzner Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion chart/.snapshots/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,13 @@ spec:
mountPath: /run/csi

- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
imagePullPolicy: IfNotPresent
resources:
limits: {}
requests: {}
args:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This causes an issue, you need to make sure that it uses an empty array if nothing is defined, pretty sure we have an example for this between HCCM and csi-driver.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solved it by adding the args key depending if either leading election is enabled or if the feature gate should be disabled.

- -feature-gates=RecoverVolumeExpansionFailure=false
volumeMounts:
- name: socket-dir
mountPath: /run/csi
Expand Down
3 changes: 2 additions & 1 deletion chart/.snapshots/example-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ spec:
mountPath: /run/csi

- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
imagePullPolicy: IfNotPresent
resources:
limits:
Expand All @@ -393,6 +393,7 @@ spec:
cpu: 10m
memory: 20Mi
args:
- -feature-gates=RecoverVolumeExpansionFailure=false
- --leader-election
- --leader-election-namespace=kube-system
volumeMounts:
Expand Down
3 changes: 2 additions & 1 deletion chart/.snapshots/full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ spec:
mountPath: /run/csi

- name: csi-resizer
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
imagePullPolicy: Always
resources:
limits:
Expand All @@ -515,6 +515,7 @@ spec:
cpu: 12m
memory: 22Mi
args:
- -feature-gates=RecoverVolumeExpansionFailure=false
- --leader-election
- --leader-election-namespace=namespace-override
volumeMounts:
Expand Down
8 changes: 7 additions & 1 deletion chart/templates/controller/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ $enableLeaderElection := gt (int .Values.controller.replicaCount) 1 }}
{{ $isKubeVersionBelow132 := semverCompare "<1.32-0" .Capabilities.KubeVersion.Version }}

apiVersion: apps/v1
kind: Deployment
Expand Down Expand Up @@ -94,8 +95,13 @@ spec:
{{- if .Values.controller.resources.csiResizer }}
resources: {{- toYaml .Values.controller.resources.csiResizer | nindent 12 }}
{{- end }}
{{- if $enableLeaderElection }}
{{- if or $isKubeVersionBelow132 $enableLeaderElection }}
args:
{{- end }}
{{- if $isKubeVersionBelow132 }}
- -feature-gates=RecoverVolumeExpansionFailure=false
{{- end }}
{{- if $enableLeaderElection }}
- --leader-election
- --leader-election-namespace={{ include "common.names.namespace" . }}
{{- end}}
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ controller:

csiResizer:
name: registry.k8s.io/sig-storage/csi-resizer
tag: v1.12.0 # renovate: datasource=docker depName=registry.k8s.io/sig-storage/csi-resizer
tag: v1.13.1 # renovate: datasource=docker depName=registry.k8s.io/sig-storage/csi-resizer
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
4 changes: 3 additions & 1 deletion deploy/kubernetes/hcloud-csi.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion hack/update-deployment-yamls.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -ueo pipefail

# Template the chart with pre-built values to get the legacy deployment files
# Also remove labels that are Helm specific
helm template hcloud-csi chart \
helm template --kube-version v1.31.4 hcloud-csi chart \
--namespace kube-system \
--set metrics.enabled=true \
--set controller.matchLabelsOverride.app=hcloud-csi-controller \
Expand Down
6 changes: 3 additions & 3 deletions hack/update-helm-snapshots.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#!/usr/bin/env bash
set -ueo pipefail

helm template hcloud-csi chart \
helm template --kube-version v1.31.4 hcloud-csi chart \
--namespace kube-system |
grep -v helm.sh/chart \
> chart/.snapshots/default.yaml

helm template hcloud-csi chart \
helm template --kube-version v1.31.4 hcloud-csi chart \
--namespace kube-system \
-f chart/example-prod.values.yaml |
grep -v helm.sh/chart \
> chart/.snapshots/example-prod.yaml

helm template hcloud-csi chart \
helm template --kube-version v1.31.4 hcloud-csi chart \
--namespace kube-system \
-f chart/.snapshots/full.values.yaml |
grep -v helm.sh/chart \
Expand Down
2 changes: 1 addition & 1 deletion skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
insecureRegistries:
- localhost:30666

manifests:
deploy:
helm:
releases:
- name: hcloud-csi
Expand Down