Created
September 21, 2021 17:52
-
-
Save fmount/afee94041fdc5b02ef992c590bf2978b to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/assets/controller.yaml b/assets/controller.yaml | |
index 4177f05..2733cb1 100644 | |
--- a/assets/controller.yaml | |
+++ b/assets/controller.yaml | |
@@ -2,7 +2,7 @@ kind: Deployment | |
apiVersion: apps/v1 | |
metadata: | |
name: openstack-manila-csi-controllerplugin | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
annotations: | |
config.openshift.io/inject-proxy: csi-driver | |
spec: | |
diff --git a/assets/controller_pdb.yaml b/assets/controller_pdb.yaml | |
index bff5cf7..b54fa84 100644 | |
--- a/assets/controller_pdb.yaml | |
+++ b/assets/controller_pdb.yaml | |
@@ -2,7 +2,7 @@ apiVersion: policy/v1 | |
kind: PodDisruptionBudget | |
metadata: | |
name: openstack-manila-csi-controllerplugin-pdb | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
spec: | |
maxUnavailable: 1 | |
selector: | |
diff --git a/assets/controller_sa.yaml b/assets/controller_sa.yaml | |
index 5e8918e..10b53d1 100644 | |
--- a/assets/controller_sa.yaml | |
+++ b/assets/controller_sa.yaml | |
@@ -2,4 +2,4 @@ apiVersion: v1 | |
kind: ServiceAccount | |
metadata: | |
name: manila-csi-driver-controller-sa | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
diff --git a/assets/node.yaml b/assets/node.yaml | |
index 9bf603f..74aed29 100644 | |
--- a/assets/node.yaml | |
+++ b/assets/node.yaml | |
@@ -2,7 +2,7 @@ kind: DaemonSet | |
apiVersion: apps/v1 | |
metadata: | |
name: openstack-manila-csi-nodeplugin | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
annotations: | |
config.openshift.io/inject-proxy: csi-driver | |
spec: | |
diff --git a/assets/node_nfs.yaml b/assets/node_nfs.yaml | |
index b03ec78..15840b5 100644 | |
--- a/assets/node_nfs.yaml | |
+++ b/assets/node_nfs.yaml | |
@@ -2,7 +2,7 @@ kind: DaemonSet | |
apiVersion: apps/v1 | |
metadata: | |
name: csi-nodeplugin-nfsplugin | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
spec: | |
selector: | |
matchLabels: | |
diff --git a/assets/node_sa.yaml b/assets/node_sa.yaml | |
index f65c6c4..f40098c 100644 | |
--- a/assets/node_sa.yaml | |
+++ b/assets/node_sa.yaml | |
@@ -2,4 +2,4 @@ apiVersion: v1 | |
kind: ServiceAccount | |
metadata: | |
name: manila-csi-driver-node-sa | |
- namespace: openshift-manila-csi-driver | |
\ No newline at end of file | |
+ namespace: manila-csi-driver | |
diff --git a/assets/rbac/controller_privileged_binding.yaml b/assets/rbac/controller_privileged_binding.yaml | |
index 3f2ae94..d9de1ee 100644 | |
--- a/assets/rbac/controller_privileged_binding.yaml | |
+++ b/assets/rbac/controller_privileged_binding.yaml | |
@@ -5,7 +5,7 @@ metadata: | |
subjects: | |
- kind: ServiceAccount | |
name: manila-csi-driver-controller-sa | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
roleRef: | |
kind: ClusterRole | |
name: manila-privileged-role | |
diff --git a/assets/rbac/kube_rbac_proxy_binding.yaml b/assets/rbac/kube_rbac_proxy_binding.yaml | |
index 4a53839..77b8388 100644 | |
--- a/assets/rbac/kube_rbac_proxy_binding.yaml | |
+++ b/assets/rbac/kube_rbac_proxy_binding.yaml | |
@@ -6,7 +6,7 @@ metadata: | |
subjects: | |
- kind: ServiceAccount | |
name: manila-csi-driver-controller-sa | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
roleRef: | |
kind: ClusterRole | |
name: manila-kube-rbac-proxy-role | |
diff --git a/assets/rbac/node_privileged_binding.yaml b/assets/rbac/node_privileged_binding.yaml | |
index c6d74b5..16ce323 100644 | |
--- a/assets/rbac/node_privileged_binding.yaml | |
+++ b/assets/rbac/node_privileged_binding.yaml | |
@@ -5,7 +5,7 @@ metadata: | |
subjects: | |
- kind: ServiceAccount | |
name: manila-csi-driver-node-sa | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
roleRef: | |
kind: ClusterRole | |
name: manila-privileged-role | |
diff --git a/assets/rbac/prometheus_role.yaml b/assets/rbac/prometheus_role.yaml | |
index 107897b..db4c4ff 100644 | |
--- a/assets/rbac/prometheus_role.yaml | |
+++ b/assets/rbac/prometheus_role.yaml | |
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 | |
kind: Role | |
metadata: | |
name: manila-csi-driver-prometheus | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
rules: | |
- apiGroups: | |
- "" | |
diff --git a/assets/rbac/prometheus_rolebinding.yaml b/assets/rbac/prometheus_rolebinding.yaml | |
index 96952a9..448ceac 100644 | |
--- a/assets/rbac/prometheus_rolebinding.yaml | |
+++ b/assets/rbac/prometheus_rolebinding.yaml | |
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 | |
kind: RoleBinding | |
metadata: | |
name: manila-csi-driver-prometheus | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
roleRef: | |
apiGroup: rbac.authorization.k8s.io | |
kind: Role | |
@@ -11,4 +11,4 @@ roleRef: | |
subjects: | |
- kind: ServiceAccount | |
name: prometheus-k8s | |
- namespace: openshift-monitoring | |
+ namespace: monitoring | |
diff --git a/assets/rbac/provisioner_binding.yaml b/assets/rbac/provisioner_binding.yaml | |
index 077905a..86b6d83 100644 | |
--- a/assets/rbac/provisioner_binding.yaml | |
+++ b/assets/rbac/provisioner_binding.yaml | |
@@ -5,7 +5,7 @@ metadata: | |
subjects: | |
- kind: ServiceAccount | |
name: manila-csi-driver-controller-sa | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
roleRef: | |
kind: ClusterRole | |
name: manila-external-provisioner-role | |
diff --git a/assets/rbac/snapshotter_binding.yaml b/assets/rbac/snapshotter_binding.yaml | |
index 50579f3..c7b5cd6 100644 | |
--- a/assets/rbac/snapshotter_binding.yaml | |
+++ b/assets/rbac/snapshotter_binding.yaml | |
@@ -5,7 +5,7 @@ metadata: | |
subjects: | |
- kind: ServiceAccount | |
name: manila-csi-driver-controller-sa | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
roleRef: | |
kind: ClusterRole | |
name: manila-external-snapshotter-role | |
diff --git a/assets/service.yaml b/assets/service.yaml | |
index 364752c..f99c5f0 100644 | |
--- a/assets/service.yaml | |
+++ b/assets/service.yaml | |
@@ -6,7 +6,7 @@ metadata: | |
labels: | |
app: manila-csi-driver-controller-metrics | |
name: manila-csi-driver-controller-metrics | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
spec: | |
ports: | |
- name: provisioner-m | |
diff --git a/assets/servicemonitor.yaml b/assets/servicemonitor.yaml | |
index 0ccaca6..0789ab5 100644 | |
--- a/assets/servicemonitor.yaml | |
+++ b/assets/servicemonitor.yaml | |
@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 | |
kind: ServiceMonitor | |
metadata: | |
name: manila-csi-driver-controller-monitor | |
- namespace: openshift-manila-csi-driver | |
+ namespace: manila-csi-driver | |
spec: | |
endpoints: | |
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token | |
@@ -12,7 +12,7 @@ spec: | |
scheme: https | |
tlsConfig: | |
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | |
- serverName: manila-csi-driver-controller-metrics.openshift-manila-csi-driver.svc | |
+ serverName: manila-csi-driver-controller-metrics.manila-csi-driver.svc | |
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token | |
interval: 30s | |
path: /metrics | |
@@ -20,7 +20,7 @@ spec: | |
scheme: https | |
tlsConfig: | |
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt | |
- serverName: manila-csi-driver-controller-metrics.openshift-manila-csi-driver.svc | |
+ serverName: manila-csi-driver-controller-metrics.manila-csi-driver.svc | |
jobLabel: component | |
selector: | |
matchLabels: | |
diff --git a/manifests/07_deployment.yaml b/manifests/07_deployment.yaml | |
index 1199f9a..b1206f7 100644 | |
--- a/manifests/07_deployment.yaml | |
+++ b/manifests/07_deployment.yaml | |
@@ -41,9 +41,9 @@ spec: | |
image: quay.io/openshift/origin-csi-driver-manila-operator:latest | |
imagePullPolicy: IfNotPresent | |
name: manila-csi-driver-operator | |
- volumeMounts: | |
- - name: cacert | |
- mountPath: /usr/share/pki/ca-trust-source | |
+ #volumeMounts: | |
+ #- name: cacert | |
+ # mountPath: /usr/share/pki/ca-trust-source | |
priorityClassName: system-cluster-critical | |
serviceAccountName: manila-csi-driver-operator | |
nodeSelector: | |
diff --git a/manifests/09_credentials.yaml b/manifests/09_credentials.yaml | |
index 8c83741..eff4499 100644 | |
--- a/manifests/09_credentials.yaml | |
+++ b/manifests/09_credentials.yaml | |
@@ -1,7 +1,7 @@ | |
apiVersion: cloudcredential.openshift.io/v1 | |
kind: CredentialsRequest | |
metadata: | |
- name: openshift-manila-csi-driver-operator | |
+ name: manila-csi-driver-operator | |
namespace: openshift-cloud-credential-operator | |
spec: | |
secretRef: | |
diff --git a/pkg/util/const.go b/pkg/util/const.go | |
index 622da44..c19883f 100644 | |
--- a/pkg/util/const.go | |
+++ b/pkg/util/const.go | |
@@ -2,7 +2,7 @@ package util | |
const ( | |
OperatorNamespace = "openshift-cluster-csi-drivers" | |
- OperandNamespace = "openshift-manila-csi-driver" | |
+ OperandNamespace = "manila-csi-driver" | |
CloudCredentialSecretName = "manila-cloud-credentials" | |
ManilaSecretName = "csi-manila-secrets" | |
@@ -12,7 +12,7 @@ const ( | |
StorageClassNamePrefix = "csi-manila-" | |
// OpenStack config file name (as present in the operator Deployment) | |
- CloudConfigFilename = "/etc/openstack/clouds.yaml" | |
+ CloudConfigFilename = "~/.config/openstack/clouds.yaml" | |
CertFile = "/etc/openstack-ca/ca-bundle.pem" | |
// Name of cloud in secret provided by cloud-credentials-operator |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment