Merge pull request #294 from shiftstack/configure-namespace

OSASINFRA-3628: Make guest namespace configurable
openshift · Oct 18, 2024 · 8f8d508 · 8f8d508
2 parents 7280bd6 + 4182cd3
commit 8f8d508
Show file tree

Hide file tree

Showing 150 changed files with 295 additions and 203 deletions.
diff --git a/assets/base/node.yaml b/assets/base/node.yaml
@@ -2,7 +2,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
  name: ${ASSET_PREFIX}-node
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 spec:
  selector:
  matchLabels:

diff --git a/assets/base/node_metrics_service.yaml b/assets/base/node_metrics_service.yaml
@@ -6,7 +6,7 @@ metadata:
  labels:
  app: ${ASSET_PREFIX}-node-metrics
  name: ${ASSET_PREFIX}-node-metrics
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 spec:
  ports:
  selector:

diff --git a/assets/base/node_metrics_servicemonitor.yaml b/assets/base/node_metrics_servicemonitor.yaml
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
  name: ${ASSET_PREFIX}-node-monitor
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 spec:
  # Empty list to make json-patch work
  endpoints: []

diff --git a/assets/base/node_sa.yaml b/assets/base/node_sa.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: ${ASSET_PREFIX}-node-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/base/rbac/lease_leader_election_binding.yaml b/assets/base/rbac/lease_leader_election_binding.yaml
@@ -3,12 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: ${ASSET_PREFIX}-lease-leader-election
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
  name: ${ASSET_PREFIX}-lease-leader-election
 subjects:
 - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/base/rbac/lease_leader_election_role.yaml b/assets/base/rbac/lease_leader_election_role.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  name: ${ASSET_PREFIX}-lease-leader-election
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 rules:
 - apiGroups: ["coordination.k8s.io"]
  resources: ["leases"]

diff --git a/assets/base/rbac/main_attacher_binding.yaml b/assets/base/rbac/main_attacher_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: openshift-csi-main-attacher-role

diff --git a/assets/base/rbac/main_provisioner_binding.yaml b/assets/base/rbac/main_provisioner_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: openshift-csi-main-provisioner-role

diff --git a/assets/base/rbac/main_resizer_binding.yaml b/assets/base/rbac/main_resizer_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: openshift-csi-main-resizer-role

diff --git a/assets/base/rbac/main_snapshotter_binding.yaml b/assets/base/rbac/main_snapshotter_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: openshift-csi-main-snapshotter-role

diff --git a/assets/base/rbac/node_kube_rbac_proxy_binding.yaml b/assets/base/rbac/node_kube_rbac_proxy_binding.yaml
@@ -6,7 +6,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-node-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: ${ASSET_SHORT_PREFIX}-node-kube-rbac-proxy-role

diff --git a/assets/base/rbac/node_privileged_binding.yaml b/assets/base/rbac/node_privileged_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-node-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: ${ASSET_SHORT_PREFIX}-privileged-role

diff --git a/assets/base/rbac/prometheus_binding.yaml b/assets/base/rbac/prometheus_binding.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: ${ASSET_PREFIX}-prometheus
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role

diff --git a/assets/base/rbac/prometheus_role.yaml b/assets/base/rbac/prometheus_role.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  name: ${ASSET_PREFIX}-prometheus
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 rules:
 - apiGroups:
  - ""

diff --git a/assets/base/rbac/storageclass_reader_resizer_binding.yaml b/assets/base/rbac/storageclass_reader_resizer_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: openshift-csi-resizer-storageclass-reader-role

diff --git a/assets/base/rbac/volumesnapshot_reader_provisioner_binding.yaml b/assets/base/rbac/volumesnapshot_reader_provisioner_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 subjects:
  - kind: ServiceAccount
  name: ${ASSET_PREFIX}-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  kind: ClusterRole
  name: openshift-csi-provisioner-volumesnapshot-reader-role

diff --git a/assets/common/sidecars/attacher.yaml b/assets/common/sidecars/attacher.yaml
@@ -14,7 +14,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  # Empty env. instead of nil for json patch to append new env. vars there
  env: []

diff --git a/assets/common/sidecars/provisioner.yaml b/assets/common/sidecars/provisioner.yaml
@@ -14,7 +14,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  # Empty env. instead of nil for json patch to append new env. vars there
  env: []

diff --git a/assets/common/sidecars/resizer.yaml b/assets/common/sidecars/resizer.yaml
@@ -14,7 +14,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  # Empty env. instead of nil for json patch to append new env. vars there
  env: []

diff --git a/assets/common/sidecars/snapshotter.yaml b/assets/common/sidecars/snapshotter.yaml
@@ -14,7 +14,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  # Empty env. instead of nil for json patch to append new env. vars there
  env: []

diff --git a/assets/overlays/aws-ebs/generated/hypershift/controller.yaml b/assets/overlays/aws-ebs/generated/hypershift/controller.yaml
@@ -165,7 +165,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --default-fstype=ext4
  - --feature-gates=Topology=true
@@ -222,7 +222,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --timeout=60s
  - --kube-api-qps=20
@@ -276,7 +276,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --timeout=60s
  - --kube-api-qps=20
@@ -330,7 +330,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --extra-create-metadata
  - --kube-api-qps=20

diff --git a/assets/overlays/aws-ebs/generated/hypershift/lease_leader_election_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/lease_leader_election_binding.yaml
@@ -9,12 +9,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: aws-ebs-csi-driver-lease-leader-election
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
  name: aws-ebs-csi-driver-lease-leader-election
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/lease_leader_election_role.yaml b/assets/overlays/aws-ebs/generated/hypershift/lease_leader_election_role.yaml
@@ -9,7 +9,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  name: aws-ebs-csi-driver-lease-leader-election
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 rules:
 - apiGroups:
  - coordination.k8s.io

diff --git a/assets/overlays/aws-ebs/generated/hypershift/main_attacher_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/main_attacher_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/main_provisioner_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/main_provisioner_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/main_resizer_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/main_resizer_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/main_snapshotter_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/main_snapshotter_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/node.yaml b/assets/overlays/aws-ebs/generated/hypershift/node.yaml
@@ -17,7 +17,7 @@ metadata:
  config.openshift.io/inject-proxy: csi-driver
  config.openshift.io/inject-proxy-cabundle: csi-driver
  name: aws-ebs-csi-driver-node
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 spec:
  selector:
  matchLabels:

diff --git a/assets/overlays/aws-ebs/generated/hypershift/node_privileged_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/node_privileged_binding.yaml
@@ -15,4 +15,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-node-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/node_sa.yaml b/assets/overlays/aws-ebs/generated/hypershift/node_sa.yaml
@@ -8,4 +8,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: aws-ebs-csi-driver-node-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/storageclass_reader_resizer_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/storageclass_reader_resizer_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/hypershift/volumesnapshot_reader_provisioner_binding.yaml b/assets/overlays/aws-ebs/generated/hypershift/volumesnapshot_reader_provisioner_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/standalone/controller.yaml b/assets/overlays/aws-ebs/generated/standalone/controller.yaml
@@ -135,7 +135,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --default-fstype=ext4
  - --feature-gates=Topology=true
@@ -186,7 +186,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --timeout=60s
  - --kube-api-qps=20
@@ -234,7 +234,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --timeout=60s
  - --kube-api-qps=20
@@ -282,7 +282,7 @@ spec:
  - --leader-election-lease-duration=${LEADER_ELECTION_LEASE_DURATION}
  - --leader-election-renew-deadline=${LEADER_ELECTION_RENEW_DEADLINE}
  - --leader-election-retry-period=${LEADER_ELECTION_RETRY_PERIOD}
- - --leader-election-namespace=openshift-cluster-csi-drivers
+ - --leader-election-namespace=${NODE_NAMESPACE}
  - --v=${LOG_LEVEL}
  - --extra-create-metadata
  - --kube-api-qps=20

diff --git a/assets/overlays/aws-ebs/generated/standalone/lease_leader_election_binding.yaml b/assets/overlays/aws-ebs/generated/standalone/lease_leader_election_binding.yaml
@@ -9,12 +9,12 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
  name: aws-ebs-csi-driver-lease-leader-election
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
  name: aws-ebs-csi-driver-lease-leader-election
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/standalone/lease_leader_election_role.yaml b/assets/overlays/aws-ebs/generated/standalone/lease_leader_election_role.yaml
@@ -9,7 +9,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
  name: aws-ebs-csi-driver-lease-leader-election
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 rules:
 - apiGroups:
  - coordination.k8s.io

diff --git a/assets/overlays/aws-ebs/generated/standalone/main_attacher_binding.yaml b/assets/overlays/aws-ebs/generated/standalone/main_attacher_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/standalone/main_provisioner_binding.yaml b/assets/overlays/aws-ebs/generated/standalone/main_provisioner_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/standalone/main_resizer_binding.yaml b/assets/overlays/aws-ebs/generated/standalone/main_resizer_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/standalone/main_snapshotter_binding.yaml b/assets/overlays/aws-ebs/generated/standalone/main_snapshotter_binding.yaml
@@ -16,4 +16,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-controller-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
diff --git a/assets/overlays/aws-ebs/generated/standalone/node.yaml b/assets/overlays/aws-ebs/generated/standalone/node.yaml
@@ -17,7 +17,7 @@ metadata:
  config.openshift.io/inject-proxy: csi-driver
  config.openshift.io/inject-proxy-cabundle: csi-driver
  name: aws-ebs-csi-driver-node
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}
 spec:
  selector:
  matchLabels:

diff --git a/assets/overlays/aws-ebs/generated/standalone/node_privileged_binding.yaml b/assets/overlays/aws-ebs/generated/standalone/node_privileged_binding.yaml
@@ -15,4 +15,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: aws-ebs-csi-driver-node-sa
- namespace: openshift-cluster-csi-drivers
+ namespace: ${NODE_NAMESPACE}