diff --git a/resources/deployment.yaml b/resources/deployment.yaml index e0946ee..6eac0fb 100644 --- a/resources/deployment.yaml +++ b/resources/deployment.yaml @@ -23,6 +23,7 @@ spec: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: provisioner app.kubernetes.io/name: container-object-storage-interface-provisioner + app.kubernetes.io/version: main template: metadata: labels: @@ -45,6 +46,8 @@ spec: name: objectstorage-provisioner - name: objectstorage-provisioner-sidecar image: quay.io/containerobjectstorage/objectstorage-sidecar:latest + args: + - "--connect-address=$(CONNECT_ADDRESS)" env: - name: CONNECT_ADDRESS valueFrom: diff --git a/resources/rbac.yaml b/resources/rbac.yaml index eb2be5c..ffd0cff 100644 --- a/resources/rbac.yaml +++ b/resources/rbac.yaml @@ -3,7 +3,6 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: name: objectstorage-provisioner-role - namespace: objectstorage-provisioner-ns labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: provisioner @@ -27,7 +26,6 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: objectstorage-provisioner-role-binding - namespace: objectstorage-provisioner-ns labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: provisioner @@ -36,7 +34,7 @@ metadata: subjects: - kind: ServiceAccount name: objectstorage-provisioner-sa - namespace: objectstorage-provisioner-ns + namespace: default # must set to default. see https://github.com/kubernetes-sigs/kustomize/issues/1377#issuecomment-694731163 roleRef: kind: ClusterRole name: objectstorage-provisioner-role diff --git a/resources/sa.yaml b/resources/sa.yaml index d3798f5..c4304c6 100644 --- a/resources/sa.yaml +++ b/resources/sa.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: objectstorage-provisioner-sa - namespace: objectstorage-provisioner-ns + namespace: default # must set to default. see https://github.com/kubernetes-sigs/kustomize/issues/1377#issuecomment-694731163 labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: provisioner diff --git a/resources/secret.yaml b/resources/secret.yaml index d020bab..69085e5 100644 --- a/resources/secret.yaml +++ b/resources/secret.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: Secret metadata: name: objectstorage-provisioner - namespace: objectstorage-provisioner-ns labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: provisioner