CCM upgrade to version 1.22

Author: jayasheelankumar

Makefile

@@ -182,6 +182,17 @@ version:
 .PHONY: build-local
 build-local: build
 
+.PHONY: test-local
+test-local: build-dirs
+	@docker run --rm \
+		   --privileged \
+			 -w $(DOCKER_REPO_ROOT) \
+			 -v $(PWD):$(DOCKER_REPO_ROOT) \
+			 -e COMPONENT="$(COMPONENT)" \
+			 -e GOPATH=/go/ \
+			odo-docker-signed-local.artifactory.oci.oraclecorp.com/odx-oke/oke/k8-manager-base:go1.16.1-1.0.9 \
+			make coverage image
+
 .PHONY: run-ccm-e2e-tests-local
 run-ccm-e2e-tests-local:
 	./hack/run_e2e_test.sh

VERSION

@@ -1 +1 @@
-1.19
+1.22

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

@@ -17,6 +17,10 @@ package main
 import (
 	goflag "flag"
 	"fmt"
+	"k8s.io/apimachinery/pkg/util/wait"
+	cloudprovider "k8s.io/cloud-provider"
+	"k8s.io/cloud-provider/app/config"
+	"k8s.io/cloud-provider/options"
 	"math/rand"
 	"os"
 	"time"
@@ -25,11 +29,12 @@ import (
 	"github.com/oracle/oci-cloud-controller-manager/pkg/logging"
 	"github.com/spf13/pflag"
 	"go.uber.org/zap"
+	"k8s.io/cloud-provider/app"
 	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/klog/v2"
 )
 
 var version string
@@ -42,7 +47,13 @@ func main() {
 	defer logger.Sync()
 	zap.ReplaceGlobals(logger)
 
-	command := app.NewCloudControllerManagerCommand()
+	s, err := options.NewCloudControllerManagerOptions()
+	if err != nil {
+		logger.With(zap.Error(err)).Fatal("unable to initialize command options")
+	}
+
+	fss := cliflag.NamedFlagSets{}
+	command := app.NewCloudControllerManagerCommand(s, cloudInitializer, app.DefaultInitFuncConstructors, fss, wait.NeverStop)
 
 	// TODO: once we switch everything over to Cobra commands, we can go back to calling
 	// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
@@ -61,3 +72,25 @@ func main() {
 		os.Exit(1)
 	}
 }
+
+func cloudInitializer(config *config.CompletedConfig) cloudprovider.Interface {
+	cloudConfig := config.ComponentConfig.KubeCloudShared.CloudProvider
+	// initialize cloud provider with the cloud provider name and config file provided
+	cloud, err := cloudprovider.InitCloudProvider(cloudConfig.Name, cloudConfig.CloudConfigFile)
+	if err != nil {
+		klog.Fatalf("Cloud provider could not be initialized: %v", err)
+	}
+	if cloud == nil {
+		klog.Fatalf("Cloud provider is nil")
+	}
+
+	if !cloud.HasClusterID() {
+		if config.ComponentConfig.KubeCloudShared.AllowUntaggedCloud {
+			klog.Warning("detected a cluster without a ClusterID.  A ClusterID will be required in the future.  Please tag your cluster to avoid any future issues")
+		} else {
+			klog.Fatalf("no ClusterID found.  A ClusterID is required for the cloud provider to function properly.  This check can be bypassed by setting the allow-untagged-cloud option")
+		}
+	}
+
+	return cloud
+}

cmd/oci-csi-node-driver/nodedriveroptions/nodecsioptions.go

@@ -27,12 +27,12 @@ type NodeCSIOptions struct {
 }
 
 type NodeOptions struct {
-	Name					string
-	Endpoint				string
-	NodeID					string
-	Kubeconfig				string
-	Master					string
-	DriverName				string
-	DriverVersion			string
-	EnableControllerServer	bool
+	Name                   string
+	Endpoint               string
+	NodeID                 string
+	Kubeconfig             string
+	Master                 string
+	DriverName             string
+	DriverVersion          string
+	EnableControllerServer bool
 }

go.mod

@@ -1,38 +1,42 @@
 module github.com/oracle/oci-cloud-controller-manager
 
-go 1.15
+go 1.16
 
 replace (
 	github.com/docker/docker => github.com/docker/engine v0.0.0-20181106193140-f5749085e9cb
 	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.11.0
-	google.golang.org/grpc => google.golang.org/grpc v1.26.0
-	k8s.io/api => k8s.io/api v0.19.12
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.12
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.12
-	k8s.io/apiserver => k8s.io/apiserver v0.19.12
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.12
-	k8s.io/client-go => k8s.io/client-go v0.19.12
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.12
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.12
-	k8s.io/code-generator => k8s.io/code-generator v0.19.12
-	k8s.io/component-base => k8s.io/component-base v0.19.12
-	k8s.io/cri-api => k8s.io/cri-api v0.19.12
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.12
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.12
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.12
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.12
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.12
-	k8s.io/kubectl => k8s.io/kubectl v0.19.12
-	k8s.io/kubelet => k8s.io/kubelet v0.19.12
-	k8s.io/kubernetes => k8s.io/kubernetes v1.19.12
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.12
-	k8s.io/metrics => k8s.io/metrics v0.19.12
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.12
+	google.golang.org/grpc => google.golang.org/grpc v1.38.0
+	k8s.io/api => k8s.io/api v0.22.5
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.5
+	k8s.io/apimachinery => k8s.io/apimachinery v0.22.5
+	k8s.io/apiserver => k8s.io/apiserver v0.22.5
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.5
+	k8s.io/client-go => k8s.io/client-go v0.22.5
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.5
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.5
+	k8s.io/code-generator => k8s.io/code-generator v0.22.5
+	k8s.io/component-base => k8s.io/component-base v0.22.5
+	k8s.io/component-helpers => k8s.io/component-helpers v0.22.5
+	k8s.io/controller-manager => k8s.io/controller-manager v0.22.5
+	k8s.io/cri-api => k8s.io/cri-api v0.22.5
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.5
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.5
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.5
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.5
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.5
+	k8s.io/kubectl => k8s.io/kubectl v0.22.5
+	k8s.io/kubelet => k8s.io/kubelet v0.22.5
+	k8s.io/kubernetes => k8s.io/kubernetes v1.22.5
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.5
+	k8s.io/metrics => k8s.io/metrics v0.22.5
+	k8s.io/mount-utils => k8s.io/mount-utils v0.22.5
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.5
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.5
 )
 
 require (
 	github.com/NYTimes/gziphandler v1.0.1 // indirect
-	github.com/container-storage-interface/spec v1.2.0
+	github.com/container-storage-interface/spec v1.5.0
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
@@ -42,24 +46,29 @@ require (
 	github.com/onsi/gomega v1.10.2
 	github.com/oracle/oci-go-sdk/v50 v50.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.9.0
+	github.com/prometheus/client_golang v1.11.0
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.6.3
+	github.com/spf13/viper v1.7.0
 	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.16.0
-	golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
+	go.uber.org/zap v1.17.0
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63
 	golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 	google.golang.org/grpc v1.38.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.19.12
-	k8s.io/apimachinery v0.19.12
-	k8s.io/client-go v0.19.12
-	k8s.io/cloud-provider v0.19.12
-	k8s.io/component-base v0.19.12
+	k8s.io/api v0.22.5
+	k8s.io/apimachinery v0.22.5
+	k8s.io/apiserver v0.22.5
+	k8s.io/client-go v0.22.5
+	k8s.io/cloud-provider v0.22.5
+	k8s.io/component-base v0.22.5
+	k8s.io/csi-translation-lib v0.22.5
 	k8s.io/klog v1.0.0
-	k8s.io/kubernetes v1.19.12
-	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
+	k8s.io/klog/v2 v2.9.0
+	k8s.io/kubelet v0.22.5
+	k8s.io/kubernetes v1.22.5
+	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
 	sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
 )

pkg/cloudprovider/providers/oci/load_balancer.go

@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/sets"
-	k8sports "k8s.io/kubernetes/pkg/master/ports"
+	k8sports "k8s.io/kubernetes/pkg/cluster/ports"
 
 	providercfg "github.com/oracle/oci-cloud-controller-manager/pkg/cloudprovider/providers/oci/config"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"

pkg/cloudprovider/providers/oci/load_balancer_security_lists_test.go

@@ -26,7 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1listers "k8s.io/client-go/listers/core/v1"
 	"k8s.io/client-go/tools/cache"
-	k8sports "k8s.io/kubernetes/pkg/master/ports"
+	k8sports "k8s.io/kubernetes/pkg/cluster/ports"
 )
 
 func TestGetNodeIngressRules(t *testing.T) {

pkg/cloudprovider/providers/oci/util_test.go

@@ -99,19 +99,19 @@ func TestDeepEqualLists(t *testing.T) {
 
 func TestRemoveDuplicatesFromList(t *testing.T) {
 	testCases := map[string]struct {
-		list []string
+		list   []string
 		result []string
-	} {
+	}{
 		"List with Duplicates": {
-			list: []string{"ocid1", "ocid2", "ocid1"},
+			list:   []string{"ocid1", "ocid2", "ocid1"},
 			result: []string{"ocid1", "ocid2"},
 		},
 		"List with irregular order": {
-			list: []string{"a", "c", "b"},
+			list:   []string{"a", "c", "b"},
 			result: []string{"a", "b", "c"},
 		},
 		"List with duplicates and irregular order": {
-			list: []string{"a", "a", "c", "b", "d", "c", "d"},
+			list:   []string{"a", "a", "c", "b", "d", "c", "d"},
 			result: []string{"a", "b", "c", "d"},
 		},
 	}

pkg/csi/driver/controller.go

@@ -804,6 +804,11 @@ func (d *ControllerDriver) ControllerExpandVolume(ctx context.Context, req *csi.
 	}, nil
 }
 
+// ControllerGetVolume returns ControllerGetVolumeResponse response
+func (d *ControllerDriver) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
+	return nil, status.Error(codes.Unimplemented, "ControllerGetVolume is not supported yet")
+}
+
 func provision(log *zap.SugaredLogger, c client.Interface, volName string, volSize int64, availDomainName, compartmentID,
 	backupID, kmsKeyID string, vpusPerGB int64, timeout time.Duration, bvTags *config.TagConfig) (core.Volume, error) {
 

pkg/csi/driver/fss_node.go

@@ -18,8 +18,8 @@ import (
 )
 
 const (
-	mountPath                       = "mount"
-	FipsEnabled                     = "1"
+	mountPath   = "mount"
+	FipsEnabled = "1"
 )
 
 // NodeStageVolume mounts the volume to a staging path on the node.
@@ -32,9 +32,9 @@ func (d FSSNodeDriver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVo
 		return nil, status.Error(codes.InvalidArgument, "Staging path must be provided")
 	}
 
-	mountTargetIP, exportPath  := validateVolumeId(req.VolumeId)
+	mountTargetIP, exportPath := validateVolumeId(req.VolumeId)
 
-	if mountTargetIP == "" || exportPath == ""{
+	if mountTargetIP == "" || exportPath == "" {
 		return nil, status.Error(codes.InvalidArgument, "Invalid Volume ID provided")
 	}
 
@@ -180,7 +180,7 @@ func (d FSSNodeDriver) NodePublishVolume(ctx context.Context, req *csi.NodePubli
 	readOnly := req.GetReadonly()
 	// Use mount.IsNotMountPoint because mounter.IsLikelyNotMountPoint can't detect bind mounts
 	isNotMountPoint, err := mount.IsNotMountPoint(mounter, targetPath)
-	if err != nil{
+	if err != nil {
 		if os.IsNotExist(err) {
 			logger.With("TargetPath", targetPath).Infof("mount point does not exist")
 			// k8s v1.20+ will not create the TargetPath directory
@@ -236,7 +236,7 @@ func (d FSSNodeDriver) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnp
 
 	// Use mount.IsNotMountPoint because mounter.IsLikelyNotMountPoint can't detect bind mounts
 	isNotMountPoint, err := mount.IsNotMountPoint(mounter, targetPath)
-	if err != nil{
+	if err != nil {
 		if os.IsNotExist(err) {
 			logger.With("TargetPath", targetPath).Infof("mount point does not exist")
 			return &csi.NodeUnpublishVolumeResponse{}, nil
@@ -270,9 +270,9 @@ func (d FSSNodeDriver) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnsta
 		return nil, status.Error(codes.InvalidArgument, "Volume ID must be provided")
 	}
 
-	mountTargetIP, exportPath  := validateVolumeId(req.VolumeId)
+	mountTargetIP, exportPath := validateVolumeId(req.VolumeId)
 
-	if mountTargetIP == "" || exportPath == ""{
+	if mountTargetIP == "" || exportPath == "" {
 		return nil, status.Error(codes.InvalidArgument, "Invalid Volume ID provided")
 	}
 
@@ -399,4 +399,3 @@ func (d FSSNodeDriver) NodeGetVolumeStats(ctx context.Context, req *csi.NodeGetV
 func (d FSSNodeDriver) NodeExpandVolume(ctx context.Context, req *csi.NodeExpandVolumeRequest) (*csi.NodeExpandVolumeResponse, error) {
 	return nil, status.Error(codes.Unimplemented, "NodeExpandVolume is not supported yet")
 }
-