From 45a3140ac532029747aa8433f67744744bf1c782 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 15 Aug 2019 18:43:48 -0700 Subject: [PATCH] Move kube/inject out of Pilot (#16284) * Move pilot/pkg/kube/inject -> pkg/kube/inject * Break out sidecar-injector to top level --- Makefile | 8 ++++++-- istioctl/cmd/kubeinject.go | 2 +- istioctl/cmd/kubeuninject.go | 3 ++- {pilot/pkg => pkg}/kube/inject/app_probe.go | 0 {pilot/pkg => pkg}/kube/inject/app_probe_test.go | 0 {pilot/pkg => pkg}/kube/inject/concurrency.go | 0 {pilot/pkg => pkg}/kube/inject/concurrency_test.go | 0 {pilot/pkg => pkg}/kube/inject/initializer.go | 0 {pilot/pkg => pkg}/kube/inject/inject.go | 0 {pilot/pkg => pkg}/kube/inject/inject_test.go | 0 {pilot/pkg => pkg}/kube/inject/monitoring.go | 0 .../hello-probes-with-flag-set-in-annotation.yaml | 0 ...hello-probes-with-flag-set-in-annotation.yaml.injected | 0 .../hello-probes-with-flag-unset-in-annotation.yaml | 0 ...llo-probes-with-flag-unset-in-annotation.yaml.injected | 0 .../inject/testdata/inject/app_probe/hello-probes.yaml | 0 .../testdata/inject/app_probe/hello-probes.yaml.injected | 0 .../inject/testdata/inject/app_probe/hello-readiness.yaml | 0 .../inject/app_probe/hello-readiness.yaml.injected | 0 .../inject/testdata/inject/app_probe/https-probes.yaml | 0 .../testdata/inject/app_probe/https-probes.yaml.injected | 0 .../kube/inject/testdata/inject/app_probe/named_port.yaml | 0 .../testdata/inject/app_probe/named_port.yaml.injected | 0 .../inject/testdata/inject/app_probe/one_container.yaml | 0 .../testdata/inject/app_probe/one_container.yaml.injected | 0 .../kube/inject/testdata/inject/app_probe/ready_live.yaml | 0 .../testdata/inject/app_probe/ready_live.yaml.injected | 0 .../kube/inject/testdata/inject/app_probe/ready_only.yaml | 0 .../testdata/inject/app_probe/ready_only.yaml.injected | 0 .../inject/testdata/inject/app_probe/two_container.yaml | 0 .../testdata/inject/app_probe/two_container.yaml.injected | 0 .../inject/testdata/inject/auth.cert-dir.yaml.injected | 0 .../testdata/inject/auth.non-default-service-account.yaml | 0 .../inject/auth.non-default-service-account.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/testdata/inject/auth.yaml | 0 .../kube/inject/testdata/inject/auth.yaml.injected | 0 .../kube/inject/testdata/inject/cronjob-with-app.yaml | 0 .../inject/testdata/inject/cronjob-with-app.yaml.injected | 0 .../pkg => pkg}/kube/inject/testdata/inject/cronjob.yaml | 0 .../kube/inject/testdata/inject/cronjob.yaml.injected | 0 .../kube/inject/testdata/inject/daemonset.yaml | 0 .../kube/inject/testdata/inject/daemonset.yaml.injected | 0 .../inject/testdata/inject/deployment-user-volume.yaml | 0 .../inject/testdata/inject/deploymentconfig-multi.yaml | 0 .../testdata/inject/deploymentconfig-multi.yaml.injected | 0 .../kube/inject/testdata/inject/deploymentconfig.yaml | 0 .../inject/testdata/inject/deploymentconfig.yaml.injected | 0 .../kube/inject/testdata/inject/enable-core-dump.yaml | 0 .../inject/testdata/inject/enable-core-dump.yaml.injected | 0 .../kube/inject/testdata/inject/format-duration.yaml | 0 .../inject/testdata/inject/format-duration.yaml.injected | 0 .../pkg => pkg}/kube/inject/testdata/inject/frontend.yaml | 0 .../kube/inject/testdata/inject/frontend.yaml.injected | 0 .../inject/testdata/inject/hello-always.yaml.injected | 0 .../testdata/inject/hello-config-map-name.yaml.injected | 0 .../kube/inject/testdata/inject/hello-host-network.yaml | 0 .../testdata/inject/hello-host-network.yaml.injected | 0 .../kube/inject/testdata/inject/hello-ignore.yaml | 0 .../inject/testdata/inject/hello-ignore.yaml.injected | 0 .../kube/inject/testdata/inject/hello-multi.yaml | 0 .../kube/inject/testdata/inject/hello-multi.yaml.injected | 0 .../kube/inject/testdata/inject/hello-namespace.yaml | 0 .../inject/testdata/inject/hello-namespace.yaml.injected | 0 .../kube/inject/testdata/inject/hello-never.yaml.injected | 0 .../kube/inject/testdata/inject/hello-proxy-override.yaml | 0 .../testdata/inject/hello-proxy-override.yaml.injected | 0 .../kube/inject/testdata/inject/hello-readiness.yaml | 0 .../kube/inject/testdata/inject/hello-service.yaml | 0 .../inject/testdata/inject/hello-service.yaml.injected | 0 .../inject/hello-template-in-values.yaml.injected | 0 .../testdata/inject/hello-tproxy-debug.yaml.injected | 0 .../inject/testdata/inject/hello-tproxy.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/testdata/inject/hello.yaml | 0 .../kube/inject/testdata/inject/hello.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/testdata/inject/job.yaml | 0 .../kube/inject/testdata/inject/job.yaml.injected | 0 .../kube/inject/testdata/inject/kubevirtInterfaces.yaml | 0 .../testdata/inject/kubevirtInterfaces.yaml.injected | 0 .../inject/testdata/inject/kubevirtInterfaces_list.yaml | 0 .../testdata/inject/kubevirtInterfaces_list.yaml.injected | 0 .../kube/inject/testdata/inject/list-frontend.yaml | 0 .../inject/testdata/inject/list-frontend.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/testdata/inject/list.yaml | 0 .../kube/inject/testdata/inject/list.yaml.injected | 0 .../kube/inject/testdata/inject/multi-init.yaml | 0 .../kube/inject/testdata/inject/multi-init.yaml.injected | 0 .../kube/inject/testdata/inject/pod-with-app.yaml | 0 .../inject/testdata/inject/pod-with-app.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/testdata/inject/pod.yaml | 0 .../kube/inject/testdata/inject/pod.yaml.injected | 0 .../kube/inject/testdata/inject/replicaset.yaml | 0 .../kube/inject/testdata/inject/replicaset.yaml.injected | 0 .../inject/testdata/inject/replicationcontroller.yaml | 0 .../testdata/inject/replicationcontroller.yaml.injected | 0 .../kube/inject/testdata/inject/statefulset.yaml | 0 .../kube/inject/testdata/inject/statefulset.yaml.injected | 0 .../kube/inject/testdata/inject/status_annotations.yaml | 0 .../testdata/inject/status_annotations.yaml.injected | 0 .../kube/inject/testdata/inject/status_params.yaml | 0 .../inject/testdata/inject/status_params.yaml.injected | 0 .../traffic-annotations-bad-excludeinboundports.yaml | 0 .../inject/traffic-annotations-bad-excludeipranges.yaml | 0 .../traffic-annotations-bad-excludeoutboundports.yaml | 0 .../traffic-annotations-bad-includeinboundports.yaml | 0 .../inject/traffic-annotations-bad-includeipranges.yaml | 0 .../inject/traffic-annotations-empty-includes.yaml | 0 .../traffic-annotations-empty-includes.yaml.injected | 0 .../testdata/inject/traffic-annotations-wildcards.yaml | 0 .../inject/traffic-annotations-wildcards.yaml.injected | 0 .../kube/inject/testdata/inject/traffic-annotations.yaml | 0 .../testdata/inject/traffic-annotations.yaml.injected | 0 .../testdata/inject/traffic-params-empty-includes.yaml | 0 .../inject/traffic-params-empty-includes.yaml.injected | 0 .../kube/inject/testdata/inject/traffic-params.yaml | 0 .../inject/testdata/inject/traffic-params.yaml.injected | 0 .../kube/inject/testdata/webhook/TestWebhookInject.patch | 0 .../kube/inject/testdata/webhook/TestWebhookInject.yaml | 0 .../TestWebhookInject_http_probe_nosidecar_rewrite.patch | 0 .../TestWebhookInject_http_probe_nosidecar_rewrite.yaml | 0 ...bhookInject_http_probe_nosidecar_rewrite_template.yaml | 0 .../webhook/TestWebhookInject_http_probe_rewrite.patch | 0 .../webhook/TestWebhookInject_http_probe_rewrite.yaml | 0 ...nject_http_probe_rewrite_disabled_via_annotation.patch | 0 ...Inject_http_probe_rewrite_disabled_via_annotation.yaml | 0 ...tp_probe_rewrite_disabled_via_annotation_template.yaml | 0 ...Inject_http_probe_rewrite_enabled_via_annotation.patch | 0 ...kInject_http_probe_rewrite_enabled_via_annotation.yaml | 0 ...ttp_probe_rewrite_enabled_via_annotation_template.yaml | 0 .../TestWebhookInject_http_probe_rewrite_template.yaml | 0 .../webhook/TestWebhookInject_https_probe_rewrite.patch | 0 .../webhook/TestWebhookInject_https_probe_rewrite.yaml | 0 .../TestWebhookInject_https_probe_rewrite_template.yaml | 0 .../webhook/TestWebhookInject_no_containers.patch | 0 .../testdata/webhook/TestWebhookInject_no_containers.yaml | 0 ...TestWebhookInject_no_containers_imagePullSecrets.patch | 0 .../TestWebhookInject_no_containers_imagePullSecrets.yaml | 0 .../webhook/TestWebhookInject_no_containers_volumes.patch | 0 .../webhook/TestWebhookInject_no_containers_volumes.yaml | 0 ...ookInject_no_containers_volumes_imagePullSecrets.patch | 0 ...hookInject_no_containers_volumes_imagePullSecrets.yaml | 0 .../webhook/TestWebhookInject_no_imagePullSecrets.patch | 0 .../webhook/TestWebhookInject_no_imagePullSecrets.yaml | 0 .../webhook/TestWebhookInject_no_initContainers.patch | 0 .../webhook/TestWebhookInject_no_initContainers.yaml | 0 .../TestWebhookInject_no_initContainers_containers.patch | 0 .../TestWebhookInject_no_initContainers_containers.yaml | 0 ...ct_no_initContainers_containers_imagePullSecrets.patch | 0 ...ect_no_initContainers_containers_imagePullSecrets.yaml | 0 ...bhookInject_no_initContainers_containers_volumes.patch | 0 ...ebhookInject_no_initContainers_containers_volumes.yaml | 0 ...nitContainers_containers_volumes_imagePullSecrets.yaml | 0 ...WebhookInject_no_initContainers_continers_volumes.yaml | 0 ...WebhookInject_no_initContainers_imagePullSecrets.patch | 0 ...tWebhookInject_no_initContainers_imagePullSecrets.yaml | 0 .../TestWebhookInject_no_initContainers_volumes.patch | 0 .../TestWebhookInject_no_initContainers_volumes.yaml | 0 ...nject_no_initContainers_volumes_imagePullSecrets.patch | 0 ...Inject_no_initContainers_volumes_imagePullSecrets.yaml | 0 ...itcontainers_containers_volumes_imagePullSecrets.patch | 0 .../testdata/webhook/TestWebhookInject_no_volumes.patch | 0 .../testdata/webhook/TestWebhookInject_no_volumes.yaml | 0 .../TestWebhookInject_no_volumes_imagePullSecrets.patch | 0 .../TestWebhookInject_no_volumes_imagePullSecrets.yaml | 0 .../testdata/webhook/TestWebhookInject_replace.patch | 0 .../testdata/webhook/TestWebhookInject_replace.yaml | 0 .../TestWebhookInject_replace_backwards_compat.patch | 0 .../TestWebhookInject_replace_backwards_compat.yaml | 0 .../testdata/webhook/TestWebhookInject_template.yaml | 0 .../kube/inject/testdata/webhook/daemonset.yaml | 0 .../kube/inject/testdata/webhook/daemonset.yaml.injected | 0 .../inject/testdata/webhook/deploymentconfig-multi.yaml | 0 .../testdata/webhook/deploymentconfig-multi.yaml.injected | 0 .../kube/inject/testdata/webhook/deploymentconfig.yaml | 0 .../testdata/webhook/deploymentconfig.yaml.injected | 0 .../kube/inject/testdata/webhook/frontend.yaml | 0 .../kube/inject/testdata/webhook/frontend.yaml.injected | 0 .../testdata/webhook/hello-config-map-name.yaml.injected | 0 .../kube/inject/testdata/webhook/hello-multi.yaml | 0 .../inject/testdata/webhook/hello-multi.yaml.injected | 0 .../kube/inject/testdata/webhook/hello-probes.yaml | 0 .../inject/testdata/webhook/hello-probes.yaml.injected | 0 .../pkg => pkg}/kube/inject/testdata/webhook/hello.yaml | 0 {pilot/pkg => pkg}/kube/inject/testdata/webhook/job.yaml | 0 .../kube/inject/testdata/webhook/job.yaml.injected | 0 .../kube/inject/testdata/webhook/list-frontend.yaml | 0 .../inject/testdata/webhook/list-frontend.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/testdata/webhook/list.yaml | 0 .../kube/inject/testdata/webhook/list.yaml.injected | 0 .../kube/inject/testdata/webhook/multi-init.yaml | 0 .../kube/inject/testdata/webhook/multi-init.yaml.injected | 0 .../kube/inject/testdata/webhook/replicaset.yaml | 0 .../kube/inject/testdata/webhook/replicaset.yaml.injected | 0 .../inject/testdata/webhook/replicationcontroller.yaml | 0 .../testdata/webhook/replicationcontroller.yaml.injected | 0 .../inject/testdata/webhook/resource_annotations.yaml | 0 .../testdata/webhook/resource_annotations.yaml.injected | 0 .../kube/inject/testdata/webhook/statefulset.yaml | 0 .../inject/testdata/webhook/statefulset.yaml.injected | 0 .../kube/inject/testdata/webhook/status_annotations.yaml | 0 .../testdata/webhook/status_annotations.yaml.injected | 0 .../webhook/traffic-annotations-empty-includes.yaml | 0 .../traffic-annotations-empty-includes.yaml.injected | 0 .../testdata/webhook/traffic-annotations-wildcards.yaml | 0 .../webhook/traffic-annotations-wildcards.yaml.injected | 0 .../kube/inject/testdata/webhook/traffic-annotations.yaml | 0 .../testdata/webhook/traffic-annotations.yaml.injected | 0 .../kube/inject/testdata/webhook/user-volume.yaml | 0 .../inject/testdata/webhook/user-volume.yaml.injected | 0 {pilot/pkg => pkg}/kube/inject/webhook.go | 0 {pilot/pkg => pkg}/kube/inject/webhook_test.go | 4 ++-- {pilot => sidecar-injector}/cmd/sidecar-injector/main.go | 4 ++-- .../docker/Dockerfile.sidecar_injector | 0 tests/e2e/tests/pilot/pilot_test.go | 2 +- tools/istio-docker.mk | 2 +- 214 files changed, 15 insertions(+), 10 deletions(-) rename {pilot/pkg => pkg}/kube/inject/app_probe.go (100%) rename {pilot/pkg => pkg}/kube/inject/app_probe_test.go (100%) rename {pilot/pkg => pkg}/kube/inject/concurrency.go (100%) rename {pilot/pkg => pkg}/kube/inject/concurrency_test.go (100%) rename {pilot/pkg => pkg}/kube/inject/initializer.go (100%) rename {pilot/pkg => pkg}/kube/inject/inject.go (100%) rename {pilot/pkg => pkg}/kube/inject/inject_test.go (100%) rename {pilot/pkg => pkg}/kube/inject/monitoring.go (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-probes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-readiness.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/https-probes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/named_port.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/named_port.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/one_container.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/one_container.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/ready_live.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/ready_only.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/two_container.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/app_probe/two_container.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/auth.cert-dir.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/auth.non-default-service-account.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/auth.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/auth.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/cronjob-with-app.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/cronjob-with-app.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/cronjob.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/cronjob.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/daemonset.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/daemonset.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/deployment-user-volume.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/deploymentconfig-multi.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/deploymentconfig.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/deploymentconfig.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/enable-core-dump.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/enable-core-dump.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/format-duration.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/format-duration.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/frontend.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/frontend.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-always.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-config-map-name.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-host-network.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-host-network.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-ignore.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-ignore.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-multi.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-multi.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-namespace.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-namespace.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-never.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-proxy-override.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-proxy-override.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-readiness.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-service.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-service.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-template-in-values.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-tproxy-debug.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello-tproxy.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/hello.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/job.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/job.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/kubevirtInterfaces.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/list-frontend.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/list-frontend.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/list.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/list.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/multi-init.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/multi-init.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/pod-with-app.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/pod-with-app.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/pod.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/pod.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/replicaset.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/replicaset.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/replicationcontroller.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/replicationcontroller.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/statefulset.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/statefulset.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/status_annotations.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/status_annotations.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/status_params.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/status_params.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-bad-excludeinboundports.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-bad-excludeipranges.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-bad-excludeoutboundports.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-bad-includeinboundports.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-bad-includeipranges.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-annotations.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-params-empty-includes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-params.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/inject/traffic-params.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite_template.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation_template.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation_template.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite_template.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_continers_volumes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_replace.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_replace.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/TestWebhookInject_template.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/daemonset.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/daemonset.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/deploymentconfig-multi.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/deploymentconfig-multi.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/deploymentconfig.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/deploymentconfig.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/frontend.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/frontend.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/hello-config-map-name.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/hello-multi.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/hello-multi.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/hello-probes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/hello-probes.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/hello.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/job.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/job.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/list-frontend.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/list-frontend.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/list.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/list.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/multi-init.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/multi-init.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/replicaset.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/replicaset.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/replicationcontroller.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/replicationcontroller.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/resource_annotations.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/resource_annotations.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/statefulset.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/statefulset.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/status_annotations.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/status_annotations.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/traffic-annotations.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/traffic-annotations.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/user-volume.yaml (100%) rename {pilot/pkg => pkg}/kube/inject/testdata/webhook/user-volume.yaml.injected (100%) rename {pilot/pkg => pkg}/kube/inject/webhook.go (100%) rename {pilot/pkg => pkg}/kube/inject/webhook_test.go (99%) rename {pilot => sidecar-injector}/cmd/sidecar-injector/main.go (98%) rename {pilot => sidecar-injector}/docker/Dockerfile.sidecar_injector (100%) diff --git a/Makefile b/Makefile index fa96f3bd4b23..43aaac59d2a2 100644 --- a/Makefile +++ b/Makefile @@ -395,9 +395,13 @@ ${ISTIO_OUT}/_istioctl: istioctl mv _istioctl ${ISTIO_OUT}/_istioctl # Build targets for apps under ./pilot/cmd -PILOT_BINS:=pilot-discovery pilot-agent sidecar-injector +PILOT_BINS:=pilot-discovery pilot-agent $(foreach ITEM,$(PILOT_BINS),$(eval $(call genTargetsForNativeAndDocker,$(ITEM),./pilot/cmd/$(ITEM),$(RELEASE_LDFLAGS)))) +# Build targets for apps under ./sidecar-injector/cmd +INJECTOR_BINS:=sidecar-injector +$(foreach ITEM,$(INJECTOR_BINS),$(eval $(call genTargetsForNativeAndDocker,$(ITEM),./sidecar-injector/cmd/$(ITEM),$(RELEASE_LDFLAGS)))) + # Build targets for apps under ./mixer/cmd MIXER_BINS:=mixs mixc $(foreach ITEM,$(MIXER_BINS),$(eval $(call genTargetsForNativeAndDocker,$(ITEM),./mixer/cmd/$(ITEM),$(RELEASE_LDFLAGS)))) @@ -422,7 +426,7 @@ $(foreach ITEM,$(SECURITY_TOOLS_BINS),$(eval $(call genTargetsForNativeAndDocker ISTIO_TOOLS_BINS:=hyperistio istio-iptables $(foreach ITEM,$(ISTIO_TOOLS_BINS),$(eval $(call genTargetsForNativeAndDocker,$(ITEM),./tools/$(ITEM),$(DEBUG_LDFLAGS)))) -BUILD_BINS:=$(PILOT_BINS) mixc mixs mixgen node_agent node_agent_k8s istio_ca istioctl galley sdsclient +BUILD_BINS:=$(PILOT_BINS) sidecar-injector mixc mixs mixgen node_agent node_agent_k8s istio_ca istioctl galley sdsclient LINUX_BUILD_BINS:=$(foreach buildBin,$(BUILD_BINS),$(ISTIO_OUT_LINUX)/$(buildBin)) .PHONY: build diff --git a/istioctl/cmd/kubeinject.go b/istioctl/cmd/kubeinject.go index c3b597cdc26f..50afa1e3bdf2 100644 --- a/istioctl/cmd/kubeinject.go +++ b/istioctl/cmd/kubeinject.go @@ -31,9 +31,9 @@ import ( "istio.io/pkg/version" "istio.io/istio/pilot/cmd" - "istio.io/istio/pilot/pkg/kube/inject" "istio.io/istio/pkg/config/mesh" "istio.io/istio/pkg/kube" + "istio.io/istio/pkg/kube/inject" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/istioctl/cmd/kubeuninject.go b/istioctl/cmd/kubeuninject.go index d10805d9c6ec..9686d81e14b0 100644 --- a/istioctl/cmd/kubeuninject.go +++ b/istioctl/cmd/kubeuninject.go @@ -32,7 +32,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" yamlDecoder "k8s.io/apimachinery/pkg/util/yaml" - "istio.io/istio/pilot/pkg/kube/inject" + "istio.io/istio/pkg/kube/inject" + "istio.io/pkg/log" ) diff --git a/pilot/pkg/kube/inject/app_probe.go b/pkg/kube/inject/app_probe.go similarity index 100% rename from pilot/pkg/kube/inject/app_probe.go rename to pkg/kube/inject/app_probe.go diff --git a/pilot/pkg/kube/inject/app_probe_test.go b/pkg/kube/inject/app_probe_test.go similarity index 100% rename from pilot/pkg/kube/inject/app_probe_test.go rename to pkg/kube/inject/app_probe_test.go diff --git a/pilot/pkg/kube/inject/concurrency.go b/pkg/kube/inject/concurrency.go similarity index 100% rename from pilot/pkg/kube/inject/concurrency.go rename to pkg/kube/inject/concurrency.go diff --git a/pilot/pkg/kube/inject/concurrency_test.go b/pkg/kube/inject/concurrency_test.go similarity index 100% rename from pilot/pkg/kube/inject/concurrency_test.go rename to pkg/kube/inject/concurrency_test.go diff --git a/pilot/pkg/kube/inject/initializer.go b/pkg/kube/inject/initializer.go similarity index 100% rename from pilot/pkg/kube/inject/initializer.go rename to pkg/kube/inject/initializer.go diff --git a/pilot/pkg/kube/inject/inject.go b/pkg/kube/inject/inject.go similarity index 100% rename from pilot/pkg/kube/inject/inject.go rename to pkg/kube/inject/inject.go diff --git a/pilot/pkg/kube/inject/inject_test.go b/pkg/kube/inject/inject_test.go similarity index 100% rename from pilot/pkg/kube/inject/inject_test.go rename to pkg/kube/inject/inject_test.go diff --git a/pilot/pkg/kube/inject/monitoring.go b/pkg/kube/inject/monitoring.go similarity index 100% rename from pilot/pkg/kube/inject/monitoring.go rename to pkg/kube/inject/monitoring.go diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml b/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml rename to pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-set-in-annotation.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml b/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml rename to pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/hello-probes-with-flag-unset-in-annotation.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml b/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml rename to pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/hello-probes.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml b/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml rename to pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/hello-readiness.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml b/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml rename to pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/https-probes.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml b/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml rename to pkg/kube/inject/testdata/inject/app_probe/named_port.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/named_port.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/named_port.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml b/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml rename to pkg/kube/inject/testdata/inject/app_probe/one_container.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/one_container.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/one_container.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml b/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml rename to pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/ready_live.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml b/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml rename to pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/ready_only.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml b/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml rename to pkg/kube/inject/testdata/inject/app_probe/two_container.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml.injected b/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/app_probe/two_container.yaml.injected rename to pkg/kube/inject/testdata/inject/app_probe/two_container.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/auth.cert-dir.yaml.injected b/pkg/kube/inject/testdata/inject/auth.cert-dir.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/auth.cert-dir.yaml.injected rename to pkg/kube/inject/testdata/inject/auth.cert-dir.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml b/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml rename to pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected b/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected rename to pkg/kube/inject/testdata/inject/auth.non-default-service-account.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/auth.yaml b/pkg/kube/inject/testdata/inject/auth.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/auth.yaml rename to pkg/kube/inject/testdata/inject/auth.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/auth.yaml.injected b/pkg/kube/inject/testdata/inject/auth.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/auth.yaml.injected rename to pkg/kube/inject/testdata/inject/auth.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/cronjob-with-app.yaml b/pkg/kube/inject/testdata/inject/cronjob-with-app.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/cronjob-with-app.yaml rename to pkg/kube/inject/testdata/inject/cronjob-with-app.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/cronjob-with-app.yaml.injected b/pkg/kube/inject/testdata/inject/cronjob-with-app.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/cronjob-with-app.yaml.injected rename to pkg/kube/inject/testdata/inject/cronjob-with-app.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/cronjob.yaml b/pkg/kube/inject/testdata/inject/cronjob.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/cronjob.yaml rename to pkg/kube/inject/testdata/inject/cronjob.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/cronjob.yaml.injected b/pkg/kube/inject/testdata/inject/cronjob.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/cronjob.yaml.injected rename to pkg/kube/inject/testdata/inject/cronjob.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/daemonset.yaml b/pkg/kube/inject/testdata/inject/daemonset.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/daemonset.yaml rename to pkg/kube/inject/testdata/inject/daemonset.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/daemonset.yaml.injected b/pkg/kube/inject/testdata/inject/daemonset.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/daemonset.yaml.injected rename to pkg/kube/inject/testdata/inject/daemonset.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/deployment-user-volume.yaml b/pkg/kube/inject/testdata/inject/deployment-user-volume.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/deployment-user-volume.yaml rename to pkg/kube/inject/testdata/inject/deployment-user-volume.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml b/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml rename to pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected b/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected rename to pkg/kube/inject/testdata/inject/deploymentconfig-multi.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/deploymentconfig.yaml b/pkg/kube/inject/testdata/inject/deploymentconfig.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/deploymentconfig.yaml rename to pkg/kube/inject/testdata/inject/deploymentconfig.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected b/pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected rename to pkg/kube/inject/testdata/inject/deploymentconfig.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/enable-core-dump.yaml b/pkg/kube/inject/testdata/inject/enable-core-dump.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/enable-core-dump.yaml rename to pkg/kube/inject/testdata/inject/enable-core-dump.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected b/pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected rename to pkg/kube/inject/testdata/inject/enable-core-dump.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/format-duration.yaml b/pkg/kube/inject/testdata/inject/format-duration.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/format-duration.yaml rename to pkg/kube/inject/testdata/inject/format-duration.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/format-duration.yaml.injected b/pkg/kube/inject/testdata/inject/format-duration.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/format-duration.yaml.injected rename to pkg/kube/inject/testdata/inject/format-duration.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/frontend.yaml b/pkg/kube/inject/testdata/inject/frontend.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/frontend.yaml rename to pkg/kube/inject/testdata/inject/frontend.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/frontend.yaml.injected b/pkg/kube/inject/testdata/inject/frontend.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/frontend.yaml.injected rename to pkg/kube/inject/testdata/inject/frontend.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-always.yaml.injected b/pkg/kube/inject/testdata/inject/hello-always.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-always.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-always.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-config-map-name.yaml.injected b/pkg/kube/inject/testdata/inject/hello-config-map-name.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-config-map-name.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-config-map-name.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-host-network.yaml b/pkg/kube/inject/testdata/inject/hello-host-network.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-host-network.yaml rename to pkg/kube/inject/testdata/inject/hello-host-network.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-host-network.yaml.injected b/pkg/kube/inject/testdata/inject/hello-host-network.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-host-network.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-host-network.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-ignore.yaml b/pkg/kube/inject/testdata/inject/hello-ignore.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-ignore.yaml rename to pkg/kube/inject/testdata/inject/hello-ignore.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-ignore.yaml.injected b/pkg/kube/inject/testdata/inject/hello-ignore.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-ignore.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-ignore.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-multi.yaml b/pkg/kube/inject/testdata/inject/hello-multi.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-multi.yaml rename to pkg/kube/inject/testdata/inject/hello-multi.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-multi.yaml.injected b/pkg/kube/inject/testdata/inject/hello-multi.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-multi.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-multi.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-namespace.yaml b/pkg/kube/inject/testdata/inject/hello-namespace.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-namespace.yaml rename to pkg/kube/inject/testdata/inject/hello-namespace.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected b/pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-namespace.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-never.yaml.injected b/pkg/kube/inject/testdata/inject/hello-never.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-never.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-never.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml b/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml rename to pkg/kube/inject/testdata/inject/hello-proxy-override.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected b/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-proxy-override.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-readiness.yaml b/pkg/kube/inject/testdata/inject/hello-readiness.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-readiness.yaml rename to pkg/kube/inject/testdata/inject/hello-readiness.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-service.yaml b/pkg/kube/inject/testdata/inject/hello-service.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-service.yaml rename to pkg/kube/inject/testdata/inject/hello-service.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-service.yaml.injected b/pkg/kube/inject/testdata/inject/hello-service.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-service.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-service.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected b/pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-template-in-values.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-tproxy-debug.yaml.injected b/pkg/kube/inject/testdata/inject/hello-tproxy-debug.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-tproxy-debug.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-tproxy-debug.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected b/pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected rename to pkg/kube/inject/testdata/inject/hello-tproxy.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/hello.yaml b/pkg/kube/inject/testdata/inject/hello.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello.yaml rename to pkg/kube/inject/testdata/inject/hello.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/hello.yaml.injected b/pkg/kube/inject/testdata/inject/hello.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/hello.yaml.injected rename to pkg/kube/inject/testdata/inject/hello.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/job.yaml b/pkg/kube/inject/testdata/inject/job.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/job.yaml rename to pkg/kube/inject/testdata/inject/job.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/job.yaml.injected b/pkg/kube/inject/testdata/inject/job.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/job.yaml.injected rename to pkg/kube/inject/testdata/inject/job.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml b/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml rename to pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected b/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected rename to pkg/kube/inject/testdata/inject/kubevirtInterfaces.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml b/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml rename to pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected b/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected rename to pkg/kube/inject/testdata/inject/kubevirtInterfaces_list.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/list-frontend.yaml b/pkg/kube/inject/testdata/inject/list-frontend.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/list-frontend.yaml rename to pkg/kube/inject/testdata/inject/list-frontend.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/list-frontend.yaml.injected b/pkg/kube/inject/testdata/inject/list-frontend.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/list-frontend.yaml.injected rename to pkg/kube/inject/testdata/inject/list-frontend.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/list.yaml b/pkg/kube/inject/testdata/inject/list.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/list.yaml rename to pkg/kube/inject/testdata/inject/list.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/list.yaml.injected b/pkg/kube/inject/testdata/inject/list.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/list.yaml.injected rename to pkg/kube/inject/testdata/inject/list.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/multi-init.yaml b/pkg/kube/inject/testdata/inject/multi-init.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/multi-init.yaml rename to pkg/kube/inject/testdata/inject/multi-init.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/multi-init.yaml.injected b/pkg/kube/inject/testdata/inject/multi-init.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/multi-init.yaml.injected rename to pkg/kube/inject/testdata/inject/multi-init.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/pod-with-app.yaml b/pkg/kube/inject/testdata/inject/pod-with-app.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/pod-with-app.yaml rename to pkg/kube/inject/testdata/inject/pod-with-app.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/pod-with-app.yaml.injected b/pkg/kube/inject/testdata/inject/pod-with-app.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/pod-with-app.yaml.injected rename to pkg/kube/inject/testdata/inject/pod-with-app.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/pod.yaml b/pkg/kube/inject/testdata/inject/pod.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/pod.yaml rename to pkg/kube/inject/testdata/inject/pod.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/pod.yaml.injected b/pkg/kube/inject/testdata/inject/pod.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/pod.yaml.injected rename to pkg/kube/inject/testdata/inject/pod.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/replicaset.yaml b/pkg/kube/inject/testdata/inject/replicaset.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/replicaset.yaml rename to pkg/kube/inject/testdata/inject/replicaset.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/replicaset.yaml.injected b/pkg/kube/inject/testdata/inject/replicaset.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/replicaset.yaml.injected rename to pkg/kube/inject/testdata/inject/replicaset.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/replicationcontroller.yaml b/pkg/kube/inject/testdata/inject/replicationcontroller.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/replicationcontroller.yaml rename to pkg/kube/inject/testdata/inject/replicationcontroller.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/replicationcontroller.yaml.injected b/pkg/kube/inject/testdata/inject/replicationcontroller.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/replicationcontroller.yaml.injected rename to pkg/kube/inject/testdata/inject/replicationcontroller.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/statefulset.yaml b/pkg/kube/inject/testdata/inject/statefulset.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/statefulset.yaml rename to pkg/kube/inject/testdata/inject/statefulset.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/statefulset.yaml.injected b/pkg/kube/inject/testdata/inject/statefulset.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/statefulset.yaml.injected rename to pkg/kube/inject/testdata/inject/statefulset.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/status_annotations.yaml b/pkg/kube/inject/testdata/inject/status_annotations.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/status_annotations.yaml rename to pkg/kube/inject/testdata/inject/status_annotations.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/status_annotations.yaml.injected b/pkg/kube/inject/testdata/inject/status_annotations.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/status_annotations.yaml.injected rename to pkg/kube/inject/testdata/inject/status_annotations.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/status_params.yaml b/pkg/kube/inject/testdata/inject/status_params.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/status_params.yaml rename to pkg/kube/inject/testdata/inject/status_params.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/status_params.yaml.injected b/pkg/kube/inject/testdata/inject/status_params.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/status_params.yaml.injected rename to pkg/kube/inject/testdata/inject/status_params.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeinboundports.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeinboundports.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeinboundports.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeinboundports.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeipranges.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeipranges.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeipranges.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeipranges.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeoutboundports.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeoutboundports.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeoutboundports.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-bad-excludeoutboundports.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeinboundports.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeinboundports.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeinboundports.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeinboundports.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeipranges.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeipranges.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeipranges.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-bad-includeipranges.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected b/pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected rename to pkg/kube/inject/testdata/inject/traffic-annotations-empty-includes.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected b/pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected rename to pkg/kube/inject/testdata/inject/traffic-annotations-wildcards.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations.yaml b/pkg/kube/inject/testdata/inject/traffic-annotations.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations.yaml rename to pkg/kube/inject/testdata/inject/traffic-annotations.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-annotations.yaml.injected b/pkg/kube/inject/testdata/inject/traffic-annotations.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-annotations.yaml.injected rename to pkg/kube/inject/testdata/inject/traffic-annotations.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml b/pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml rename to pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected b/pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected rename to pkg/kube/inject/testdata/inject/traffic-params-empty-includes.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-params.yaml b/pkg/kube/inject/testdata/inject/traffic-params.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-params.yaml rename to pkg/kube/inject/testdata/inject/traffic-params.yaml diff --git a/pilot/pkg/kube/inject/testdata/inject/traffic-params.yaml.injected b/pkg/kube/inject/testdata/inject/traffic-params.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/inject/traffic-params.yaml.injected rename to pkg/kube/inject/testdata/inject/traffic-params.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite_template.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite_template.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite_template.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_nosidecar_rewrite_template.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation_template.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation_template.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation_template.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_disabled_via_annotation_template.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation_template.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation_template.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation_template.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_enabled_via_annotation_template.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_http_probe_rewrite_template.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite_template.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite_template.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite_template.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_https_probe_rewrite_template.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_containers_volumes_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_containers_volumes_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_continers_volumes.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_continers_volumes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_continers_volumes.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_continers_volumes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initContainers_volumes_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_initcontainers_containers_volumes_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_no_volumes_imagePullSecrets.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_replace.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch b/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.patch diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_replace_backwards_compat.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_template.yaml b/pkg/kube/inject/testdata/webhook/TestWebhookInject_template.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/TestWebhookInject_template.yaml rename to pkg/kube/inject/testdata/webhook/TestWebhookInject_template.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/daemonset.yaml b/pkg/kube/inject/testdata/webhook/daemonset.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/daemonset.yaml rename to pkg/kube/inject/testdata/webhook/daemonset.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/daemonset.yaml.injected b/pkg/kube/inject/testdata/webhook/daemonset.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/daemonset.yaml.injected rename to pkg/kube/inject/testdata/webhook/daemonset.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml b/pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml rename to pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml.injected b/pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml.injected rename to pkg/kube/inject/testdata/webhook/deploymentconfig-multi.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/deploymentconfig.yaml b/pkg/kube/inject/testdata/webhook/deploymentconfig.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/deploymentconfig.yaml rename to pkg/kube/inject/testdata/webhook/deploymentconfig.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/deploymentconfig.yaml.injected b/pkg/kube/inject/testdata/webhook/deploymentconfig.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/deploymentconfig.yaml.injected rename to pkg/kube/inject/testdata/webhook/deploymentconfig.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/frontend.yaml b/pkg/kube/inject/testdata/webhook/frontend.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/frontend.yaml rename to pkg/kube/inject/testdata/webhook/frontend.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/frontend.yaml.injected b/pkg/kube/inject/testdata/webhook/frontend.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/frontend.yaml.injected rename to pkg/kube/inject/testdata/webhook/frontend.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/hello-config-map-name.yaml.injected b/pkg/kube/inject/testdata/webhook/hello-config-map-name.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/hello-config-map-name.yaml.injected rename to pkg/kube/inject/testdata/webhook/hello-config-map-name.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/hello-multi.yaml b/pkg/kube/inject/testdata/webhook/hello-multi.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/hello-multi.yaml rename to pkg/kube/inject/testdata/webhook/hello-multi.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/hello-multi.yaml.injected b/pkg/kube/inject/testdata/webhook/hello-multi.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/hello-multi.yaml.injected rename to pkg/kube/inject/testdata/webhook/hello-multi.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/hello-probes.yaml b/pkg/kube/inject/testdata/webhook/hello-probes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/hello-probes.yaml rename to pkg/kube/inject/testdata/webhook/hello-probes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/hello-probes.yaml.injected b/pkg/kube/inject/testdata/webhook/hello-probes.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/hello-probes.yaml.injected rename to pkg/kube/inject/testdata/webhook/hello-probes.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/hello.yaml b/pkg/kube/inject/testdata/webhook/hello.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/hello.yaml rename to pkg/kube/inject/testdata/webhook/hello.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/job.yaml b/pkg/kube/inject/testdata/webhook/job.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/job.yaml rename to pkg/kube/inject/testdata/webhook/job.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/job.yaml.injected b/pkg/kube/inject/testdata/webhook/job.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/job.yaml.injected rename to pkg/kube/inject/testdata/webhook/job.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/list-frontend.yaml b/pkg/kube/inject/testdata/webhook/list-frontend.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/list-frontend.yaml rename to pkg/kube/inject/testdata/webhook/list-frontend.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/list-frontend.yaml.injected b/pkg/kube/inject/testdata/webhook/list-frontend.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/list-frontend.yaml.injected rename to pkg/kube/inject/testdata/webhook/list-frontend.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/list.yaml b/pkg/kube/inject/testdata/webhook/list.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/list.yaml rename to pkg/kube/inject/testdata/webhook/list.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/list.yaml.injected b/pkg/kube/inject/testdata/webhook/list.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/list.yaml.injected rename to pkg/kube/inject/testdata/webhook/list.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/multi-init.yaml b/pkg/kube/inject/testdata/webhook/multi-init.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/multi-init.yaml rename to pkg/kube/inject/testdata/webhook/multi-init.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/multi-init.yaml.injected b/pkg/kube/inject/testdata/webhook/multi-init.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/multi-init.yaml.injected rename to pkg/kube/inject/testdata/webhook/multi-init.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/replicaset.yaml b/pkg/kube/inject/testdata/webhook/replicaset.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/replicaset.yaml rename to pkg/kube/inject/testdata/webhook/replicaset.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/replicaset.yaml.injected b/pkg/kube/inject/testdata/webhook/replicaset.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/replicaset.yaml.injected rename to pkg/kube/inject/testdata/webhook/replicaset.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/replicationcontroller.yaml b/pkg/kube/inject/testdata/webhook/replicationcontroller.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/replicationcontroller.yaml rename to pkg/kube/inject/testdata/webhook/replicationcontroller.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/replicationcontroller.yaml.injected b/pkg/kube/inject/testdata/webhook/replicationcontroller.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/replicationcontroller.yaml.injected rename to pkg/kube/inject/testdata/webhook/replicationcontroller.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/resource_annotations.yaml b/pkg/kube/inject/testdata/webhook/resource_annotations.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/resource_annotations.yaml rename to pkg/kube/inject/testdata/webhook/resource_annotations.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/resource_annotations.yaml.injected b/pkg/kube/inject/testdata/webhook/resource_annotations.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/resource_annotations.yaml.injected rename to pkg/kube/inject/testdata/webhook/resource_annotations.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/statefulset.yaml b/pkg/kube/inject/testdata/webhook/statefulset.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/statefulset.yaml rename to pkg/kube/inject/testdata/webhook/statefulset.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/statefulset.yaml.injected b/pkg/kube/inject/testdata/webhook/statefulset.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/statefulset.yaml.injected rename to pkg/kube/inject/testdata/webhook/statefulset.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/status_annotations.yaml b/pkg/kube/inject/testdata/webhook/status_annotations.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/status_annotations.yaml rename to pkg/kube/inject/testdata/webhook/status_annotations.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/status_annotations.yaml.injected b/pkg/kube/inject/testdata/webhook/status_annotations.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/status_annotations.yaml.injected rename to pkg/kube/inject/testdata/webhook/status_annotations.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml b/pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml rename to pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml.injected b/pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml.injected rename to pkg/kube/inject/testdata/webhook/traffic-annotations-empty-includes.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml b/pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml rename to pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml.injected b/pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml.injected rename to pkg/kube/inject/testdata/webhook/traffic-annotations-wildcards.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/traffic-annotations.yaml b/pkg/kube/inject/testdata/webhook/traffic-annotations.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/traffic-annotations.yaml rename to pkg/kube/inject/testdata/webhook/traffic-annotations.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/traffic-annotations.yaml.injected b/pkg/kube/inject/testdata/webhook/traffic-annotations.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/traffic-annotations.yaml.injected rename to pkg/kube/inject/testdata/webhook/traffic-annotations.yaml.injected diff --git a/pilot/pkg/kube/inject/testdata/webhook/user-volume.yaml b/pkg/kube/inject/testdata/webhook/user-volume.yaml similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/user-volume.yaml rename to pkg/kube/inject/testdata/webhook/user-volume.yaml diff --git a/pilot/pkg/kube/inject/testdata/webhook/user-volume.yaml.injected b/pkg/kube/inject/testdata/webhook/user-volume.yaml.injected similarity index 100% rename from pilot/pkg/kube/inject/testdata/webhook/user-volume.yaml.injected rename to pkg/kube/inject/testdata/webhook/user-volume.yaml.injected diff --git a/pilot/pkg/kube/inject/webhook.go b/pkg/kube/inject/webhook.go similarity index 100% rename from pilot/pkg/kube/inject/webhook.go rename to pkg/kube/inject/webhook.go diff --git a/pilot/pkg/kube/inject/webhook_test.go b/pkg/kube/inject/webhook_test.go similarity index 99% rename from pilot/pkg/kube/inject/webhook_test.go rename to pkg/kube/inject/webhook_test.go index 27281bbb3785..fbc615fec82d 100644 --- a/pilot/pkg/kube/inject/webhook_test.go +++ b/pkg/kube/inject/webhook_test.go @@ -53,9 +53,9 @@ import ( ) const ( - helmChartDirectory = "../../../../install/kubernetes/helm/istio" + helmChartDirectory = "../../../install/kubernetes/helm/istio" helmConfigMapKey = "istio/templates/sidecar-injector-configmap.yaml" - injectorConfig = "../../../../install/kubernetes/helm/istio/files/injection-template.yaml" + injectorConfig = "../../../install/kubernetes/helm/istio/files/injection-template.yaml" helmValuesFile = "values.yaml" yamlSeparator = "\n---" minimalSidecarTemplate = ` diff --git a/pilot/cmd/sidecar-injector/main.go b/sidecar-injector/cmd/sidecar-injector/main.go similarity index 98% rename from pilot/cmd/sidecar-injector/main.go rename to sidecar-injector/cmd/sidecar-injector/main.go index 80107e3fb2e5..4a3392b1e17d 100644 --- a/pilot/cmd/sidecar-injector/main.go +++ b/sidecar-injector/cmd/sidecar-injector/main.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - multierror "github.com/hashicorp/go-multierror" + "github.com/hashicorp/go-multierror" "github.com/howeyc/fsnotify" "github.com/spf13/cobra" "github.com/spf13/cobra/doc" @@ -33,9 +33,9 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/client-go/tools/cache" - "istio.io/istio/pilot/pkg/kube/inject" "istio.io/istio/pkg/cmd" "istio.io/istio/pkg/kube" + "istio.io/istio/pkg/kube/inject" "istio.io/istio/pkg/util" "istio.io/pkg/collateral" "istio.io/pkg/log" diff --git a/pilot/docker/Dockerfile.sidecar_injector b/sidecar-injector/docker/Dockerfile.sidecar_injector similarity index 100% rename from pilot/docker/Dockerfile.sidecar_injector rename to sidecar-injector/docker/Dockerfile.sidecar_injector diff --git a/tests/e2e/tests/pilot/pilot_test.go b/tests/e2e/tests/pilot/pilot_test.go index a93b3b693dd9..81a3bb805c5e 100644 --- a/tests/e2e/tests/pilot/pilot_test.go +++ b/tests/e2e/tests/pilot/pilot_test.go @@ -29,8 +29,8 @@ import ( "go.uber.org/multierr" - "istio.io/istio/pilot/pkg/kube/inject" util2 "istio.io/istio/pilot/test/util" + "istio.io/istio/pkg/kube/inject" "istio.io/istio/tests/e2e/framework" "istio.io/istio/tests/util" "istio.io/pkg/log" diff --git a/tools/istio-docker.mk b/tools/istio-docker.mk index a0e91a904899..17a03d4df6cf 100644 --- a/tools/istio-docker.mk +++ b/tools/istio-docker.mk @@ -88,7 +88,7 @@ docker.proxy_init: $(ISTIO_DOCKER)/istio-iptables fi $(DOCKER_RULE) -docker.sidecar_injector: pilot/docker/Dockerfile.sidecar_injector +docker.sidecar_injector: sidecar-injector/docker/Dockerfile.sidecar_injector docker.sidecar_injector:$(ISTIO_DOCKER)/sidecar-injector $(DOCKER_RULE)