From 854b74d9e2c4d62302eb056003f488e43dfb3201 Mon Sep 17 00:00:00 2001 From: changshuchao Date: Thu, 26 Nov 2020 00:54:45 +0800 Subject: [PATCH] Optimize some irregular variable names Signed-off-by: changshuchao --- cmd/cloud-controller-manager/main.go | 10 ++++---- .../nodeipamcontroller.go | 24 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cmd/cloud-controller-manager/main.go b/cmd/cloud-controller-manager/main.go index 27860fe1fd8..5629c22a092 100644 --- a/cmd/cloud-controller-manager/main.go +++ b/cmd/cloud-controller-manager/main.go @@ -103,16 +103,16 @@ func main() { //delete(controllerInitializers, "cloud-node-lifecycle") // Here is an example to add an controller(NodeIpamController) which will be used by cloud provider - // generate nodeipamconfig. Here is an sample code. Please pass the right parameter in your code. + // generate nodeIPAMConfig. Here is an sample code. Please pass the right parameter in your code. // If you do not need additional controller, please ignore. - nodeipamconfig := nodeipamconfig.NodeIPAMControllerConfiguration{ + nodeIPAMConfig := nodeipamconfig.NodeIPAMControllerConfiguration{ ServiceCIDR: "sample", SecondaryServiceCIDR: "sample", NodeCIDRMaskSize: 11, NodeCIDRMaskSizeIPv4: 11, NodeCIDRMaskSizeIPv6: 111, } - controllerInitializers["nodeipam"] = startNodeIpamControllerWrapper(c.Complete(), nodeipamconfig, cloud) + controllerInitializers["nodeipam"] = startNodeIpamControllerWrapper(c.Complete(), nodeIPAMConfig, cloud) command := app.NewCloudControllerManagerCommand(s, c, controllerInitializers) @@ -137,8 +137,8 @@ func main() { } } -func startNodeIpamControllerWrapper(ccmconfig *cloudcontrollerconfig.CompletedConfig, nodeipamconfig nodeipamconfig.NodeIPAMControllerConfiguration, cloud cloudprovider.Interface) func(ctx genericcontrollermanager.ControllerContext) (http.Handler, bool, error) { +func startNodeIpamControllerWrapper(ccmconfig *cloudcontrollerconfig.CompletedConfig, nodeIPAMConfig nodeipamconfig.NodeIPAMControllerConfiguration, cloud cloudprovider.Interface) func(ctx genericcontrollermanager.ControllerContext) (http.Handler, bool, error) { return func(ctx genericcontrollermanager.ControllerContext) (http.Handler, bool, error) { - return startNodeIpamController(ccmconfig, nodeipamconfig, ctx, cloud) + return startNodeIpamController(ccmconfig, nodeIPAMConfig, ctx, cloud) } } diff --git a/cmd/cloud-controller-manager/nodeipamcontroller.go b/cmd/cloud-controller-manager/nodeipamcontroller.go index c47cbd3bc98..b96fa6c80c7 100644 --- a/cmd/cloud-controller-manager/nodeipamcontroller.go +++ b/cmd/cloud-controller-manager/nodeipamcontroller.go @@ -45,17 +45,17 @@ const ( defaultNodeMaskCIDRIPv6 = 64 ) -func startNodeIpamController(ccmconfig *cloudcontrollerconfig.CompletedConfig, nodeipamconfig nodeipamconfig.NodeIPAMControllerConfiguration, ctx genericcontrollermanager.ControllerContext, cloud cloudprovider.Interface) (http.Handler, bool, error) { +func startNodeIpamController(ccmConfig *cloudcontrollerconfig.CompletedConfig, nodeIPAMConfig nodeipamconfig.NodeIPAMControllerConfiguration, ctx genericcontrollermanager.ControllerContext, cloud cloudprovider.Interface) (http.Handler, bool, error) { var serviceCIDR *net.IPNet var secondaryServiceCIDR *net.IPNet // should we start nodeIPAM - if !ccmconfig.ComponentConfig.KubeCloudShared.AllocateNodeCIDRs { + if !ccmConfig.ComponentConfig.KubeCloudShared.AllocateNodeCIDRs { return nil, false, nil } // failure: bad cidrs in config - clusterCIDRs, dualStack, err := processCIDRs(ccmconfig.ComponentConfig.KubeCloudShared.ClusterCIDR) + clusterCIDRs, dualStack, err := processCIDRs(ccmConfig.ComponentConfig.KubeCloudShared.ClusterCIDR) if err != nil { return nil, false, err } @@ -76,17 +76,17 @@ func startNodeIpamController(ccmconfig *cloudcontrollerconfig.CompletedConfig, n } // service cidr processing - if len(strings.TrimSpace(nodeipamconfig.ServiceCIDR)) != 0 { - _, serviceCIDR, err = net.ParseCIDR(nodeipamconfig.ServiceCIDR) + if len(strings.TrimSpace(nodeIPAMConfig.ServiceCIDR)) != 0 { + _, serviceCIDR, err = net.ParseCIDR(nodeIPAMConfig.ServiceCIDR) if err != nil { - klog.Warningf("Unsuccessful parsing of service CIDR %v: %v", nodeipamconfig.ServiceCIDR, err) + klog.Warningf("Unsuccessful parsing of service CIDR %v: %v", nodeIPAMConfig.ServiceCIDR, err) } } - if len(strings.TrimSpace(nodeipamconfig.SecondaryServiceCIDR)) != 0 { - _, secondaryServiceCIDR, err = net.ParseCIDR(nodeipamconfig.SecondaryServiceCIDR) + if len(strings.TrimSpace(nodeIPAMConfig.SecondaryServiceCIDR)) != 0 { + _, secondaryServiceCIDR, err = net.ParseCIDR(nodeIPAMConfig.SecondaryServiceCIDR) if err != nil { - klog.Warningf("Unsuccessful parsing of service CIDR %v: %v", nodeipamconfig.SecondaryServiceCIDR, err) + klog.Warningf("Unsuccessful parsing of service CIDR %v: %v", nodeIPAMConfig.SecondaryServiceCIDR, err) } } @@ -111,11 +111,11 @@ func startNodeIpamController(ccmconfig *cloudcontrollerconfig.CompletedConfig, n 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(nodeipamconfig) + nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6, err = setNodeCIDRMaskSizesDualStack(nodeIPAMConfig) } else { // only --node-cidr-mask-size supported with single stack clusters. // --node-cidr-mask-size-ipv4 and --node-cidr-mask-size-ipv6 flags are incompatible with dual stack clusters. - nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6, err = setNodeCIDRMaskSizes(nodeipamconfig) + nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6, err = setNodeCIDRMaskSizes(nodeIPAMConfig) } if err != nil { @@ -133,7 +133,7 @@ func startNodeIpamController(ccmconfig *cloudcontrollerconfig.CompletedConfig, n serviceCIDR, secondaryServiceCIDR, nodeCIDRMaskSizes, - ipam.CIDRAllocatorType(ccmconfig.ComponentConfig.KubeCloudShared.CIDRAllocatorType), + ipam.CIDRAllocatorType(ccmConfig.ComponentConfig.KubeCloudShared.CIDRAllocatorType), ) if err != nil { return nil, true, err