flexvolume-dir.patch

diff --git a/pkg/operator/ceph/agent/agent.go b/pkg/operator/ceph/agent/agent.go
index 7a8a468a..cfd94c98 100644
--- a/pkg/operator/ceph/agent/agent.go
+++ b/pkg/operator/ceph/agent/agent.go
@@ -38,7 +38,7 @@ const (
 	flexvolumePathDirEnv               = "FLEXVOLUME_DIR_PATH"
 	libModulesPathDirEnv               = "LIB_MODULES_DIR_PATH"
 	agentMountsEnv                     = "AGENT_MOUNTS"
-	flexvolumeDefaultDirPath           = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/"
+	flexvolumeDefaultDirPath           = "/var/lib/kubelet/volumeplugins"
 	agentDaemonsetPriorityClassNameEnv = "AGENT_PRIORITY_CLASS_NAME"
 	agentDaemonsetTolerationEnv        = "AGENT_TOLERATION"
 	agentDaemonsetTolerationKeyEnv     = "AGENT_TOLERATION_KEY"
Accepting request 733252 from home:blgardner:branches:filesystems:ceph ------------ - Use lightweight git tags when determining Rook version from source in tarball script + Build should now be tagged appropriately as version 1.1.1.0 instead of 1.1.0.x - Override some Rook defaults with linker flags at build time: + CSI image -> SUSE image + FlexVolume dir (for Kubic) - Add patches for: + updating CSI image to a dummy value later changed at linker time + updating CSI template paths to the ones installed by rook-k8s-manifests + update the FlexVolume dir path to be compatible with Kubic - Remove previously applied SUSE-specific changes that are now taken care of by the above patches OBS-URL: https://build.opensuse.org/request/show/733252 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/rook?expand=0&rev=45 2019-09-26 06:21:57 +00:00			`diff --git a/pkg/operator/ceph/agent/agent.go b/pkg/operator/ceph/agent/agent.go`
Accepting request 758629 from home:KGronlund:branches:filesystems:ceph Update to v1.2.0 OBS-URL: https://build.opensuse.org/request/show/758629 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/rook?expand=0&rev=61 2019-12-20 19:14:40 +00:00			`index 7a8a468a..cfd94c98 100644`
Accepting request 733252 from home:blgardner:branches:filesystems:ceph ------------ - Use lightweight git tags when determining Rook version from source in tarball script + Build should now be tagged appropriately as version 1.1.1.0 instead of 1.1.0.x - Override some Rook defaults with linker flags at build time: + CSI image -> SUSE image + FlexVolume dir (for Kubic) - Add patches for: + updating CSI image to a dummy value later changed at linker time + updating CSI template paths to the ones installed by rook-k8s-manifests + update the FlexVolume dir path to be compatible with Kubic - Remove previously applied SUSE-specific changes that are now taken care of by the above patches OBS-URL: https://build.opensuse.org/request/show/733252 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/rook?expand=0&rev=45 2019-09-26 06:21:57 +00:00			`--- a/pkg/operator/ceph/agent/agent.go`
			`+++ b/pkg/operator/ceph/agent/agent.go`
			`@@ -38,7 +38,7 @@ const (`
Accepting request 758629 from home:KGronlund:branches:filesystems:ceph Update to v1.2.0 OBS-URL: https://build.opensuse.org/request/show/758629 OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/rook?expand=0&rev=61 2019-12-20 19:14:40 +00:00			`flexvolumePathDirEnv = "FLEXVOLUME_DIR_PATH"`
			`libModulesPathDirEnv = "LIB_MODULES_DIR_PATH"`
			`agentMountsEnv = "AGENT_MOUNTS"`
			`- flexvolumeDefaultDirPath = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/"`
			`+ flexvolumeDefaultDirPath = "/var/lib/kubelet/volumeplugins"`
			`agentDaemonsetPriorityClassNameEnv = "AGENT_PRIORITY_CLASS_NAME"`
			`agentDaemonsetTolerationEnv = "AGENT_TOLERATION"`
			`agentDaemonsetTolerationKeyEnv = "AGENT_TOLERATION_KEY"`