Merge pull request #176 from chengxiangdong/release-1.20

Update all K8s dependencies to v1.20

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

@@ -20,29 +20,84 @@ limitations under the License.
 package main
 
 import (
+	"encoding/json"
+	goflag "flag"
+	"fmt"
 	"math/rand"
 	"os"
 	"time"
 
+	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/util/wait"
+	cloudprovider "k8s.io/cloud-provider"
+	"k8s.io/cloud-provider/app"
+	"k8s.io/cloud-provider/app/config"
+	"k8s.io/cloud-provider/options"
+	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/logs"
-	"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
+	_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
+	_ "k8s.io/component-base/metrics/prometheus/version"    // for version metric registration
+	"k8s.io/klog/v2"
+	_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
 
 	_ "sigs.k8s.io/cloud-provider-huaweicloud/pkg/cloudprovider/huaweicloud"
 )
 
 func main() {
 	rand.Seed(time.Now().UnixNano())
 
-	command := app.NewCloudControllerManagerCommand()
+	ccmOptions, err := options.NewCloudControllerManagerOptions()
+	if err != nil {
+		klog.Fatalf("unable to initialize command options: %v", err)
+	}
+
+	fss := cliflag.NamedFlagSets{}
+	command := app.NewCloudControllerManagerCommand(ccmOptions, 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
 	// normalize func and add the go flag set by hand.
+	// Here is an sample
+	pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
+	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
+
 	// utilflag.InitFlags()
 	logs.InitLogs()
 	defer logs.FlushLogs()
 
 	if err := command.Execute(); err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
 		os.Exit(1)
 	}
 }
+
+func cloudInitializer(config *config.CompletedConfig) cloudprovider.Interface {
+	cloudConfig := config.ComponentConfig.KubeCloudShared.CloudProvider
+	logPrint("cloudConfig: ", cloudConfig)
+	// 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
+}
+
+func logPrint(s string, a any) {
+	b, err := json.Marshal(a)
+	if err != nil {
+		klog.ErrorDepth(1, fmt.Sprintf("error print object: %s", err))
+		return
+	}
+	klog.Infof("%s%s", s, string(b))
+}

go.mod

@@ -8,17 +8,18 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/onsi/ginkgo/v2 v2.1.4
 	github.com/onsi/gomega v1.19.0
-	google.golang.org/grpc v1.27.0
+	github.com/spf13/pflag v1.0.5
+	google.golang.org/grpc v1.27.1
 	gopkg.in/gcfg.v1 v1.2.3
-	k8s.io/api v0.19.14
-	k8s.io/apimachinery v0.19.14
-	k8s.io/client-go v0.19.14
-	k8s.io/cloud-provider v0.19.14
-	k8s.io/component-base v0.19.14
+	k8s.io/api v0.20.15
+	k8s.io/apimachinery v0.20.15
+	k8s.io/client-go v0.20.15
+	k8s.io/cloud-provider v0.20.15
+	k8s.io/component-base v0.20.15
 	k8s.io/klog v1.0.0
-	k8s.io/klog/v2 v2.2.0
-	k8s.io/kubernetes v1.19.14
-	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
+	k8s.io/klog/v2 v2.4.0
+	k8s.io/kubernetes v1.20.15
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 )
 
 require (
@@ -27,13 +28,12 @@ require (
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/blang/semver v3.5.0+incompatible // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
 	github.com/evanphx/json-patch v4.9.0+incompatible // indirect
 	github.com/go-logr/logr v0.2.0 // indirect
@@ -42,11 +42,11 @@ require (
 	github.com/go-openapi/spec v0.19.3 // indirect
 	github.com/go-openapi/swag v0.19.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.1.1 // indirect
+	github.com/google/uuid v1.1.2 // indirect
 	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.1 // indirect
@@ -60,65 +60,65 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.7.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.10.0 // indirect
-	github.com/prometheus/procfs v0.1.3 // indirect
+	github.com/prometheus/procfs v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.6.0 // indirect
-	github.com/spf13/cobra v1.0.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 // indirect
+	github.com/spf13/cobra v1.1.1 // indirect
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 // indirect
 	go.uber.org/atomic v1.4.0 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
 	go.uber.org/zap v1.10.0 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
-	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
 	google.golang.org/appengine v1.6.5 // indirect
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
-	gopkg.in/square/go-jose.v2 v2.2.2 // indirect
 	gopkg.in/warnings.v0 v0.1.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiserver v0.19.14 // indirect
-	k8s.io/kube-controller-manager v0.0.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15 // indirect
+	k8s.io/apiserver v0.20.15 // indirect
+	k8s.io/controller-manager v0.20.15 // indirect
+	k8s.io/kube-openapi v0.0.0-20211110013926-83f114cd0513 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.19.14
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.14
-	k8s.io/apimachinery => k8s.io/apimachinery v0.19.14
-	k8s.io/apiserver => k8s.io/apiserver v0.19.14
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.14
-	k8s.io/client-go => k8s.io/client-go v0.19.14
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.14
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.14
-	k8s.io/code-generator => k8s.io/code-generator v0.19.14
-	k8s.io/component-base => k8s.io/component-base v0.19.14
-	k8s.io/cri-api => k8s.io/cri-api v0.19.14
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.14
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.14
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.14
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.14
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.14
-	k8s.io/kubectl => k8s.io/kubectl v0.19.14
-	k8s.io/kubelet => k8s.io/kubelet v0.19.14
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.14
-	k8s.io/metrics => k8s.io/metrics v0.19.14
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.14
+	k8s.io/api => k8s.io/api v0.20.15
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.15
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.15
+	k8s.io/apiserver => k8s.io/apiserver v0.20.15
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.15
+	k8s.io/client-go => k8s.io/client-go v0.20.15
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.15
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.15
+	k8s.io/code-generator => k8s.io/code-generator v0.20.15
+	k8s.io/component-base => k8s.io/component-base v0.20.15
+	k8s.io/component-helpers => k8s.io/component-helpers v0.20.15
+	k8s.io/controller-manager => k8s.io/controller-manager v0.20.15
+	k8s.io/cri-api => k8s.io/cri-api v0.20.15
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.15
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.15
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.15
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.15
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.15
+	k8s.io/kubectl => k8s.io/kubectl v0.20.15
+	k8s.io/kubelet => k8s.io/kubelet v0.20.15
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.15
+	k8s.io/metrics => k8s.io/metrics v0.20.15
+	k8s.io/mount-utils => k8s.io/mount-utils v0.20.15
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.15
 )