Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GCE: remove duplicate patch service function #88578

Merged
merged 2 commits into from Feb 27, 2020
Merged

GCE: remove duplicate patch service function #88578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a05613
gce: remove duplicate patch service method
andrewsykim Feb 26, 2020
bf60504
fix import formatting in gce_utils.go
andrewsykim Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion staging/src/k8s.io/legacy-cloud-providers/gce/BUILD
View file
Open in desktop
Expand Up @@ -50,7 +50,6 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
Expand Down
52 changes: 9 additions & 43 deletions staging/src/k8s.io/legacy-cloud-providers/gce/gce_util.go
View file
Open in desktop
Expand Up @@ -29,22 +29,21 @@ import (
"strings"
"sync"

"cloud.google.com/go/compute/metadata"

"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/strategicpatch"

"encoding/json"

"cloud.google.com/go/compute/metadata"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"

"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/kubernetes/fake"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
servicehelper "k8s.io/cloud-provider/service/helpers"
)

func fakeGCECloud(vals TestClusterValues) (*Cloud, error) {
Expand Down Expand Up @@ -362,8 +361,7 @@ func addFinalizer(service *v1.Service, kubeClient v1core.CoreV1Interface, key st
updated := service.DeepCopy()
updated.ObjectMeta.Finalizers = append(updated.ObjectMeta.Finalizers, key)

// TODO(87447) use PatchService from k8s.io/cloud-provider/service/helpers
_, err := patchService(kubeClient, service, updated)
_, err := servicehelper.PatchService(kubeClient, service, updated)
return err
}

Expand All @@ -377,7 +375,7 @@ func removeFinalizer(service *v1.Service, kubeClient v1core.CoreV1Interface, key
updated := service.DeepCopy()
updated.ObjectMeta.Finalizers = removeString(updated.ObjectMeta.Finalizers, key)

_, err := patchService(kubeClient, service, updated)
_, err := servicehelper.PatchService(kubeClient, service, updated)
return err
}

Expand All @@ -402,35 +400,3 @@ func removeString(slice []string, s string) []string {
}
return newSlice
}

// patchService patches service's Status or ObjectMeta given the origin and
// updated ones. Change to spec will be ignored.
func patchService(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
}