From 8c07223f3b6c8bb7a2685d81b6dede0eda6198bb Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Fri, 26 Jul 2019 11:39:25 -0500 Subject: [PATCH] Remove unused argument (#3149) Removed unused argument in the `GetPatch()` function in `pkg/inject/inject.go` Signed-off-by: Alejandro Pedraza --- cli/cmd/inject.go | 2 +- controller/proxy-injector/webhook.go | 2 +- controller/proxy-injector/webhook_test.go | 4 ++-- pkg/inject/inject.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/cmd/inject.go b/cli/cmd/inject.go index 422d4f71e..4d3bed316 100644 --- a/cli/cmd/inject.go +++ b/cli/cmd/inject.go @@ -160,7 +160,7 @@ func (rt resourceTransformerInject) transform(bytes []byte) ([]byte, []inject.Re conf.AppendPodAnnotations(rt.overrideAnnotations) } - p, err := conf.GetPatch(bytes, rt.injectProxy) + p, err := conf.GetPatch(rt.injectProxy) if err != nil { return nil, nil, err } diff --git a/controller/proxy-injector/webhook.go b/controller/proxy-injector/webhook.go index 7a54e0fa2..b4641443f 100644 --- a/controller/proxy-injector/webhook.go +++ b/controller/proxy-injector/webhook.go @@ -61,7 +61,7 @@ func Inject(api *k8s.API, resourceConfig.AppendPodAnnotations(map[string]string{ pkgK8s.CreatedByAnnotation: fmt.Sprintf("linkerd/proxy-injector %s", version.Version), }) - p, err := resourceConfig.GetPatch(request.Object.Raw, true) + p, err := resourceConfig.GetPatch(true) if err != nil { return nil, err } diff --git a/controller/proxy-injector/webhook_test.go b/controller/proxy-injector/webhook_test.go index 481f507a9..cc6d66650 100644 --- a/controller/proxy-injector/webhook_test.go +++ b/controller/proxy-injector/webhook_test.go @@ -119,7 +119,7 @@ func TestGetPatch(t *testing.T) { t.Fatal(err) } - p, err := fullConf.GetPatch(fakeReq.Object.Raw, true) + p, err := fullConf.GetPatch(true) if err != nil { t.Fatalf("Unexpected PatchForAdmissionRequest error: %s", err) } @@ -153,7 +153,7 @@ func TestGetPatch(t *testing.T) { fakeReq := getFakeReq(deployment) conf := confNsDisabled().WithKind(fakeReq.Kind.Kind) - p, err := conf.GetPatch(fakeReq.Object.Raw, true) + p, err := conf.GetPatch(true) if err != nil { t.Fatalf("Unexpected PatchForAdmissionRequest error: %s", err) } diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index 32afd6b79..24bdffa11 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -205,7 +205,7 @@ func (conf *ResourceConfig) ParseMetaAndYAML(bytes []byte) (*Report, error) { // GetPatch returns the JSON patch containing the proxy and init containers specs, if any. // If injectProxy is false, only the config.linkerd.io annotations are set. -func (conf *ResourceConfig) GetPatch(bytes []byte, injectProxy bool) (*Patch, error) { +func (conf *ResourceConfig) GetPatch(injectProxy bool) (*Patch, error) { patch := NewPatch(conf.workload.metaType.Kind) if conf.pod.spec != nil { conf.injectPodAnnotations(patch)