Change:
PR service patch methods to Once there is a release with that PR included, the code in service-controller and legacy-cloud-providers/gce can be updated to use those. /area platform/gce /assign
/sig network
/triage unresolved Comment when the issue is assessed and confirmed. I am a bot run by vllry. ‍
/remove-triage unresolved
Those labels are not set on the issue: <detailsIn response to : /remove-triage unresolved Instructions for interacting with me using PR comments are available . If you have questions or suggestions related to my behavior, please file an issue against the repository. </details
Created a PR to use these new functions in Service-controllers.

Discussion:
srcs = [ "controller.go", "doc.go", <del> "patch.go", </del> ], importpath = "k8s.io/kubernetes/pkg/controller/service", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", <del> "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", </del> "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", <del> "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", </del> "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", <del> "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library", </del> "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/client-go/informers/core/v1:go_default_library",

go_test( name = "go_default_test", <del> srcs = [ "controller_test.go", "patch_test.go", ], </del> <ins> srcs = ["controller_test.go"], </ins> embed = [":go_default_library"], deps = [ "//pkg/controller:go_default_library",

updated.ObjectMeta.Finalizers = append(updated.ObjectMeta.Finalizers, servicehelper.LoadBalancerCleanupFinalizer) klog.V(2).Infof("Adding finalizer to service %s/%s", updated.Namespace, updated.Name) <del> // TODO(87447) use PatchService from k8s.io/cloud-provider/service/helpers _, err := patch(s.kubeClient.CoreV1(), service, updated) </del> <ins> _, err := servicehelper.PatchService(s.kubeClient.CoreV1(), service, updated) </ins> return err }

updated.ObjectMeta.Finalizers = removeString(updated.ObjectMeta.Finalizers, servicehelper.LoadBalancerCleanupFinalizer) klog.V(2).Infof("Removing finalizer from service %s/%s", updated.Namespace, updated.Name) <del> _, err := patch(s.kubeClient.CoreV1(), service, updated) </del> <ins> _, err := servicehelper.PatchService(s.kubeClient.CoreV1(), service, updated) </ins> return err }

updated.Status.LoadBalancer = *newStatus klog.V(2).Infof("Patching status for service %s/%s", updated.Namespace, updated.Name) <del> _, err := patch(s.kubeClient.CoreV1(), service, updated) </del> <ins> _, err := servicehelper.PatchService(s.kubeClient.CoreV1(), service, updated) </ins> return err }

<del> /* Copyright 2019 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ package service import ( "context" "encoding/json" "fmt" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/strategicpatch" v1core "k8s.io/client-go/kubernetes/typed/core/v1" ) // patch patches service's Status or ObjectMeta given the origin and // updated ones. Change to spec will be ignored. func patch(c v1core.CoreV1Interface, oldSvc *v1.Service, newSvc *v1.Service) (*v1.Service, error) { // Reset spec to make sure only patch for Status or ObjectMeta. newSvc.Spec = oldSvc.Spec patchBytes, err := getPatchBytes(oldSvc, newSvc) if err != nil { return nil, err } return c.Services(oldSvc.Namespace).Patch(context.TODO(), oldSvc.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}, "status") } func getPatchBytes(oldSvc *v1.Service, newSvc *v1.Service) ([]byte, error) { oldData, err := json.Marshal(oldSvc) if err != nil { return nil, fmt.Errorf("failed to Marshal oldData for svc %s/%s: %v", oldSvc.Namespace, oldSvc.Name, err) } newData, err := json.Marshal(newSvc) if err != nil { return nil, fmt.Errorf("failed to Marshal newData for svc %s/%s: %v", newSvc.Namespace, newSvc.Name, err) } patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, v1.Service{}) if err != nil { return nil, fmt.Errorf("failed to CreateTwoWayMergePatch for svc %s/%s: %v", oldSvc.Namespace, oldSvc.Name, err) } return patchBytes, nil } </del>

<del> /* Copyright 2019 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ package service import ( "context" "reflect" "testing" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" ) func addAnnotations(svc *v1.Service) { svc.Annotations["foo"] = "bar" } func TestPatch(t *testing.T) { svcOrigin := &v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name:        "test-patch", Annotations: map[string]string{}, }, Spec: v1.ServiceSpec{ ClusterIP: "10.0.0.1", }, } fakeCs := fake.NewSimpleClientset(svcOrigin) // Issue a separate update and verify patch doesn't fail after this. svcToUpdate := svcOrigin.DeepCopy() addAnnotations(svcToUpdate) if _, err := fakeCs.CoreV1().Services(svcOrigin.Namespace).Update(context.TODO(), svcToUpdate, metav1.UpdateOptions{}); err != nil { t.Fatalf("Failed to update service: %v", err) } // Attempt to patch based the original service. svcToPatch := svcOrigin.DeepCopy() svcToPatch.Finalizers = []string{"foo"} svcToPatch.Spec.ClusterIP = "10.0.0.2" svcToPatch.Status = v1.ServiceStatus{ LoadBalancer: v1.LoadBalancerStatus{ Ingress: []v1.LoadBalancerIngress{ {IP: "8.8.8.8"}, }, }, } svcPatched, err := patch(fakeCs.CoreV1(), svcOrigin, svcToPatch) if err != nil { t.Fatalf("Failed to patch service: %v", err) } // Service returned by patch will contain latest content (e.g from // the separate update). addAnnotations(svcToPatch) if !reflect.DeepEqual(svcPatched, svcToPatch) { t.Errorf("PatchStatus() = %+v, want %+v", svcPatched, svcToPatch) } // Explicitly validate if spec is unchanged from origin. if !reflect.DeepEqual(svcPatched.Spec, svcOrigin.Spec) { t.Errorf("Got spec = %+v, want %+v", svcPatched.Spec, svcOrigin.Spec) } } func TestGetPatchBytes(t *testing.T) { origin := &v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name:       "test-patch-bytes", Finalizers: []string{"foo"}, }, } updated := &v1.Service{ ObjectMeta: metav1.ObjectMeta{ Name:       "test-patch-bytes", Finalizers: []string{"foo", "bar"}, }, } b, err := getPatchBytes(origin, updated) if err != nil { t.Fatal(err) } expected := `{"metadata":{"$setElementOrder/finalizers":["foo","bar"],"finalizers":["bar"]}}` if string(b) != expected { t.Errorf("getPatchBytes(%+v, %+v) = %s ; want %s", origin, updated, string(b), expected) } } </del>