diff --git a/chart/.snapshots/default.yaml b/chart/.snapshots/default.yaml index ccc0bf4b..78f6dcbe 100644 --- a/chart/.snapshots/default.yaml +++ b/chart/.snapshots/default.yaml @@ -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: + - --feature-gates=RecoverVolumeExpansionFailure=false volumeMounts: - name: socket-dir mountPath: /run/csi diff --git a/chart/.snapshots/example-prod.yaml b/chart/.snapshots/example-prod.yaml index 0acbf89c..44b2c75f 100644 --- a/chart/.snapshots/example-prod.yaml +++ b/chart/.snapshots/example-prod.yaml @@ -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: @@ -393,6 +393,7 @@ spec: cpu: 10m memory: 20Mi args: + - --feature-gates=RecoverVolumeExpansionFailure=false - --leader-election - --leader-election-namespace=kube-system volumeMounts: diff --git a/chart/.snapshots/full.yaml b/chart/.snapshots/full.yaml index b0d3b0ce..0183acc4 100644 --- a/chart/.snapshots/full.yaml +++ b/chart/.snapshots/full.yaml @@ -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: @@ -515,6 +515,7 @@ spec: cpu: 12m memory: 22Mi args: + - --feature-gates=RecoverVolumeExpansionFailure=false - --leader-election - --leader-election-namespace=namespace-override volumeMounts: diff --git a/chart/templates/controller/deployment.yaml b/chart/templates/controller/deployment.yaml index b8bf966e..a7b52d08 100644 --- a/chart/templates/controller/deployment.yaml +++ b/chart/templates/controller/deployment.yaml @@ -1,4 +1,5 @@ {{ $enableLeaderElection := gt (int .Values.controller.replicaCount) 1 }} +{{ $isKubeVersionBelow132 := semverCompare "<1.32-0" .Capabilities.KubeVersion.Version }} apiVersion: apps/v1 kind: Deployment @@ -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}} diff --git a/chart/values.yaml b/chart/values.yaml index 36342062..459ba3dc 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -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 diff --git a/deploy/kubernetes/hcloud-csi.yml b/deploy/kubernetes/hcloud-csi.yml index 55bd4f35..0640e7e8 100644 --- a/deploy/kubernetes/hcloud-csi.yml +++ b/deploy/kubernetes/hcloud-csi.yml @@ -323,11 +323,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: + - --feature-gates=RecoverVolumeExpansionFailure=false volumeMounts: - name: socket-dir mountPath: /run/csi diff --git a/hack/update-deployment-yamls.sh b/hack/update-deployment-yamls.sh index dbf7914a..f939e152 100755 --- a/hack/update-deployment-yamls.sh +++ b/hack/update-deployment-yamls.sh @@ -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 \ diff --git a/hack/update-helm-snapshots.sh b/hack/update-helm-snapshots.sh index de2865da..b7a1f0db 100755 --- a/hack/update-helm-snapshots.sh +++ b/hack/update-helm-snapshots.sh @@ -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 \ diff --git a/skaffold.yaml b/skaffold.yaml index b9831bae..b471ed8c 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -12,7 +12,7 @@ build: insecureRegistries: - localhost:30666 -manifests: +deploy: helm: releases: - name: hcloud-csi