github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Moved nil check inside AlphaFeatureGate.Enabled

Browse Source
This commit is contained in:
Pavithra Ramesh 2019-08-02 10:34:02 -07:00
parent da887e85e9
commit 501081e64f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/legacy-cloud-providers/gce/gce_alpha.go
View File

@ -38,6 +38,9 @@ type AlphaFeatureGate struct {
// Enabled returns true if the provided alpha feature is enabled // Enabled returns true if the provided alpha feature is enabled
func (af *AlphaFeatureGate) Enabled(key string) bool { func (af *AlphaFeatureGate) Enabled(key string) bool {
if af == nil || af.features == nil {
return false
}
return af.features[key] return af.features[key]
} }

8
staging/src/k8s.io/legacy-cloud-providers/gce/gce_loadbalancer_internal.go
View File

@ -36,12 +36,8 @@ const (
allInstances = "ALL" allInstances = "ALL"
) )
func (g *Cloud) usesSubsets() bool {
return g.AlphaFeatureGate != nil && g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets)
}
func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) { func (g *Cloud) ensureInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, existingFwdRule *compute.ForwardingRule, nodes []*v1.Node) (*v1.LoadBalancerStatus, error) {
if g.usesSubsets() { if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) {
return nil, cloudprovider.ImplementedElsewhere return nil, cloudprovider.ImplementedElsewhere
} }
@ -210,7 +206,7 @@ func (g *Cloud) clearPreviousInternalResources(svc *v1.Service, loadBalancerName
// updateInternalLoadBalancer is called when the list of nodes has changed. Therefore, only the instance groups // updateInternalLoadBalancer is called when the list of nodes has changed. Therefore, only the instance groups
// and possibly the backend service need to be updated. // and possibly the backend service need to be updated.
func (g *Cloud) updateInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, nodes []*v1.Node) error { func (g *Cloud) updateInternalLoadBalancer(clusterName, clusterID string, svc *v1.Service, nodes []*v1.Node) error {
if g.usesSubsets() { if g.AlphaFeatureGate.Enabled(AlphaFeatureILBSubsets) {
return cloudprovider.ImplementedElsewhere return cloudprovider.ImplementedElsewhere
} }
g.sharedResourceLock.Lock() g.sharedResourceLock.Lock()