From 6e2a4143c7a684d27db226c390dec838eea2f976 Mon Sep 17 00:00:00 2001 From: dkokkino Date: Thu, 20 Mar 2025 16:31:06 +0100 Subject: [PATCH] Enable required driver services -Previously the service was enabled for both the node and controller simultaneously. This change makes sure the node-service is enabled on nodes and vise versa for the controller --- .../openstack-manila/generated/hypershift/controller.yaml | 2 ++ assets/overlays/openstack-manila/generated/hypershift/node.yaml | 2 ++ .../openstack-manila/generated/standalone/controller.yaml | 2 ++ assets/overlays/openstack-manila/generated/standalone/node.yaml | 2 ++ .../openstack-manila/patches/controller_add_driver.yaml | 2 ++ assets/overlays/openstack-manila/patches/node_add_driver.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/assets/overlays/openstack-manila/generated/hypershift/controller.yaml b/assets/overlays/openstack-manila/generated/hypershift/controller.yaml index b222e7521..df3960a3a 100644 --- a/assets/overlays/openstack-manila/generated/hypershift/controller.yaml +++ b/assets/overlays/openstack-manila/generated/hypershift/controller.yaml @@ -89,6 +89,8 @@ spec: weight: 100 containers: - args: + - --provide-controller-service=true + - --provide-node-service=false - --v=${LOG_LEVEL} - --cluster-id=${CLUSTER_ID} - --nodeid=$(NODE_ID) diff --git a/assets/overlays/openstack-manila/generated/hypershift/node.yaml b/assets/overlays/openstack-manila/generated/hypershift/node.yaml index 28a3c7082..d7671f157 100644 --- a/assets/overlays/openstack-manila/generated/hypershift/node.yaml +++ b/assets/overlays/openstack-manila/generated/hypershift/node.yaml @@ -35,6 +35,8 @@ spec: spec: containers: - args: + - --provide-controller-service=false + - --provide-node-service=true - --v=${LOG_LEVEL} - --nodeid=$(NODE_ID) - --endpoint=$(CSI_ENDPOINT) diff --git a/assets/overlays/openstack-manila/generated/standalone/controller.yaml b/assets/overlays/openstack-manila/generated/standalone/controller.yaml index 0eef2b9b7..1edf22690 100644 --- a/assets/overlays/openstack-manila/generated/standalone/controller.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/controller.yaml @@ -59,6 +59,8 @@ spec: weight: 100 containers: - args: + - --provide-controller-service=true + - --provide-node-service=false - --v=${LOG_LEVEL} - --cluster-id=${CLUSTER_ID} - --nodeid=$(NODE_ID) diff --git a/assets/overlays/openstack-manila/generated/standalone/node.yaml b/assets/overlays/openstack-manila/generated/standalone/node.yaml index 28a3c7082..d7671f157 100644 --- a/assets/overlays/openstack-manila/generated/standalone/node.yaml +++ b/assets/overlays/openstack-manila/generated/standalone/node.yaml @@ -35,6 +35,8 @@ spec: spec: containers: - args: + - --provide-controller-service=false + - --provide-node-service=true - --v=${LOG_LEVEL} - --nodeid=$(NODE_ID) - --endpoint=$(CSI_ENDPOINT) diff --git a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml index 7ace7bb27..81fd7dfb1 100644 --- a/assets/overlays/openstack-manila/patches/controller_add_driver.yaml +++ b/assets/overlays/openstack-manila/patches/controller_add_driver.yaml @@ -38,6 +38,8 @@ spec: image: ${DRIVER_IMAGE} imagePullPolicy: IfNotPresent args: + - "--provide-controller-service=true" + - "--provide-node-service=false" - --v=${LOG_LEVEL} - --cluster-id=${CLUSTER_ID} - --nodeid=$(NODE_ID) diff --git a/assets/overlays/openstack-manila/patches/node_add_driver.yaml b/assets/overlays/openstack-manila/patches/node_add_driver.yaml index 6037d714a..f5f368a36 100644 --- a/assets/overlays/openstack-manila/patches/node_add_driver.yaml +++ b/assets/overlays/openstack-manila/patches/node_add_driver.yaml @@ -37,6 +37,8 @@ spec: image: ${DRIVER_IMAGE} imagePullPolicy: IfNotPresent args: + - "--provide-controller-service=false" + - "--provide-node-service=true" - --v=${LOG_LEVEL} - "--nodeid=$(NODE_ID)" - "--endpoint=$(CSI_ENDPOINT)"