Merge pull request #371 from oracle/pull_internal_119

Backlog of changes from OKE - upgrade to k8s vendor 1.19

Author: mrunalpagnis

.github/workflows/release.yaml

@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  push:
+    # Build and publish artifacts for a release
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: arm64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Log into GitHub Container Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${GITHUB_ACTOR,,} --password-stdin
+
+      - name: Build Image
+        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make image
+
+      - name: Push Image
+        run: OSS_REGISTRY="ghcr.io/oracle" VERSION="${{ github.ref_name }}" make docker-push-all

Dockerfile

@@ -14,7 +14,7 @@
 
 ARG CI_IMAGE_REGISTRY
 
-FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.4
+FROM ${CI_IMAGE_REGISTRY}/oci-kube-ci:1.0.5
 
 ARG COMPONENT
 

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)

README.md

@@ -22,18 +22,14 @@ cloud-provider specific code out of the Kubernetes codebase.
 
 ## Compatibility matrix
 
-|           | Kubernetes 1.16        | Kubernetes 1.17        | Kubernetes 1.18        | Kubernetes 1.19        | Kubernetes 1.20        |
-|-----------|------------------------|------------------------|------------------------|------------------------|------------------------|
-| \>=v 0.9  | ✓                      | ✓                      | ✓                      | †                      | †                      |
-| \>=v 0.10 | ✓                      | ✓                      | ✓                      | †                      | †                      |
-| \>=v 0.11 | ✓                      | ✓                      | ✓                      | †                      | †                      |
-| \>=v 0.12 | †                      | †                      | ✓                      | ✓                      | ✓                      |
+|           | Min Kubernetes Version      | Max Kubernetes Version       |
+|-----------|-----------------------------|------------------------------|
+| \>=v 0.11 | v1.16                       | v1.18                        |
+| \>=v 0.12 | v1.18                       | v1.21                        |
+| \>=v 0.13 | v1.19                       | v1.21                        |
 
-Key:
-
- * `✓` oci-cloud-controller-manager is fully compatible.
- * `✗` oci-cloud-controller-manager is not compatible.
- * `†` Not tested with given version.
+Note: 
+Versions older than v0.13.0 are no longer supported, new features / bug fixes will be available in v0.13.0 and later. 
 
 ## Implementation
  Currently `oci-cloud-controller-manager` implements:
@@ -97,19 +93,20 @@ For CCM -
 ```bash
 $ kubectl  create secret generic oci-cloud-controller-manager \
      -n kube-system                                           \
-     --from-file=cloud-provider.yaml=cloud-provider-example.yaml
+     --from-file=cloud-provider.yaml=provider-config-example.yaml
 ```
 Note that you must ensure the secret contains the key `cloud-provider.yaml`
 rather than the name of the file on disk.
 
 ### Deployment
 
 Deploy the controller manager and associated RBAC rules if your cluster
-is configured to use RBAC:
+is configured to use RBAC (replace ? with the version you want to install to):
 
 ```bash
-$ kubectl apply -f https://raw.githubusercontent.com/oracle/oci-cloud-controller-manager/master/manifests/cloud-controller-manager/oci-cloud-controller-manager.yaml
-$ kubectl apply -f https://raw.githubusercontent.com/oracle/oci-cloud-controller-manager/master/manifests/cloud-controller-manager/oci-cloud-controller-manager-rbac.yaml
+$ export RELEASE=?
+$ kubectl apply -f https://github.com/oracle/oci-cloud-controller-manager/releases/download/${RELEASE}/oci-cloud-controller-manager-rbac.yaml
+$ kubectl apply -f https://github.com/oracle/oci-cloud-controller-manager/releases/download/${RELEASE}/oci-cloud-controller-manager.yaml
 ```
 
 Check the CCM logs to ensure it's running correctly:

VERSION

@@ -0,0 +1 @@
+1.19

ci-docker-images/Dockerfile

@@ -22,50 +22,31 @@ RUN yum install oracle-softwarecollection-release-el7 -y \
     make \
     openssl \
     pwgen \
-    python \
+    python3 \
     wget \
     python-yaml \
     unzip && \
     yum clean all && rm -rf /var/cache/yum
 
-RUN wget https://bootstrap.pypa.io/get-pip.py
-RUN python get-pip.py
+RUN wget https://bootstrap.pypa.io/pip/3.6/get-pip.py
+RUN python3 get-pip.py
 
 # Install golang environment
-RUN curl https://storage.googleapis.com/golang/go1.12.17.linux-amd64.tar.gz -O && \
+RUN curl https://storage.googleapis.com/golang/go1.15.12.linux-amd64.tar.gz -O && \
     mkdir /tools && \
-    tar xzf go1.12.17.linux-amd64.tar.gz -C /tools && \
-    rm go1.12.17.linux-amd64.tar.gz && \
+    tar xzf go1.15.12.linux-amd64.tar.gz -C /tools && \
+    rm go1.15.12.linux-amd64.tar.gz && \
     mkdir -p /go/bin
 
 ENV PATH=/tools/go/bin:/go/bin:/tools/linux-amd64:$PATH \
     GOPATH=/go \
     GOROOT=/tools/go
 
 # Install the kubectl client
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/amd64/kubectl && \
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/amd64/kubectl && \
     chmod +x ./kubectl && \
     mv ./kubectl /usr/local/bin/kubectl
 
-# Install Ginkgo
-RUN go get -u github.com/onsi/ginkgo/ginkgo && \
-    go get -u github.com/onsi/gomega/...
-
-# Install golint
-RUN go get -u golang.org/x/lint/golint
-
-# Install Terraform
-RUN curl https://releases.hashicorp.com/terraform/0.10.7/terraform_0.10.7_linux_amd64.zip -LO && \
-    unzip terraform_0.10.7_linux_amd64.zip && \
-    mv terraform /usr/bin && \
-    rm -f terraform terraform_0.10.7_linux_amd64.zip
-
-# Installs the OCI terraform provider
-RUN curl -LO https://github.com/oracle/terraform-provider-oci/releases/download/2.0.2/linux.tar.gz && \
-    tar -xvf linux.tar.gz -C / && \
-    echo "providers { oci = \"/linux_amd64/terraform-provider-oci_v2.0.2\" }" > ~/.terraformrc && \
-    rm -f linux.tar.gz
-
 # Install OCI client
 RUN pip install \
     oci \

cmd/oci-cloud-controller-manager/main.go

@@ -27,9 +27,9 @@ import (
 	"go.uber.org/zap"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
+	_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
+	_ "k8s.io/component-base/metrics/prometheus/version"    // for version metric registration
 	"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
-	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration
-	_ "k8s.io/kubernetes/pkg/version/prometheus"        // for version metric registration
 )
 
 var version string

cmd/oci-csi-controller-driver/csi-controller-driver/oci-csi-controller-driver.go

@@ -27,7 +27,8 @@ func StartControllerDriver(csiOptions csioptions.CSIOptions) {
 	logger := logging.Logger().Sugar()
 	logger.Sync()
 
-	drv, err := driver.NewControllerDriver(logger, csiOptions.Endpoint, csiOptions.Kubeconfig, csiOptions.Master)
+	drv, err := driver.NewControllerDriver(logger.Named("BV"), csiOptions.Endpoint, csiOptions.Kubeconfig, csiOptions.Master,
+		true, driver.BlockVolumeDriverName, driver.BlockVolumeDriverVersion)
 	if err != nil {
 		logger.With(zap.Error(err)).Fatal("Failed to create controller driver.")
 	}

cmd/oci-csi-controller-driver/csioptions/csioptions.go

@@ -44,6 +44,7 @@ type CSIOptions struct {
 	MetricsPath             string
 	ExtraCreateMetadata     bool
 	ReconcileSync           time.Duration
+	EnableResizer           bool
 }
 
 //NewCSIOptions initializes the flag
@@ -71,6 +72,7 @@ func NewCSIOptions() *CSIOptions {
 		MetricsPath:             *flag.String("metrics-path", "/metrics", "The HTTP path where prometheus metrics will be exposed. Default is `/metrics`."),
 		ExtraCreateMetadata:     *flag.Bool("extra-create-metadata", false, "If set, add pv/pvc metadata to plugin create requests as parameters."),
 		ReconcileSync:           *flag.Duration("reconcile-sync", 1*time.Minute, "Resync interval of the VolumeAttachment reconciler."),
+		EnableResizer:           *flag.Bool("csi-bv-expansion-enabled", false, "Enables go routine csi-resizer."),
 	}
 	return &csioptions
 }