diff --git a/README.md b/README.md index f33d6a5..16c1735 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ NAME READY STATUS RESTARTS AGE objectstorage-controller-6fc5f89444-4ws72 1/1 Running 0 2d6h ``` -#### Install object storage provisioner sidecar with the Nutanix cosi driver +#### Install object storage provisioner sidecar with the Nutanix COSI driver ```sh $ git clone https://github.com/nutanix-cloud-native/cosi-driver-nutanix @@ -72,8 +72,8 @@ After updating the above file, execute these commands: ```sh $ kubectl apply -k project/. $ kubectl -n ntnx-system get pods -NAME READY STATUS RESTARTS AGE -objectstorage-provisioner-6c8df56cc6-lqr26 2/2 Running 0 26h +NAME READY STATUS RESTARTS AGE +cosi-driver-nutanix-6cd467d7df-btvpp 2/2 Running 0 3m5s ``` ## Quickstart @@ -170,21 +170,21 @@ Update the `objectstorage-provisioner` secret that is used by the running provis Then restart the provisioner pod so that the new secret changes getting mounted on the new pod and will thereon be used. ``` $ kubectl -n ntnx-system get pods -NAME READY STATUS RESTARTS AGE -objectstorage-provisioner-6c8df56cc6-lqr26 2/2 Running 0 26h +NAME READY STATUS RESTARTS AGE +cosi-driver-nutanix-6cd467d7df-btvpp 2/2 Running 0 3m7s ``` ``` -$ kubectl delete pod objectstorage-provisioner-6c8df56cc6-lqr26 -n ntnx-system +$ kubectl delete pod cosi-driver-nutanix-6cd467d7df-btvpp -n ntnx-system ``` New pod comes up which will be having the updated config ``` $ kubectl -n ntnx-system get pods -NAME READY STATUS RESTARTS AGE -objectstorage-provisioner-5f3we89tt2-tfy357 2/2 Running 0 2s +NAME READY STATUS RESTARTS AGE +cosi-driver-nutanix-6cd467d7df-lkfmc 2/2 Running 0 3s ``` -## Building Nutanix cosi driver container image +## Building Nutanix COSI driver container image Code can be compiled using: ```sh $ git clone https://github.com/nutanix-cloud-native/cosi-driver-nutanix diff --git a/charts/templates/deploy.yaml b/charts/templates/deploy.yaml index da45802..c976b24 100644 --- a/charts/templates/deploy.yaml +++ b/charts/templates/deploy.yaml @@ -5,7 +5,7 @@ metadata: {{ include "cosi-driver-nutanix.resource.annotations" . | indent 4 }} labels: {{ include "cosi-driver-nutanix.resource.labels" . | indent 4 }} - name: objectstorage-provisioner + name: {{ include "cosi-driver-nutanix.name" . }} namespace: {{ .Release.Namespace }} spec: minReadySeconds: 30 @@ -28,32 +28,33 @@ spec: {{ include "cosi-driver-nutanix.resource.labels" . | indent 8 }} spec: containers: - - envFrom: - - secretRef: - name: objectstorage-provisioner + - name: cosi-driver-nutanix image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - name: cosi-driver-nutanix + envFrom: + - secretRef: + name: {{ include "cosi-driver-nutanix.name" . }} volumeMounts: - mountPath: /var/lib/cosi name: socket - - name: objectstorage-provisioner-sidecar + - name: objectstorage-sidecar image: "{{ .Values.objectstorageProvisionerSidecar.image.registry }}/{{ .Values.objectstorageProvisionerSidecar.image.repository }}:{{ .Values.objectstorageProvisionerSidecar.image.tag }}" imagePullPolicy: {{ .Values.objectstorageProvisionerSidecar.image.pullPolicy }} args: - "--v={{ .Values.objectstorageProvisionerSidecar.logLevel }}" envFrom: - secretRef: - name: objectstorage-provisioner + name: {{ include "cosi-driver-nutanix.name" . }} env: - name: POD_NAMESPACE valueFrom: fieldRef: - fieldPath: metadata.namespace + fieldPath: + metadata.namespace volumeMounts: - mountPath: /var/lib/cosi name: socket - serviceAccountName: objectstorage-provisioner-sa + serviceAccountName: {{ include "cosi-driver-nutanix.name" . }} volumes: - emptyDir: {} name: socket diff --git a/charts/templates/rbac.yaml b/charts/templates/rbac.yaml index 4688fc3..b63bd28 100644 --- a/charts/templates/rbac.yaml +++ b/charts/templates/rbac.yaml @@ -5,7 +5,7 @@ metadata: {{ include "cosi-driver-nutanix.resource.annotations" . | indent 4 }} labels: {{ include "cosi-driver-nutanix.resource.labels" . | indent 4 }} - name: objectstorage-provisioner-role + name: {{ include "cosi-driver-nutanix.name" . }} rules: - apiGroups: ["objectstorage.k8s.io"] resources: ["buckets", "bucketaccesses","buckets/status", "bucketaccesses/status", "bucketaccessclasses", "bucketaccessclasses/status", "bucketclaims", "bucketclaims/status"] @@ -24,12 +24,12 @@ metadata: {{ include "cosi-driver-nutanix.resource.annotations" . | indent 4 }} labels: {{ include "cosi-driver-nutanix.resource.labels" . | indent 4 }} - name: objectstorage-provisioner-role-binding + name: {{ include "cosi-driver-nutanix.name" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: objectstorage-provisioner-role + name: {{ include "cosi-driver-nutanix.name" . }} subjects: - kind: ServiceAccount - name: objectstorage-provisioner-sa + name: {{ include "cosi-driver-nutanix.name" . }} namespace: {{ .Release.Namespace }} diff --git a/charts/templates/sa.yaml b/charts/templates/sa.yaml index 6c65d44..ef5e87d 100644 --- a/charts/templates/sa.yaml +++ b/charts/templates/sa.yaml @@ -5,5 +5,5 @@ metadata: {{ include "cosi-driver-nutanix.resource.annotations" . | indent 4 }} labels: {{ include "cosi-driver-nutanix.resource.labels" . | indent 4 }} - name: objectstorage-provisioner-sa + name: {{ include "cosi-driver-nutanix.name" . }} namespace: {{ .Release.Namespace }} diff --git a/charts/templates/secret.yaml b/charts/templates/secret.yaml index 827a203..481d2c0 100644 --- a/charts/templates/secret.yaml +++ b/charts/templates/secret.yaml @@ -6,7 +6,7 @@ metadata: {{ include "cosi-driver-nutanix.resource.annotations" . | indent 4 }} labels: {{ include "cosi-driver-nutanix.resource.labels" . | indent 4 }} - name: objectstorage-provisioner + name: {{ include "cosi-driver-nutanix.name" . }} namespace: {{ .Release.Namespace }} stringData: ACCESS_KEY: {{ required "access_key is required." .Values.secret.access_key | quote }} diff --git a/project/resources/deployment.yaml b/project/resources/deployment.yaml index 5a35c5f..a18456e 100644 --- a/project/resources/deployment.yaml +++ b/project/resources/deployment.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: objectstorage-provisioner + name: cosi-driver-nutanix labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: driver-ntnx @@ -31,7 +31,7 @@ spec: app.kubernetes.io/version: main app.kubernetes.io/name: cosi-driver-ntnx spec: - serviceAccountName: objectstorage-provisioner-sa + serviceAccountName: cosi-driver-nutanix volumes: - name: socket emptyDir: {} @@ -41,18 +41,18 @@ spec: imagePullPolicy: IfNotPresent envFrom: - secretRef: - name: objectstorage-provisioner + name: cosi-driver-nutanix volumeMounts: - mountPath: /var/lib/cosi name: socket - - name: objectstorage-provisioner-sidecar + - name: objectstorage-sidecar image: k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20221117-v0.1.0-22-g0e67387 imagePullPolicy: Always args: - "--v=5" envFrom: - secretRef: - name: objectstorage-provisioner + name: cosi-driver-nutanix env: - name: POD_NAMESPACE valueFrom: diff --git a/project/resources/rbac.yaml b/project/resources/rbac.yaml index 7000f6d..415cf8c 100644 --- a/project/resources/rbac.yaml +++ b/project/resources/rbac.yaml @@ -2,7 +2,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: objectstorage-provisioner-role + name: cosi-driver-nutanix labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: driver-ntnx @@ -22,7 +22,7 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: objectstorage-provisioner-role-binding + name: cosi-driver-nutanix labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: driver-ntnx @@ -30,9 +30,9 @@ metadata: app.kubernetes.io/name: cosi-driver-ntnx subjects: - kind: ServiceAccount - name: objectstorage-provisioner-sa + name: cosi-driver-nutanix namespace: default # must set to default. see https://github.com/kubernetes-sigs/kustomize/issues/1377#issuecomment-694731163 roleRef: kind: ClusterRole - name: objectstorage-provisioner-role + name: cosi-driver-nutanix apiGroup: rbac.authorization.k8s.io diff --git a/project/resources/sa.yaml b/project/resources/sa.yaml index a2d7859..6e46c16 100644 --- a/project/resources/sa.yaml +++ b/project/resources/sa.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: objectstorage-provisioner-sa + name: cosi-driver-nutanix 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 diff --git a/project/resources/secret.yaml b/project/resources/secret.yaml index 7d6aaf1..c8a9804 100644 --- a/project/resources/secret.yaml +++ b/project/resources/secret.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: objectstorage-provisioner + name: cosi-driver-nutanix labels: app.kubernetes.io/part-of: container-object-storage-interface app.kubernetes.io/component: driver-ntnx