rebased

openshift · Dec 17, 2021 · 1be9100 · 1be9100
1 parent 2b93e01
commit 1be9100
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -9,7 +9,6 @@ rules:
 - apiGroups:
   - apps
   resources:
-  - deployments
   - daemonsets
   verbs:
   - create
@@ -18,6 +17,17 @@ rules:
   - list
   - update
   - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - lvm.topolvm.io
   resources:

diff --git a/controllers/topolvm_node.go b/controllers/topolvm_node.go
@@ -130,8 +130,8 @@ func getNodeDaemonSet(lvmCluster *lvmv1alpha1.LVMCluster) *v1.DaemonSet {
 				EmptyDir: &corev1.EmptyDirVolumeSource{Medium: storageMedium}}},
 	}
 
-	iContainers := []corev1.Container{*getInitContainer()}
-	containers := []corev1.Container{*getLvmdContainer(), *getNodeContainer(), *getCsiRegistrarContainer(), *getLivenessProbeContainer()}
+	iContainers := []corev1.Container{*getNodeInitContainer()}
+	containers := []corev1.Container{*getLvmdContainer(), *getNodeContainer(), *getCsiRegistrarContainer(), *getNodeLivenessProbeContainer()}
 
 	// Affinity and tolerations
 	nodeSelector, tolerations := extractNodeSelectorAndTolerations(*lvmCluster)
@@ -182,7 +182,7 @@ func getNodeDaemonSet(lvmCluster *lvmv1alpha1.LVMCluster) *v1.DaemonSet {
 
 	return nodeDaemonSet
 }
-func getInitContainer() *corev1.Container {
+func getNodeInitContainer() *corev1.Container {
 	command := []string{
 		"sh",
 		"-c",
@@ -331,7 +331,7 @@ func getCsiRegistrarContainer() *corev1.Container {
 	return csiRegistrar
 }
 
-func getLivenessProbeContainer() *corev1.Container {
+func getNodeLivenessProbeContainer() *corev1.Container {
 	command := []string{
 		"/livenessprobe",
 		"--csi-address=/run/topolvm/csi-topolvm.sock",