Add arm image support and minor bug fix

Author: shyamradhakrishnan

Dockerfile_arm_all

@@ -0,0 +1,24 @@
+ARG CI_IMAGE_REGISTRY
+
+FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.5 as builder
+
+ARG COMPONENT
+
+ENV SRC /go/src/github.com/oracle/oci-cloud-controller-manager
+
+ENV GOPATH /go/
+RUN mkdir -p /go/bin $SRC
+ADD . $SRC
+
+WORKDIR $SRC
+
+RUN ARCH=arm make clean build-arm-all
+
+FROM arm64v8/oraclelinux:7-slim
+
+RUN yum install -y util-linux \
+  && yum install -y e2fsprogs \
+  && yum clean all
+ \
+
+COPY --from=0 /go/src/github.com/oracle/oci-cloud-controller-manager/dist/arm/* /usr/local/bin/

Makefile

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 PKG := github.com/oracle/oci-cloud-controller-manager
 
 ifeq "$(CI_IMAGE_REGISTRY)" ""
@@ -29,6 +28,8 @@ endif
 IMAGE ?= $(OSS_REGISTRY)/cloud-provider-oci
 COMPONENT ?= oci-cloud-controller-manager oci-volume-provisioner oci-flexvolume-driver oci-csi-controller-driver oci-csi-node-driver
 
+ALL_ARCH = amd64 arm64
+
 ifeq "$(VERSION)" ""
     BUILD := $(shell git describe --exact-match 2> /dev/null || git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
     # Allow overriding for release versions else just equal the build (git hash)
@@ -139,13 +140,39 @@ run-volume-provisioner-dev:
 BUILD_ARGS = --build-arg CI_IMAGE_REGISTRY="$(CI_IMAGE_REGISTRY)" --build-arg COMPONENT="$(COMPONENT)"
 image:
 	docker  build $(BUILD_ARGS) \
-		-t $(IMAGE):$(VERSION) .
+		-t $(IMAGE)-amd64:$(VERSION) .
+	docker  build $(BUILD_ARGS) \
+		-t $(IMAGE)-arm64:$(VERSION) -f Dockerfile_arm_all .
 
 .PHONY: push
 push: image
 	docker login --username="${oss_docker_username}" --password="${oss_docker_password}" $(OSS_REGISTRY)
 	docker push $(IMAGE):$(VERSION)
 
+.PHONY: build
+build-arm-all: build-dirs
+	@for component in $(COMPONENT); do \
+    	GOOS=$(GOOS) GOARCH=arm64 CGO_ENABLED=0 go build -o dist/arm/$$component -ldflags "-X main.version=$(VERSION) -X main.build=$(BUILD)" ./cmd/$$component ; \
+    done
+
+.PHONY: docker-push
+docker-push: ## Push the docker image
+	docker push $(IMAGE)-$(ARCH):$(VERSION)
+
+docker-push-%:
+	$(MAKE) ARCH=$* docker-push
+
+.PHONY: docker-push-all ## Push all the architecture docker images
+docker-push-all: $(addprefix docker-push-,$(ALL_ARCH))
+	$(MAKE) docker-push-manifest
+
+.PHONY: docker-push-manifest
+docker-push-manifest: ## Push the fat manifest docker image.
+	## Minimum docker version 18.06.0 is required for creating and pushing manifest images.
+	docker manifest create --amend $(IMAGE):$(VERSION) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(VERSION)~g")
+	@for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${VERSION} ${IMAGE}-$${arch}:${VERSION}; done
+	docker manifest push --purge ${IMAGE}:${VERSION}
+
 .PHONY: version
 version:
 	@echo $(VERSION)

manifests/cloud-controller-manager/oci-cloud-controller-manager-rbac.yaml

@@ -5,7 +5,7 @@ metadata:
   name: cloud-controller-manager
   namespace: kube-system
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: system:cloud-controller-manager
@@ -137,7 +137,7 @@ rules:
   - patch
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: oci-cloud-controller-manager
 roleRef:

manifests/container-storage-interface/oci-csi-controller-driver.yaml

@@ -22,14 +22,13 @@ spec:
         node-role.kubernetes.io/master: ""
       containers:
         - name: csi-volume-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.6.0
+          image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --volume-name-prefix=csi
             - --feature-gates=Topology=true
             - --timeout=120s
-            - --enable-leader-election=true
-            - --leader-election-type=leases
+            - --leader-election
             - --leader-election-namespace=kube-system
           volumeMounts:
             - name: config
@@ -38,7 +37,7 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v2.2.0
+          image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0
           args:
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --timeout=120s
@@ -51,9 +50,8 @@ spec:
             - mountPath: /var/run/shared-tmpfs
               name: shared-tmpfs
         - name: csi-resizer
-          image: quay.io/k8scsi/csi-resizer:v1.0.1
+          image: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0
           args:
-            - --v=5
             - --csi-address=/var/run/shared-tmpfs/csi.sock
             - --leader-election
           imagePullPolicy: "IfNotPresent"

manifests/container-storage-interface/oci-csi-node-driver.yaml

@@ -144,7 +144,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/blockvolume.csi.oraclecloud.com/csi.sock
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
           securityContext:
             privileged: true
           lifecycle:
@@ -163,7 +163,7 @@ spec:
           args:
             - --csi-address=/fss/csi.sock
             - --kubelet-registration-path=/var/lib/kubelet/plugins/fss.csi.oraclecloud.com/csi.sock
-          image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
+          image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.5.0
           securityContext:
             privileged: true
           lifecycle:
@@ -180,8 +180,6 @@ spec:
               name: registration-dir
       dnsPolicy: ClusterFirst
       hostNetwork: true
-      imagePullSecrets:
-        - name: image-pull-secret
       restartPolicy: Always
       schedulerName: default-scheduler
       serviceAccount: csi-oci-node-sa

manifests/container-storage-interface/storage-class.yaml

@@ -6,3 +6,13 @@ provisioner: blockvolume.csi.oraclecloud.com
 volumeBindingMode: WaitForFirstConsumer
 allowVolumeExpansion: true
 reclaimPolicy: Delete
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: oci-bv-encrypted
+provisioner: blockvolume.csi.oraclecloud.com
+parameters:
+  attachment-type: "paravirtualized"
+reclaimPolicy: Delete
+volumeBindingMode: WaitForFirstConsumer

pkg/csi/driver/controller.go

@@ -427,7 +427,8 @@ func (d *ControllerDriver) ControllerPublishVolume(ctx context.Context, req *csi
 				return nil, status.Errorf(codes.Internal, "Failed to attach volume to node. "+
 					"The volume is already attached to another node.")
 			}
-			if volumeAttached.GetLifecycleState() == core.VolumeAttachmentLifecycleStateAttaching {
+			if volumeAttached.GetLifecycleState() == core.VolumeAttachmentLifecycleStateAttaching ||
+				volumeAttached.GetLifecycleState() == core.VolumeAttachmentLifecycleStateAttached {
 				log.Info("Volume is ATTACHING to node.")
 				volumeAttached, err = d.client.Compute().WaitForVolumeAttached(ctx, *volumeAttached.GetId())
 				if err != nil {
@@ -754,8 +755,8 @@ func (d *ControllerDriver) ControllerExpandVolume(ctx context.Context, req *csi.
 	}
 
 	updateVolumeDetails := core.UpdateVolumeDetails{
-		DisplayName:       volume.DisplayName,
-		SizeInGBs:         &newSizeInGB,
+		DisplayName: volume.DisplayName,
+		SizeInGBs:   &newSizeInGB,
 	}
 
 	volume, err = d.client.BlockStorage().UpdateVolume(ctx, volumeId, updateVolumeDetails)