From 76e7ed6cb77e24b281906d299122cd2e30f16dbe Mon Sep 17 00:00:00 2001
From: ederst <stefan.prietl@bearingpoint.com>
Date: Mon, 27 Jun 2022 16:47:57 +0200
Subject: [PATCH] Use csi-snapshotter for OS only when the controller is
 enabled

---
 docs/releases/1.25-NOTES.md                              | 9 +++++++++
 .../k8s-1.16.yaml.template                               | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/docs/releases/1.25-NOTES.md b/docs/releases/1.25-NOTES.md
index 2bd86aa575..92e46d093f 100644
--- a/docs/releases/1.25-NOTES.md
+++ b/docs/releases/1.25-NOTES.md
@@ -12,6 +12,14 @@ This is a document to gather the release notes prior to the release.
 
 # Breaking changes
 
+## Cinder CSI snapthot controller changes
+
+The CSI Cinder plugin for OpenStack will now only use the CSI snapshotter when the CSI snapshot controller is enabled in the cluster spec.
+
+This changes the default behavior where the CSI snaphotter container was always present, but spammed the log with error messages (see [#13890](https://github.com/kubernetes/kops/pull/13890))
+
+So in case of manually deployed CRDs to make the snapshotter work it is now necessary to [enable the snapshot controller](https://kops.sigs.k8s.io/addons/#snapshot-controller).
+
 ## Other breaking changes
 
 * Support for Kubernetes version 1.19 has been removed.
@@ -26,4 +34,5 @@ This is a document to gather the release notes prior to the release.
 
 # Other changes of note
 
+
 # Full change list since 1.24.0 release
\ No newline at end of file
diff --git a/upup/models/cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template
index 5dd7c90492..eb5b839fec 100644
--- a/upup/models/cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template
+++ b/upup/models/cloudup/resources/addons/storage-openstack.addons.k8s.io/k8s-1.16.yaml.template
@@ -280,6 +280,7 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
+        {{ if HasSnapshotController }}
         - name: csi-snapshotter
           image: registry.k8s.io/sig-storage/csi-snapshotter:v5.0.1
           args:
@@ -294,6 +295,7 @@ spec:
           volumeMounts:
             - mountPath: /var/lib/csi/sockets/pluginproxy/
               name: socket-dir
+        {{ end }}
         - name: csi-resizer
           image: registry.k8s.io/sig-storage/csi-resizer:v1.4.0
           args: