From dddd631706b01a9f284567e7cb7ed39805a43343 Mon Sep 17 00:00:00 2001 From: hwdef Date: Tue, 3 Dec 2019 11:16:24 +0800 Subject: [PATCH] cmd/kube-controller-manager: fix staticcheck warning --- cmd/kube-controller-manager/app/controllermanager.go | 2 +- cmd/kube-controller-manager/app/core.go | 9 ++++----- hack/.staticcheck_failures | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 6d026bf47bd..fa6df853c4e 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -420,7 +420,7 @@ func NewControllerInitializers(loopMode ControllerLoopMode) map[string]InitFunc func GetAvailableResources(clientBuilder controller.ControllerClientBuilder) (map[schema.GroupVersionResource]bool, error) { client := clientBuilder.ClientOrDie("controller-discovery") discoveryClient := client.Discovery() - resourceMap, err := discoveryClient.ServerResources() + _, resourceMap, err := discoveryClient.ServerGroupsAndResources() if err != nil { utilruntime.HandleError(fmt.Errorf("unable to get all supported resources from server: %v", err)) } diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 240259ed43d..b2f38f4d4f9 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -64,7 +64,6 @@ import ( "k8s.io/kubernetes/pkg/controller/volume/pvcprotection" "k8s.io/kubernetes/pkg/controller/volume/pvprotection" "k8s.io/kubernetes/pkg/features" - kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/quota/v1/generic" quotainstall "k8s.io/kubernetes/pkg/quota/v1/install" "k8s.io/kubernetes/pkg/volume/csimigration" @@ -111,7 +110,7 @@ func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) } // failure: more than one cidr and dual stack is not enabled - if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.IPv6DualStack) { + if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) { return nil, false, fmt.Errorf("len of ClusterCIDRs==%v and dualstack feature is not enabled", len(clusterCIDRs)) } @@ -143,7 +142,7 @@ func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) // the following checks are triggered if both serviceCIDR and secondaryServiceCIDR are provided if serviceCIDR != nil && secondaryServiceCIDR != nil { // should have dual stack flag enabled - if !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.IPv6DualStack) { + if !utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) { return nil, false, fmt.Errorf("secondary service cidr is provided and IPv6DualStack feature is not enabled") } @@ -158,7 +157,7 @@ func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) } var nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6 int - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.IPv6DualStack) { + if utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) { // only --node-cidr-mask-size-ipv4 and --node-cidr-mask-size-ipv6 supported with dual stack clusters. // --node-cidr-mask-size flag is incompatible with dual stack clusters. nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6, err = setNodeCIDRMaskSizesDualStack(ctx.ComponentConfig.NodeIPAMController) @@ -259,7 +258,7 @@ func startRouteController(ctx ControllerContext) (http.Handler, bool, error) { } // failure: more than one cidr and dual stack is not enabled - if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.IPv6DualStack) { + if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) { return nil, false, fmt.Errorf("len of ClusterCIDRs==%v and dualstack feature is not enabled", len(clusterCIDRs)) } diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index a90443e253d..75b41ad9add 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -1,6 +1,5 @@ cluster/images/etcd-version-monitor cluster/images/etcd/migrate -cmd/kube-controller-manager/app cmd/kube-proxy/app cmd/linkcheck pkg/controller/daemon