Working code

Author: mkumatag

Dockerfile

@@ -1,24 +1,20 @@
-# Copyright 2019 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+#FROM golang:1.15-buster AS builder
+#WORKDIR /go/src/github.com/ppc64le-cloud/powervs-csi-driver
+#COPY . .
+#RUN make
 
-FROM golang:1.14.1-stretch AS builder
-WORKDIR /go/src/github.com/ppc64le-cloud/powervs-csi-driver
-COPY . .
-RUN make
-
-FROM k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
+FROM --platform=linux/ppc64le k8s.gcr.io/build-image/debian-base:v2.1.3 AS debian-base
 RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
-COPY --from=builder /go/src/github.com/ppc64le-cloud/powervs-csi-driver/bin/powervs-csi-driver /bin/powervs-csi-driver
+# COPY --from=builder /go/src/github.com/ppc64le-cloud/powervs-csi-driver/bin/powervs-csi-driver /bin/powervs-csi-driver
+COPY ./bin/powervs-csi-driver /bin/powervs-csi-driver
 
 ENTRYPOINT ["/bin/powervs-csi-driver"]
+
+FROM --platform=linux/ppc64le registry.access.redhat.com/ubi8/ubi:8.3 AS rhel-base
+RUN yum --disableplugin=subscription-manager -y install httpd php \
+  && yum --disableplugin=subscription-manager clean all
+RUN clean-install ca-certificates e2fsprogs mount udev util-linux xfsprogs
+# COPY --from=builder /go/src/github.com/ppc64le-cloud/powervs-csi-driver/bin/powervs-csi-driver /bin/powervs-csi-driver
+COPY ./bin/powervs-csi-driver /bin/powervs-csi-driver
+
+ENTRYPOINT ["/bin/powervs-csi-driver"]

Makefile

@@ -23,12 +23,13 @@ GOPROXY=direct
 GOPATH=$(shell go env GOPATH)
 GOOS=$(shell go env GOOS)
 GOBIN=$(shell pwd)/bin
+PLATFORM=linux/ppc64le
 
 .EXPORT_ALL_VARIABLES:
 
 .PHONY: bin/powervs-csi-driver
 bin/powervs-csi-driver: | bin
-	CGO_ENABLED=0 GOOS=linux go build -ldflags ${LDFLAGS} -o bin/powervs-csi-driver ./cmd/
+	CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le go build -ldflags ${LDFLAGS} -o bin/powervs-csi-driver ./cmd/
 
 bin /tmp/helm /tmp/kubeval:
 	@mkdir -p $@
@@ -85,7 +86,7 @@ test-e2e-multi-az: bin/k8s-e2e-tester
 
 .PHONY: image-release
 image-release:
-	docker build -t $(IMAGE):$(VERSION) . --target debian-base
+	docker buildx build -t $(IMAGE):$(VERSION) . --target debian-base
 
 .PHONY: image
 image:

deploy/kubernetes/base/clusterrole-attacher.yaml

@@ -1,15 +1,15 @@
 ---
-# Source: aws-ebs-csi-driver/templates/clusterrole-attacher.yaml
+# Source: powervs-csi-driver/templates/clusterrole-attacher.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ebs-external-attacher-role
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "update"]
+    verbs: ["get", "list", "watch", "patch"]
   - apiGroups: [""]
     resources: ["nodes"]
     verbs: ["get", "list", "watch"]
@@ -18,4 +18,7 @@ rules:
     verbs: ["get", "list", "watch"]
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
-    verbs: ["get", "list", "watch", "update"]
+    verbs: ["get", "list", "watch", "patch"]
+  - apiGroups: [ "storage.k8s.io" ]
+    resources: [ "volumeattachments/status" ]
+    verbs: [ "patch" ]

deploy/kubernetes/base/clusterrole-provisioner.yaml

@@ -1,11 +1,11 @@
 ---
-# Source: aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml
+# Source: powervs-csi-driver/templates/clusterrole-provisioner.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ebs-external-provisioner-role
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]

deploy/kubernetes/base/clusterrolebinding-attacher.yaml

@@ -1,11 +1,11 @@
 ---
-# Source: aws-ebs-csi-driver/templates/clusterrolebinding-attacher.yaml
+# Source: powervs-csi-driver/templates/clusterrolebinding-attacher.yaml
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ebs-csi-attacher-binding
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 subjects:
   - kind: ServiceAccount
     name: ebs-csi-controller-sa

deploy/kubernetes/base/clusterrolebinding-provisioner.yaml

@@ -1,11 +1,11 @@
 ---
-# Source: aws-ebs-csi-driver/templates/clusterrolebinding-provisioner.yaml
+# Source: powervs-csi-driver/templates/clusterrolebinding-provisioner.yaml
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: ebs-csi-provisioner-binding
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 subjects:
   - kind: ServiceAccount
     name: ebs-csi-controller-sa

deploy/kubernetes/base/controller.yaml

@@ -1,24 +1,24 @@
 ---
-# Source: aws-ebs-csi-driver/templates/controller.yaml
+# Source: powervs-csi-driver/templates/controller.yaml
 # Controller Service
 kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: ebs-csi-controller
   namespace: kube-system
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 spec:
   replicas: 2
   selector:
     matchLabels:
       app: ebs-csi-controller
-      app.kubernetes.io/name: aws-ebs-csi-driver
+      app.kubernetes.io/name: powervs-csi-driver
   template:
     metadata:
       labels:
         app: ebs-csi-controller
-        app.kubernetes.io/name: aws-ebs-csi-driver
+        app.kubernetes.io/name: powervs-csi-driver
     spec:
       nodeSelector:
         kubernetes.io/os: linux
@@ -28,8 +28,8 @@ spec:
         - operator: Exists
       containers:
         - name: ebs-plugin
-          image: amazon/aws-ebs-csi-driver:latest
-          imagePullPolicy: IfNotPresent
+          image: quay.io/powercloud/powervs-csi-driver:v0.0.1
+          imagePullPolicy: Always
           args:
             # - {all,controller,node} # specify the driver mode
             - --endpoint=$(CSI_ENDPOINT)
@@ -38,17 +38,11 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock
-            - name: AWS_ACCESS_KEY_ID
+            - name: IBMCLOUD_API_KEY
               valueFrom:
                 secretKeyRef:
-                  name: aws-secret
-                  key: key_id
-                  optional: true
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: aws-secret
-                  key: access_key
+                  name: ibm-secret
+                  key: IBMCLOUD_API_KEY
                   optional: true
           volumeMounts:
             - name: socket-dir
@@ -66,34 +60,35 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.5.0
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4
           args:
             - --csi-address=$(ADDRESS)
             - --v=5
             - --feature-gates=Topology=true
-            - --enable-leader-election
-            - --leader-election-type=leases
+            - --leader-election
+            #- --leader-election-type=leases
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v1.2.0
+          image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.0
           args:
             - --csi-address=$(ADDRESS)
+            - --timeout=120s
             - --v=5
             - --leader-election=true
-            - --leader-election-type=leases
+            #- --leader-election-type=leases
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
           volumeMounts:
             - name: socket-dir
               mountPath: /var/lib/csi/sockets/pluginproxy/
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:

deploy/kubernetes/base/csidriver.yaml

@@ -1,11 +1,11 @@
 ---
-# Source: aws-ebs-csi-driver/templates/csidriver.yaml
+# Source: powervs-csi-driver/templates/csidriver.yaml
 apiVersion: storage.k8s.io/v1beta1
 kind: CSIDriver
 metadata:
-  name: ebs.csi.aws.com
+  name: powervs.csi.ibm.com
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 spec:
   attachRequired: true
   podInfoOnMount: false

deploy/kubernetes/base/kustomization.yaml

@@ -1,23 +1,23 @@
 ---
-# Source: aws-ebs-csi-driver/templates/node.yaml
+# Source: powervs-csi-driver/templates/node.yaml
 # Node Service
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: ebs-csi-node
   namespace: kube-system
   labels:
-    app.kubernetes.io/name: aws-ebs-csi-driver
+    app.kubernetes.io/name: powervs-csi-driver
 spec:
   selector:
     matchLabels:
       app: ebs-csi-node
-      app.kubernetes.io/name: aws-ebs-csi-driver
+      app.kubernetes.io/name: powervs-csi-driver
   template:
     metadata:
       labels:
         app: ebs-csi-node
-        app.kubernetes.io/name: aws-ebs-csi-driver
+        app.kubernetes.io/name: powervs-csi-driver
     spec:
       affinity:
         nodeAffinity:
@@ -38,7 +38,7 @@ spec:
         - name: ebs-plugin
           securityContext:
             privileged: true
-          image: amazon/aws-ebs-csi-driver:latest
+          image: quay.io/powercloud/powervs-csi-driver:v0.0.1
           args:
             - node
             - --endpoint=$(CSI_ENDPOINT)
@@ -56,6 +56,8 @@ spec:
               mountPath: /csi
             - name: device-dir
               mountPath: /dev
+            - name: sys-dir
+              mountPath: /sys
           ports:
             - name: healthz
               containerPort: 9808
@@ -69,7 +71,7 @@ spec:
             periodSeconds: 10
             failureThreshold: 5
         - name: node-driver-registrar
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1
           args:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
@@ -89,7 +91,7 @@ spec:
             - name: registration-dir
               mountPath: /registration
         - name: liveness-probe
-          image: quay.io/k8scsi/livenessprobe:v1.1.0
+          image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0
           args:
             - --csi-address=/csi/csi.sock
           volumeMounts:
@@ -112,3 +114,7 @@ spec:
           hostPath:
             path: /dev
             type: Directory
+        - name: sys-dir
+          hostPath:
+            path: /sys
+            type: Directory