Merge pull request #1277 from bfournie/fwdrule-setlabels

Use SetLabels() to set ForwardingRules labels

Author: k8s-ci-robot

cloud/services/compute/loadbalancers/reconcile.go

@@ -579,6 +579,18 @@ func (s *Service) createOrGetForwardingRule(ctx context.Context, lbname string,
 		}
 	}
 
+	// Labels on ForwardingRules must be added after resource is created
+	labels := s.scope.AdditionalLabels()
+	if !labels.Equals(forwarding.Labels) {
+		setLabelsRequest := &compute.GlobalSetLabelsRequest{
+			LabelFingerprint: forwarding.LabelFingerprint,
+			Labels:           labels,
+		}
+		if err = s.forwardingrules.SetLabels(ctx, key, setLabelsRequest); err != nil {
+			return nil, err
+		}
+	}
+
 	return forwarding, nil
 }
 
@@ -622,6 +634,18 @@ func (s *Service) createOrGetRegionalForwardingRule(ctx context.Context, lbname
 		}
 	}
 
+	// Labels on ForwardingRules must be added after resource is created
+	labels := s.scope.AdditionalLabels()
+	if !labels.Equals(forwarding.Labels) {
+		setLabelsRequest := &compute.RegionSetLabelsRequest{
+			LabelFingerprint: forwarding.LabelFingerprint,
+			Labels:           labels,
+		}
+		if err = s.regionalforwardingrules.SetLabels(ctx, key, setLabelsRequest); err != nil {
+			return nil, err
+		}
+	}
+
 	return forwarding, nil
 }
 

cloud/services/compute/loadbalancers/service.go

@@ -44,6 +44,14 @@ type forwardingrulesInterface interface {
 	Get(ctx context.Context, key *meta.Key, options ...k8scloud.Option) (*compute.ForwardingRule, error)
 	Insert(ctx context.Context, key *meta.Key, obj *compute.ForwardingRule, options ...k8scloud.Option) error
 	Delete(ctx context.Context, key *meta.Key, options ...k8scloud.Option) error
+	SetLabels(ctx context.Context, key *meta.Key, obj *compute.GlobalSetLabelsRequest, options ...k8scloud.Option) error
+}
+
+type regionalforwardingrulesInterface interface {
+	Get(ctx context.Context, key *meta.Key, options ...k8scloud.Option) (*compute.ForwardingRule, error)
+	Insert(ctx context.Context, key *meta.Key, obj *compute.ForwardingRule, options ...k8scloud.Option) error
+	Delete(ctx context.Context, key *meta.Key, options ...k8scloud.Option) error
+	SetLabels(ctx context.Context, key *meta.Key, obj *compute.RegionSetLabelsRequest, options ...k8scloud.Option) error
 }
 
 type healthchecksInterface interface {
@@ -89,7 +97,7 @@ type Service struct {
 	backendservices         backendservicesInterface
 	regionalbackendservices backendservicesInterface
 	forwardingrules         forwardingrulesInterface
-	regionalforwardingrules forwardingrulesInterface
+	regionalforwardingrules regionalforwardingrulesInterface
 	healthchecks            healthchecksInterface
 	regionalhealthchecks    healthchecksInterface
 	instancegroups          instancegroupsInterface