Move kube/inject out of Pilot (istio#16284)

* Move pilot/pkg/kube/inject -> pkg/kube/inject * Break out sidecar-injector to top level
mfilipiak-ccg · Aug 16, 2019 · 45a3140 · 45a3140
1 parent 6f4be1d
commit 45a3140
Show file tree

Hide file tree

Showing 214 changed files with 15 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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 → pkg/kube/inject/app_probe.go b/pilot/pkg/kube/inject/app_probe.go → pkg/kube/inject/app_probe.go
diff --git a/pilot/pkg/kube/inject/app_probe_test.go → pkg/kube/inject/app_probe_test.go b/pilot/pkg/kube/inject/app_probe_test.go → pkg/kube/inject/app_probe_test.go
diff --git a/pilot/pkg/kube/inject/concurrency.go → pkg/kube/inject/concurrency.go b/pilot/pkg/kube/inject/concurrency.go → pkg/kube/inject/concurrency.go
diff --git a/pilot/pkg/kube/inject/concurrency_test.go → pkg/kube/inject/concurrency_test.go b/pilot/pkg/kube/inject/concurrency_test.go → pkg/kube/inject/concurrency_test.go
diff --git a/pilot/pkg/kube/inject/initializer.go → pkg/kube/inject/initializer.go b/pilot/pkg/kube/inject/initializer.go → pkg/kube/inject/initializer.go
diff --git a/pilot/pkg/kube/inject/inject.go → pkg/kube/inject/inject.go b/pilot/pkg/kube/inject/inject.go → pkg/kube/inject/inject.go
diff --git a/pilot/pkg/kube/inject/inject_test.go → pkg/kube/inject/inject_test.go b/pilot/pkg/kube/inject/inject_test.go → pkg/kube/inject/inject_test.go
diff --git a/pilot/pkg/kube/inject/monitoring.go → pkg/kube/inject/monitoring.go b/pilot/pkg/kube/inject/monitoring.go → pkg/kube/inject/monitoring.go
diff --git a/...o-probes-with-flag-set-in-annotation.yaml → ...o-probes-with-flag-set-in-annotation.yaml b/...o-probes-with-flag-set-in-annotation.yaml → ...o-probes-with-flag-set-in-annotation.yaml
diff --git a/...with-flag-set-in-annotation.yaml.injected → ...with-flag-set-in-annotation.yaml.injected b/...with-flag-set-in-annotation.yaml.injected → ...with-flag-set-in-annotation.yaml.injected
diff --git a/...probes-with-flag-unset-in-annotation.yaml → ...probes-with-flag-unset-in-annotation.yaml b/...probes-with-flag-unset-in-annotation.yaml → ...probes-with-flag-unset-in-annotation.yaml
diff --git a/...th-flag-unset-in-annotation.yaml.injected → ...th-flag-unset-in-annotation.yaml.injected b/...th-flag-unset-in-annotation.yaml.injected → ...th-flag-unset-in-annotation.yaml.injected
diff --git a/...stdata/inject/app_probe/hello-probes.yaml → ...stdata/inject/app_probe/hello-probes.yaml b/...stdata/inject/app_probe/hello-probes.yaml → ...stdata/inject/app_probe/hello-probes.yaml
diff --git a/...ject/app_probe/hello-probes.yaml.injected → ...ject/app_probe/hello-probes.yaml.injected b/...ject/app_probe/hello-probes.yaml.injected → ...ject/app_probe/hello-probes.yaml.injected
diff --git a/...ata/inject/app_probe/hello-readiness.yaml → ...ata/inject/app_probe/hello-readiness.yaml b/...ata/inject/app_probe/hello-readiness.yaml → ...ata/inject/app_probe/hello-readiness.yaml
diff --git a/...t/app_probe/hello-readiness.yaml.injected → ...t/app_probe/hello-readiness.yaml.injected b/...t/app_probe/hello-readiness.yaml.injected → ...t/app_probe/hello-readiness.yaml.injected
diff --git a/...stdata/inject/app_probe/https-probes.yaml → ...stdata/inject/app_probe/https-probes.yaml b/...stdata/inject/app_probe/https-probes.yaml → ...stdata/inject/app_probe/https-probes.yaml
diff --git a/...ject/app_probe/https-probes.yaml.injected → ...ject/app_probe/https-probes.yaml.injected b/...ject/app_probe/https-probes.yaml.injected → ...ject/app_probe/https-probes.yaml.injected
diff --git a/...testdata/inject/app_probe/named_port.yaml → ...testdata/inject/app_probe/named_port.yaml b/...testdata/inject/app_probe/named_port.yaml → ...testdata/inject/app_probe/named_port.yaml
diff --git a/...inject/app_probe/named_port.yaml.injected → ...inject/app_probe/named_port.yaml.injected b/...inject/app_probe/named_port.yaml.injected → ...inject/app_probe/named_port.yaml.injected
diff --git a/...tdata/inject/app_probe/one_container.yaml → ...tdata/inject/app_probe/one_container.yaml b/...tdata/inject/app_probe/one_container.yaml → ...tdata/inject/app_probe/one_container.yaml
diff --git a/...ect/app_probe/one_container.yaml.injected → ...ect/app_probe/one_container.yaml.injected b/...ect/app_probe/one_container.yaml.injected → ...ect/app_probe/one_container.yaml.injected
diff --git a/...testdata/inject/app_probe/ready_live.yaml → ...testdata/inject/app_probe/ready_live.yaml b/...testdata/inject/app_probe/ready_live.yaml → ...testdata/inject/app_probe/ready_live.yaml
diff --git a/...inject/app_probe/ready_live.yaml.injected → ...inject/app_probe/ready_live.yaml.injected b/...inject/app_probe/ready_live.yaml.injected → ...inject/app_probe/ready_live.yaml.injected
diff --git a/...testdata/inject/app_probe/ready_only.yaml → ...testdata/inject/app_probe/ready_only.yaml b/...testdata/inject/app_probe/ready_only.yaml → ...testdata/inject/app_probe/ready_only.yaml
diff --git a/...inject/app_probe/ready_only.yaml.injected → ...inject/app_probe/ready_only.yaml.injected b/...inject/app_probe/ready_only.yaml.injected → ...inject/app_probe/ready_only.yaml.injected
diff --git a/...tdata/inject/app_probe/two_container.yaml → ...tdata/inject/app_probe/two_container.yaml b/...tdata/inject/app_probe/two_container.yaml → ...tdata/inject/app_probe/two_container.yaml
diff --git a/...ect/app_probe/two_container.yaml.injected → ...ect/app_probe/two_container.yaml.injected b/...ect/app_probe/two_container.yaml.injected → ...ect/app_probe/two_container.yaml.injected
diff --git a/...stdata/inject/auth.cert-dir.yaml.injected → ...stdata/inject/auth.cert-dir.yaml.injected b/...stdata/inject/auth.cert-dir.yaml.injected → ...stdata/inject/auth.cert-dir.yaml.injected
diff --git a/...ect/auth.non-default-service-account.yaml → ...ect/auth.non-default-service-account.yaml b/...ect/auth.non-default-service-account.yaml → ...ect/auth.non-default-service-account.yaml
diff --git a/...non-default-service-account.yaml.injected → ...non-default-service-account.yaml.injected b/...non-default-service-account.yaml.injected → ...non-default-service-account.yaml.injected
diff --git a/...pkg/kube/inject/testdata/inject/auth.yaml → pkg/kube/inject/testdata/inject/auth.yaml b/...pkg/kube/inject/testdata/inject/auth.yaml → pkg/kube/inject/testdata/inject/auth.yaml
diff --git a/...inject/testdata/inject/auth.yaml.injected → ...inject/testdata/inject/auth.yaml.injected b/...inject/testdata/inject/auth.yaml.injected → ...inject/testdata/inject/auth.yaml.injected
diff --git a/...ect/testdata/inject/cronjob-with-app.yaml → ...ect/testdata/inject/cronjob-with-app.yaml b/...ect/testdata/inject/cronjob-with-app.yaml → ...ect/testdata/inject/cronjob-with-app.yaml
diff --git a/...ata/inject/cronjob-with-app.yaml.injected → ...ata/inject/cronjob-with-app.yaml.injected b/...ata/inject/cronjob-with-app.yaml.injected → ...ata/inject/cronjob-with-app.yaml.injected
diff --git a/.../kube/inject/testdata/inject/cronjob.yaml → pkg/kube/inject/testdata/inject/cronjob.yaml b/.../kube/inject/testdata/inject/cronjob.yaml → pkg/kube/inject/testdata/inject/cronjob.yaml
diff --git a/...ect/testdata/inject/cronjob.yaml.injected → ...ect/testdata/inject/cronjob.yaml.injected b/...ect/testdata/inject/cronjob.yaml.injected → ...ect/testdata/inject/cronjob.yaml.injected
diff --git a/...ube/inject/testdata/inject/daemonset.yaml → ...ube/inject/testdata/inject/daemonset.yaml b/...ube/inject/testdata/inject/daemonset.yaml → ...ube/inject/testdata/inject/daemonset.yaml
diff --git a/...t/testdata/inject/daemonset.yaml.injected → ...t/testdata/inject/daemonset.yaml.injected b/...t/testdata/inject/daemonset.yaml.injected → ...t/testdata/inject/daemonset.yaml.injected
diff --git a/...stdata/inject/deployment-user-volume.yaml → ...stdata/inject/deployment-user-volume.yaml b/...stdata/inject/deployment-user-volume.yaml → ...stdata/inject/deployment-user-volume.yaml
diff --git a/...stdata/inject/deploymentconfig-multi.yaml → ...stdata/inject/deploymentconfig-multi.yaml b/...stdata/inject/deploymentconfig-multi.yaml → ...stdata/inject/deploymentconfig-multi.yaml
diff --git a/...ject/deploymentconfig-multi.yaml.injected → ...ject/deploymentconfig-multi.yaml.injected b/...ject/deploymentconfig-multi.yaml.injected → ...ject/deploymentconfig-multi.yaml.injected
diff --git a/...ect/testdata/inject/deploymentconfig.yaml → ...ect/testdata/inject/deploymentconfig.yaml b/...ect/testdata/inject/deploymentconfig.yaml → ...ect/testdata/inject/deploymentconfig.yaml
diff --git a/...ata/inject/deploymentconfig.yaml.injected → ...ata/inject/deploymentconfig.yaml.injected b/...ata/inject/deploymentconfig.yaml.injected → ...ata/inject/deploymentconfig.yaml.injected
diff --git a/...ect/testdata/inject/enable-core-dump.yaml → ...ect/testdata/inject/enable-core-dump.yaml b/...ect/testdata/inject/enable-core-dump.yaml → ...ect/testdata/inject/enable-core-dump.yaml
diff --git a/...ata/inject/enable-core-dump.yaml.injected → ...ata/inject/enable-core-dump.yaml.injected b/...ata/inject/enable-core-dump.yaml.injected → ...ata/inject/enable-core-dump.yaml.injected
diff --git a/...ject/testdata/inject/format-duration.yaml → ...ject/testdata/inject/format-duration.yaml b/...ject/testdata/inject/format-duration.yaml → ...ject/testdata/inject/format-duration.yaml
diff --git a/...data/inject/format-duration.yaml.injected → ...data/inject/format-duration.yaml.injected b/...data/inject/format-duration.yaml.injected → ...data/inject/format-duration.yaml.injected
diff --git a/...kube/inject/testdata/inject/frontend.yaml → ...kube/inject/testdata/inject/frontend.yaml b/...kube/inject/testdata/inject/frontend.yaml → ...kube/inject/testdata/inject/frontend.yaml
diff --git a/...ct/testdata/inject/frontend.yaml.injected → ...ct/testdata/inject/frontend.yaml.injected b/...ct/testdata/inject/frontend.yaml.injected → ...ct/testdata/inject/frontend.yaml.injected
diff --git a/...estdata/inject/hello-always.yaml.injected → ...estdata/inject/hello-always.yaml.injected b/...estdata/inject/hello-always.yaml.injected → ...estdata/inject/hello-always.yaml.injected
diff --git a/...nject/hello-config-map-name.yaml.injected → ...nject/hello-config-map-name.yaml.injected b/...nject/hello-config-map-name.yaml.injected → ...nject/hello-config-map-name.yaml.injected
diff --git a/...t/testdata/inject/hello-host-network.yaml → ...t/testdata/inject/hello-host-network.yaml b/...t/testdata/inject/hello-host-network.yaml → ...t/testdata/inject/hello-host-network.yaml
diff --git a/...a/inject/hello-host-network.yaml.injected → ...a/inject/hello-host-network.yaml.injected b/...a/inject/hello-host-network.yaml.injected → ...a/inject/hello-host-network.yaml.injected
diff --git a/.../inject/testdata/inject/hello-ignore.yaml → .../inject/testdata/inject/hello-ignore.yaml b/.../inject/testdata/inject/hello-ignore.yaml → .../inject/testdata/inject/hello-ignore.yaml
diff --git a/...estdata/inject/hello-ignore.yaml.injected → ...estdata/inject/hello-ignore.yaml.injected b/...estdata/inject/hello-ignore.yaml.injected → ...estdata/inject/hello-ignore.yaml.injected
diff --git a/...e/inject/testdata/inject/hello-multi.yaml → ...e/inject/testdata/inject/hello-multi.yaml b/...e/inject/testdata/inject/hello-multi.yaml → ...e/inject/testdata/inject/hello-multi.yaml
diff --git a/...testdata/inject/hello-multi.yaml.injected → ...testdata/inject/hello-multi.yaml.injected b/...testdata/inject/hello-multi.yaml.injected → ...testdata/inject/hello-multi.yaml.injected
diff --git a/...ject/testdata/inject/hello-namespace.yaml → ...ject/testdata/inject/hello-namespace.yaml b/...ject/testdata/inject/hello-namespace.yaml → ...ject/testdata/inject/hello-namespace.yaml
diff --git a/...data/inject/hello-namespace.yaml.injected → ...data/inject/hello-namespace.yaml.injected b/...data/inject/hello-namespace.yaml.injected → ...data/inject/hello-namespace.yaml.injected
diff --git a/...testdata/inject/hello-never.yaml.injected → ...testdata/inject/hello-never.yaml.injected b/...testdata/inject/hello-never.yaml.injected → ...testdata/inject/hello-never.yaml.injected
diff --git a/...testdata/inject/hello-proxy-override.yaml → ...testdata/inject/hello-proxy-override.yaml b/...testdata/inject/hello-proxy-override.yaml → ...testdata/inject/hello-proxy-override.yaml
diff --git a/...inject/hello-proxy-override.yaml.injected → ...inject/hello-proxy-override.yaml.injected b/...inject/hello-proxy-override.yaml.injected → ...inject/hello-proxy-override.yaml.injected
diff --git a/...ject/testdata/inject/hello-readiness.yaml → ...ject/testdata/inject/hello-readiness.yaml b/...ject/testdata/inject/hello-readiness.yaml → ...ject/testdata/inject/hello-readiness.yaml
diff --git a/...inject/testdata/inject/hello-service.yaml → ...inject/testdata/inject/hello-service.yaml b/...inject/testdata/inject/hello-service.yaml → ...inject/testdata/inject/hello-service.yaml
diff --git a/...stdata/inject/hello-service.yaml.injected → ...stdata/inject/hello-service.yaml.injected b/...stdata/inject/hello-service.yaml.injected → ...stdata/inject/hello-service.yaml.injected
diff --git a/...ct/hello-template-in-values.yaml.injected → ...ct/hello-template-in-values.yaml.injected b/...ct/hello-template-in-values.yaml.injected → ...ct/hello-template-in-values.yaml.injected
diff --git a/...a/inject/hello-tproxy-debug.yaml.injected → ...a/inject/hello-tproxy-debug.yaml.injected b/...a/inject/hello-tproxy-debug.yaml.injected → ...a/inject/hello-tproxy-debug.yaml.injected
diff --git a/...estdata/inject/hello-tproxy.yaml.injected → ...estdata/inject/hello-tproxy.yaml.injected b/...estdata/inject/hello-tproxy.yaml.injected → ...estdata/inject/hello-tproxy.yaml.injected
diff --git a/...kg/kube/inject/testdata/inject/hello.yaml → pkg/kube/inject/testdata/inject/hello.yaml b/...kg/kube/inject/testdata/inject/hello.yaml → pkg/kube/inject/testdata/inject/hello.yaml
diff --git a/...nject/testdata/inject/hello.yaml.injected → ...nject/testdata/inject/hello.yaml.injected b/...nject/testdata/inject/hello.yaml.injected → ...nject/testdata/inject/hello.yaml.injected
diff --git a/.../pkg/kube/inject/testdata/inject/job.yaml → pkg/kube/inject/testdata/inject/job.yaml b/.../pkg/kube/inject/testdata/inject/job.yaml → pkg/kube/inject/testdata/inject/job.yaml
diff --git a/.../inject/testdata/inject/job.yaml.injected → .../inject/testdata/inject/job.yaml.injected b/.../inject/testdata/inject/job.yaml.injected → .../inject/testdata/inject/job.yaml.injected
diff --git a/...t/testdata/inject/kubevirtInterfaces.yaml → ...t/testdata/inject/kubevirtInterfaces.yaml b/...t/testdata/inject/kubevirtInterfaces.yaml → ...t/testdata/inject/kubevirtInterfaces.yaml
diff --git a/...a/inject/kubevirtInterfaces.yaml.injected → ...a/inject/kubevirtInterfaces.yaml.injected b/...a/inject/kubevirtInterfaces.yaml.injected → ...a/inject/kubevirtInterfaces.yaml.injected
diff --git a/...tdata/inject/kubevirtInterfaces_list.yaml → ...tdata/inject/kubevirtInterfaces_list.yaml b/...tdata/inject/kubevirtInterfaces_list.yaml → ...tdata/inject/kubevirtInterfaces_list.yaml
diff --git a/...ect/kubevirtInterfaces_list.yaml.injected → ...ect/kubevirtInterfaces_list.yaml.injected b/...ect/kubevirtInterfaces_list.yaml.injected → ...ect/kubevirtInterfaces_list.yaml.injected
diff --git a/...inject/testdata/inject/list-frontend.yaml → ...inject/testdata/inject/list-frontend.yaml b/...inject/testdata/inject/list-frontend.yaml → ...inject/testdata/inject/list-frontend.yaml
diff --git a/...stdata/inject/list-frontend.yaml.injected → ...stdata/inject/list-frontend.yaml.injected b/...stdata/inject/list-frontend.yaml.injected → ...stdata/inject/list-frontend.yaml.injected
diff --git a/...pkg/kube/inject/testdata/inject/list.yaml → pkg/kube/inject/testdata/inject/list.yaml b/...pkg/kube/inject/testdata/inject/list.yaml → pkg/kube/inject/testdata/inject/list.yaml
diff --git a/...inject/testdata/inject/list.yaml.injected → ...inject/testdata/inject/list.yaml.injected b/...inject/testdata/inject/list.yaml.injected → ...inject/testdata/inject/list.yaml.injected
diff --git a/...be/inject/testdata/inject/multi-init.yaml → ...be/inject/testdata/inject/multi-init.yaml b/...be/inject/testdata/inject/multi-init.yaml → ...be/inject/testdata/inject/multi-init.yaml
diff --git a/.../testdata/inject/multi-init.yaml.injected → .../testdata/inject/multi-init.yaml.injected b/.../testdata/inject/multi-init.yaml.injected → .../testdata/inject/multi-init.yaml.injected
diff --git a/.../inject/testdata/inject/pod-with-app.yaml → .../inject/testdata/inject/pod-with-app.yaml b/.../inject/testdata/inject/pod-with-app.yaml → .../inject/testdata/inject/pod-with-app.yaml
diff --git a/...estdata/inject/pod-with-app.yaml.injected → ...estdata/inject/pod-with-app.yaml.injected b/...estdata/inject/pod-with-app.yaml.injected → ...estdata/inject/pod-with-app.yaml.injected
diff --git a/.../pkg/kube/inject/testdata/inject/pod.yaml → pkg/kube/inject/testdata/inject/pod.yaml b/.../pkg/kube/inject/testdata/inject/pod.yaml → pkg/kube/inject/testdata/inject/pod.yaml
diff --git a/.../inject/testdata/inject/pod.yaml.injected → .../inject/testdata/inject/pod.yaml.injected b/.../inject/testdata/inject/pod.yaml.injected → .../inject/testdata/inject/pod.yaml.injected
diff --git a/...be/inject/testdata/inject/replicaset.yaml → ...be/inject/testdata/inject/replicaset.yaml b/...be/inject/testdata/inject/replicaset.yaml → ...be/inject/testdata/inject/replicaset.yaml
diff --git a/.../testdata/inject/replicaset.yaml.injected → .../testdata/inject/replicaset.yaml.injected b/.../testdata/inject/replicaset.yaml.injected → .../testdata/inject/replicaset.yaml.injected
diff --git a/...estdata/inject/replicationcontroller.yaml → ...estdata/inject/replicationcontroller.yaml b/...estdata/inject/replicationcontroller.yaml → ...estdata/inject/replicationcontroller.yaml
diff --git a/...nject/replicationcontroller.yaml.injected → ...nject/replicationcontroller.yaml.injected b/...nject/replicationcontroller.yaml.injected → ...nject/replicationcontroller.yaml.injected
diff --git a/...e/inject/testdata/inject/statefulset.yaml → ...e/inject/testdata/inject/statefulset.yaml b/...e/inject/testdata/inject/statefulset.yaml → ...e/inject/testdata/inject/statefulset.yaml
diff --git a/...testdata/inject/statefulset.yaml.injected → ...testdata/inject/statefulset.yaml.injected b/...testdata/inject/statefulset.yaml.injected → ...testdata/inject/statefulset.yaml.injected
diff --git a/...t/testdata/inject/status_annotations.yaml → ...t/testdata/inject/status_annotations.yaml b/...t/testdata/inject/status_annotations.yaml → ...t/testdata/inject/status_annotations.yaml
diff --git a/...a/inject/status_annotations.yaml.injected → ...a/inject/status_annotations.yaml.injected b/...a/inject/status_annotations.yaml.injected → ...a/inject/status_annotations.yaml.injected
diff --git a/...inject/testdata/inject/status_params.yaml → ...inject/testdata/inject/status_params.yaml b/...inject/testdata/inject/status_params.yaml → ...inject/testdata/inject/status_params.yaml
diff --git a/...stdata/inject/status_params.yaml.injected → ...stdata/inject/status_params.yaml.injected b/...stdata/inject/status_params.yaml.injected → ...stdata/inject/status_params.yaml.injected
diff --git a/...-annotations-bad-excludeinboundports.yaml → ...-annotations-bad-excludeinboundports.yaml b/...-annotations-bad-excludeinboundports.yaml → ...-annotations-bad-excludeinboundports.yaml
diff --git a/...ffic-annotations-bad-excludeipranges.yaml → ...ffic-annotations-bad-excludeipranges.yaml b/...ffic-annotations-bad-excludeipranges.yaml → ...ffic-annotations-bad-excludeipranges.yaml
diff --git a/...annotations-bad-excludeoutboundports.yaml → ...annotations-bad-excludeoutboundports.yaml b/...annotations-bad-excludeoutboundports.yaml → ...annotations-bad-excludeoutboundports.yaml
diff --git a/...-annotations-bad-includeinboundports.yaml → ...-annotations-bad-includeinboundports.yaml b/...-annotations-bad-includeinboundports.yaml → ...-annotations-bad-includeinboundports.yaml
diff --git a/...ffic-annotations-bad-includeipranges.yaml → ...ffic-annotations-bad-includeipranges.yaml b/...ffic-annotations-bad-includeipranges.yaml → ...ffic-annotations-bad-includeipranges.yaml
diff --git a/...t/traffic-annotations-empty-includes.yaml → ...t/traffic-annotations-empty-includes.yaml b/...t/traffic-annotations-empty-includes.yaml → ...t/traffic-annotations-empty-includes.yaml
diff --git a/...-annotations-empty-includes.yaml.injected → ...-annotations-empty-includes.yaml.injected b/...-annotations-empty-includes.yaml.injected → ...-annotations-empty-includes.yaml.injected
diff --git a/...inject/traffic-annotations-wildcards.yaml → ...inject/traffic-annotations-wildcards.yaml b/...inject/traffic-annotations-wildcards.yaml → ...inject/traffic-annotations-wildcards.yaml
diff --git a/...affic-annotations-wildcards.yaml.injected → ...affic-annotations-wildcards.yaml.injected b/...affic-annotations-wildcards.yaml.injected → ...affic-annotations-wildcards.yaml.injected
diff --git a/.../testdata/inject/traffic-annotations.yaml → .../testdata/inject/traffic-annotations.yaml b/.../testdata/inject/traffic-annotations.yaml → .../testdata/inject/traffic-annotations.yaml
diff --git a/.../inject/traffic-annotations.yaml.injected → .../inject/traffic-annotations.yaml.injected b/.../inject/traffic-annotations.yaml.injected → .../inject/traffic-annotations.yaml.injected
diff --git a/...inject/traffic-params-empty-includes.yaml → ...inject/traffic-params-empty-includes.yaml b/...inject/traffic-params-empty-includes.yaml → ...inject/traffic-params-empty-includes.yaml
diff --git a/...affic-params-empty-includes.yaml.injected → ...affic-params-empty-includes.yaml.injected b/...affic-params-empty-includes.yaml.injected → ...affic-params-empty-includes.yaml.injected
diff --git a/...nject/testdata/inject/traffic-params.yaml → ...nject/testdata/inject/traffic-params.yaml b/...nject/testdata/inject/traffic-params.yaml → ...nject/testdata/inject/traffic-params.yaml
diff --git a/...tdata/inject/traffic-params.yaml.injected → ...tdata/inject/traffic-params.yaml.injected b/...tdata/inject/traffic-params.yaml.injected → ...tdata/inject/traffic-params.yaml.injected
diff --git a/.../testdata/webhook/TestWebhookInject.patch → .../testdata/webhook/TestWebhookInject.patch b/.../testdata/webhook/TestWebhookInject.patch → .../testdata/webhook/TestWebhookInject.patch
diff --git a/...t/testdata/webhook/TestWebhookInject.yaml → ...t/testdata/webhook/TestWebhookInject.yaml b/...t/testdata/webhook/TestWebhookInject.yaml → ...t/testdata/webhook/TestWebhookInject.yaml
diff --git a/...Inject_http_probe_nosidecar_rewrite.patch → ...Inject_http_probe_nosidecar_rewrite.patch b/...Inject_http_probe_nosidecar_rewrite.patch → ...Inject_http_probe_nosidecar_rewrite.patch
diff --git a/...kInject_http_probe_nosidecar_rewrite.yaml → ...kInject_http_probe_nosidecar_rewrite.yaml b/...kInject_http_probe_nosidecar_rewrite.yaml → ...kInject_http_probe_nosidecar_rewrite.yaml
diff --git a/...ttp_probe_nosidecar_rewrite_template.yaml → ...ttp_probe_nosidecar_rewrite_template.yaml b/...ttp_probe_nosidecar_rewrite_template.yaml → ...ttp_probe_nosidecar_rewrite_template.yaml
diff --git a/...estWebhookInject_http_probe_rewrite.patch → ...estWebhookInject_http_probe_rewrite.patch b/...estWebhookInject_http_probe_rewrite.patch → ...estWebhookInject_http_probe_rewrite.patch
diff --git a/...TestWebhookInject_http_probe_rewrite.yaml → ...TestWebhookInject_http_probe_rewrite.yaml b/...TestWebhookInject_http_probe_rewrite.yaml → ...TestWebhookInject_http_probe_rewrite.yaml
diff --git a/...obe_rewrite_disabled_via_annotation.patch → ...obe_rewrite_disabled_via_annotation.patch b/...obe_rewrite_disabled_via_annotation.patch → ...obe_rewrite_disabled_via_annotation.patch
diff --git a/...robe_rewrite_disabled_via_annotation.yaml → ...robe_rewrite_disabled_via_annotation.yaml b/...robe_rewrite_disabled_via_annotation.yaml → ...robe_rewrite_disabled_via_annotation.yaml
diff --git a/...ite_disabled_via_annotation_template.yaml → ...ite_disabled_via_annotation_template.yaml b/...ite_disabled_via_annotation_template.yaml → ...ite_disabled_via_annotation_template.yaml
diff --git a/...robe_rewrite_enabled_via_annotation.patch → ...robe_rewrite_enabled_via_annotation.patch b/...robe_rewrite_enabled_via_annotation.patch → ...robe_rewrite_enabled_via_annotation.patch
diff --git a/...probe_rewrite_enabled_via_annotation.yaml → ...probe_rewrite_enabled_via_annotation.yaml b/...probe_rewrite_enabled_via_annotation.yaml → ...probe_rewrite_enabled_via_annotation.yaml
diff --git a/...rite_enabled_via_annotation_template.yaml → ...rite_enabled_via_annotation_template.yaml b/...rite_enabled_via_annotation_template.yaml → ...rite_enabled_via_annotation_template.yaml
diff --git a/...okInject_http_probe_rewrite_template.yaml → ...okInject_http_probe_rewrite_template.yaml b/...okInject_http_probe_rewrite_template.yaml → ...okInject_http_probe_rewrite_template.yaml
diff --git a/...stWebhookInject_https_probe_rewrite.patch → ...stWebhookInject_https_probe_rewrite.patch b/...stWebhookInject_https_probe_rewrite.patch → ...stWebhookInject_https_probe_rewrite.patch
diff --git a/...estWebhookInject_https_probe_rewrite.yaml → ...estWebhookInject_https_probe_rewrite.yaml b/...estWebhookInject_https_probe_rewrite.yaml → ...estWebhookInject_https_probe_rewrite.yaml
diff --git a/...kInject_https_probe_rewrite_template.yaml → ...kInject_https_probe_rewrite_template.yaml b/...kInject_https_probe_rewrite_template.yaml → ...kInject_https_probe_rewrite_template.yaml
diff --git a/...ook/TestWebhookInject_no_containers.patch → ...ook/TestWebhookInject_no_containers.patch b/...ook/TestWebhookInject_no_containers.patch → ...ook/TestWebhookInject_no_containers.patch
diff --git a/...hook/TestWebhookInject_no_containers.yaml → ...hook/TestWebhookInject_no_containers.yaml b/...hook/TestWebhookInject_no_containers.yaml → ...hook/TestWebhookInject_no_containers.yaml
diff --git a/...ject_no_containers_imagePullSecrets.patch → ...ject_no_containers_imagePullSecrets.patch b/...ject_no_containers_imagePullSecrets.patch → ...ject_no_containers_imagePullSecrets.patch
diff --git a/...nject_no_containers_imagePullSecrets.yaml → ...nject_no_containers_imagePullSecrets.yaml b/...nject_no_containers_imagePullSecrets.yaml → ...nject_no_containers_imagePullSecrets.yaml
diff --git a/...WebhookInject_no_containers_volumes.patch → ...WebhookInject_no_containers_volumes.patch b/...WebhookInject_no_containers_volumes.patch → ...WebhookInject_no_containers_volumes.patch
diff --git a/...tWebhookInject_no_containers_volumes.yaml → ...tWebhookInject_no_containers_volumes.yaml b/...tWebhookInject_no_containers_volumes.yaml → ...tWebhookInject_no_containers_volumes.yaml
diff --git a/...containers_volumes_imagePullSecrets.patch → ...containers_volumes_imagePullSecrets.patch b/...containers_volumes_imagePullSecrets.patch → ...containers_volumes_imagePullSecrets.patch
diff --git a/..._containers_volumes_imagePullSecrets.yaml → ..._containers_volumes_imagePullSecrets.yaml b/..._containers_volumes_imagePullSecrets.yaml → ..._containers_volumes_imagePullSecrets.yaml
diff --git a/...stWebhookInject_no_imagePullSecrets.patch → ...stWebhookInject_no_imagePullSecrets.patch b/...stWebhookInject_no_imagePullSecrets.patch → ...stWebhookInject_no_imagePullSecrets.patch
diff --git a/...estWebhookInject_no_imagePullSecrets.yaml → ...estWebhookInject_no_imagePullSecrets.yaml b/...estWebhookInject_no_imagePullSecrets.yaml → ...estWebhookInject_no_imagePullSecrets.yaml
diff --git a/...TestWebhookInject_no_initContainers.patch → ...TestWebhookInject_no_initContainers.patch b/...TestWebhookInject_no_initContainers.patch → ...TestWebhookInject_no_initContainers.patch
diff --git a/.../TestWebhookInject_no_initContainers.yaml → .../TestWebhookInject_no_initContainers.yaml b/.../TestWebhookInject_no_initContainers.yaml → .../TestWebhookInject_no_initContainers.yaml
diff --git a/...Inject_no_initContainers_containers.patch → ...Inject_no_initContainers_containers.patch b/...Inject_no_initContainers_containers.patch → ...Inject_no_initContainers_containers.patch
diff --git a/...kInject_no_initContainers_containers.yaml → ...kInject_no_initContainers_containers.yaml b/...kInject_no_initContainers_containers.yaml → ...kInject_no_initContainers_containers.yaml
diff --git a/...tainers_containers_imagePullSecrets.patch → ...tainers_containers_imagePullSecrets.patch b/...tainers_containers_imagePullSecrets.patch → ...tainers_containers_imagePullSecrets.patch
diff --git a/...ntainers_containers_imagePullSecrets.yaml → ...ntainers_containers_imagePullSecrets.yaml b/...ntainers_containers_imagePullSecrets.yaml → ...ntainers_containers_imagePullSecrets.yaml
diff --git a/...o_initContainers_containers_volumes.patch → ...o_initContainers_containers_volumes.patch b/...o_initContainers_containers_volumes.patch → ...o_initContainers_containers_volumes.patch
diff --git a/...no_initContainers_containers_volumes.yaml → ...no_initContainers_containers_volumes.yaml b/...no_initContainers_containers_volumes.yaml → ...no_initContainers_containers_volumes.yaml
diff --git a/..._containers_volumes_imagePullSecrets.yaml → ..._containers_volumes_imagePullSecrets.yaml b/..._containers_volumes_imagePullSecrets.yaml → ..._containers_volumes_imagePullSecrets.yaml
diff --git a/..._no_initContainers_continers_volumes.yaml → ..._no_initContainers_continers_volumes.yaml b/..._no_initContainers_continers_volumes.yaml → ..._no_initContainers_continers_volumes.yaml
diff --git a/..._no_initContainers_imagePullSecrets.patch → ..._no_initContainers_imagePullSecrets.patch b/..._no_initContainers_imagePullSecrets.patch → ..._no_initContainers_imagePullSecrets.patch
diff --git a/...t_no_initContainers_imagePullSecrets.yaml → ...t_no_initContainers_imagePullSecrets.yaml b/...t_no_initContainers_imagePullSecrets.yaml → ...t_no_initContainers_imagePullSecrets.yaml
diff --git a/...ookInject_no_initContainers_volumes.patch → ...ookInject_no_initContainers_volumes.patch b/...ookInject_no_initContainers_volumes.patch → ...ookInject_no_initContainers_volumes.patch
diff --git a/...hookInject_no_initContainers_volumes.yaml → ...hookInject_no_initContainers_volumes.yaml b/...hookInject_no_initContainers_volumes.yaml → ...hookInject_no_initContainers_volumes.yaml
diff --git a/...Containers_volumes_imagePullSecrets.patch → ...Containers_volumes_imagePullSecrets.patch b/...Containers_volumes_imagePullSecrets.patch → ...Containers_volumes_imagePullSecrets.patch
diff --git a/...tContainers_volumes_imagePullSecrets.yaml → ...tContainers_volumes_imagePullSecrets.yaml b/...tContainers_volumes_imagePullSecrets.yaml → ...tContainers_volumes_imagePullSecrets.yaml
diff --git a/...containers_volumes_imagePullSecrets.patch → ...containers_volumes_imagePullSecrets.patch b/...containers_volumes_imagePullSecrets.patch → ...containers_volumes_imagePullSecrets.patch
diff --git a/...ebhook/TestWebhookInject_no_volumes.patch → ...ebhook/TestWebhookInject_no_volumes.patch b/...ebhook/TestWebhookInject_no_volumes.patch → ...ebhook/TestWebhookInject_no_volumes.patch
diff --git a/...webhook/TestWebhookInject_no_volumes.yaml → ...webhook/TestWebhookInject_no_volumes.yaml b/...webhook/TestWebhookInject_no_volumes.yaml → ...webhook/TestWebhookInject_no_volumes.yaml
diff --git a/...kInject_no_volumes_imagePullSecrets.patch → ...kInject_no_volumes_imagePullSecrets.patch b/...kInject_no_volumes_imagePullSecrets.patch → ...kInject_no_volumes_imagePullSecrets.patch
diff --git a/...okInject_no_volumes_imagePullSecrets.yaml → ...okInject_no_volumes_imagePullSecrets.yaml b/...okInject_no_volumes_imagePullSecrets.yaml → ...okInject_no_volumes_imagePullSecrets.yaml
diff --git a/...a/webhook/TestWebhookInject_replace.patch → ...a/webhook/TestWebhookInject_replace.patch b/...a/webhook/TestWebhookInject_replace.patch → ...a/webhook/TestWebhookInject_replace.patch
diff --git a/...ta/webhook/TestWebhookInject_replace.yaml → ...ta/webhook/TestWebhookInject_replace.yaml b/...ta/webhook/TestWebhookInject_replace.yaml → ...ta/webhook/TestWebhookInject_replace.yaml
diff --git a/...hookInject_replace_backwards_compat.patch → ...hookInject_replace_backwards_compat.patch b/...hookInject_replace_backwards_compat.patch → ...hookInject_replace_backwards_compat.patch
diff --git a/...bhookInject_replace_backwards_compat.yaml → ...bhookInject_replace_backwards_compat.yaml b/...bhookInject_replace_backwards_compat.yaml → ...bhookInject_replace_backwards_compat.yaml
diff --git a/...a/webhook/TestWebhookInject_template.yaml → ...a/webhook/TestWebhookInject_template.yaml b/...a/webhook/TestWebhookInject_template.yaml → ...a/webhook/TestWebhookInject_template.yaml
diff --git a/...be/inject/testdata/webhook/daemonset.yaml → ...be/inject/testdata/webhook/daemonset.yaml b/...be/inject/testdata/webhook/daemonset.yaml → ...be/inject/testdata/webhook/daemonset.yaml
diff --git a/.../testdata/webhook/daemonset.yaml.injected → .../testdata/webhook/daemonset.yaml.injected b/.../testdata/webhook/daemonset.yaml.injected → .../testdata/webhook/daemonset.yaml.injected
diff --git a/...tdata/webhook/deploymentconfig-multi.yaml → ...tdata/webhook/deploymentconfig-multi.yaml b/...tdata/webhook/deploymentconfig-multi.yaml → ...tdata/webhook/deploymentconfig-multi.yaml
diff --git a/...hook/deploymentconfig-multi.yaml.injected → ...hook/deploymentconfig-multi.yaml.injected b/...hook/deploymentconfig-multi.yaml.injected → ...hook/deploymentconfig-multi.yaml.injected
diff --git a/...ct/testdata/webhook/deploymentconfig.yaml → ...ct/testdata/webhook/deploymentconfig.yaml b/...ct/testdata/webhook/deploymentconfig.yaml → ...ct/testdata/webhook/deploymentconfig.yaml
diff --git a/...ta/webhook/deploymentconfig.yaml.injected → ...ta/webhook/deploymentconfig.yaml.injected b/...ta/webhook/deploymentconfig.yaml.injected → ...ta/webhook/deploymentconfig.yaml.injected
diff --git a/...ube/inject/testdata/webhook/frontend.yaml → ...ube/inject/testdata/webhook/frontend.yaml b/...ube/inject/testdata/webhook/frontend.yaml → ...ube/inject/testdata/webhook/frontend.yaml
diff --git a/...t/testdata/webhook/frontend.yaml.injected → ...t/testdata/webhook/frontend.yaml.injected b/...t/testdata/webhook/frontend.yaml.injected → ...t/testdata/webhook/frontend.yaml.injected
diff --git a/...bhook/hello-config-map-name.yaml.injected → ...bhook/hello-config-map-name.yaml.injected b/...bhook/hello-config-map-name.yaml.injected → ...bhook/hello-config-map-name.yaml.injected
diff --git a/.../inject/testdata/webhook/hello-multi.yaml → .../inject/testdata/webhook/hello-multi.yaml b/.../inject/testdata/webhook/hello-multi.yaml → .../inject/testdata/webhook/hello-multi.yaml
diff --git a/...estdata/webhook/hello-multi.yaml.injected → ...estdata/webhook/hello-multi.yaml.injected b/...estdata/webhook/hello-multi.yaml.injected → ...estdata/webhook/hello-multi.yaml.injected
diff --git a/...inject/testdata/webhook/hello-probes.yaml → ...inject/testdata/webhook/hello-probes.yaml b/...inject/testdata/webhook/hello-probes.yaml → ...inject/testdata/webhook/hello-probes.yaml
diff --git a/...stdata/webhook/hello-probes.yaml.injected → ...stdata/webhook/hello-probes.yaml.injected b/...stdata/webhook/hello-probes.yaml.injected → ...stdata/webhook/hello-probes.yaml.injected
diff --git a/...g/kube/inject/testdata/webhook/hello.yaml → pkg/kube/inject/testdata/webhook/hello.yaml b/...g/kube/inject/testdata/webhook/hello.yaml → pkg/kube/inject/testdata/webhook/hello.yaml
diff --git a/...pkg/kube/inject/testdata/webhook/job.yaml → pkg/kube/inject/testdata/webhook/job.yaml b/...pkg/kube/inject/testdata/webhook/job.yaml → pkg/kube/inject/testdata/webhook/job.yaml
diff --git a/...inject/testdata/webhook/job.yaml.injected → ...inject/testdata/webhook/job.yaml.injected b/...inject/testdata/webhook/job.yaml.injected → ...inject/testdata/webhook/job.yaml.injected
diff --git a/...nject/testdata/webhook/list-frontend.yaml → ...nject/testdata/webhook/list-frontend.yaml b/...nject/testdata/webhook/list-frontend.yaml → ...nject/testdata/webhook/list-frontend.yaml
diff --git a/...tdata/webhook/list-frontend.yaml.injected → ...tdata/webhook/list-frontend.yaml.injected b/...tdata/webhook/list-frontend.yaml.injected → ...tdata/webhook/list-frontend.yaml.injected
diff --git a/...kg/kube/inject/testdata/webhook/list.yaml → pkg/kube/inject/testdata/webhook/list.yaml b/...kg/kube/inject/testdata/webhook/list.yaml → pkg/kube/inject/testdata/webhook/list.yaml
diff --git a/...nject/testdata/webhook/list.yaml.injected → ...nject/testdata/webhook/list.yaml.injected b/...nject/testdata/webhook/list.yaml.injected → ...nject/testdata/webhook/list.yaml.injected
diff --git a/...e/inject/testdata/webhook/multi-init.yaml → ...e/inject/testdata/webhook/multi-init.yaml b/...e/inject/testdata/webhook/multi-init.yaml → ...e/inject/testdata/webhook/multi-init.yaml
diff --git a/...testdata/webhook/multi-init.yaml.injected → ...testdata/webhook/multi-init.yaml.injected b/...testdata/webhook/multi-init.yaml.injected → ...testdata/webhook/multi-init.yaml.injected
diff --git a/...e/inject/testdata/webhook/replicaset.yaml → ...e/inject/testdata/webhook/replicaset.yaml b/...e/inject/testdata/webhook/replicaset.yaml → ...e/inject/testdata/webhook/replicaset.yaml
diff --git a/...testdata/webhook/replicaset.yaml.injected → ...testdata/webhook/replicaset.yaml.injected b/...testdata/webhook/replicaset.yaml.injected → ...testdata/webhook/replicaset.yaml.injected
diff --git a/...stdata/webhook/replicationcontroller.yaml → ...stdata/webhook/replicationcontroller.yaml b/...stdata/webhook/replicationcontroller.yaml → ...stdata/webhook/replicationcontroller.yaml
diff --git a/...bhook/replicationcontroller.yaml.injected → ...bhook/replicationcontroller.yaml.injected b/...bhook/replicationcontroller.yaml.injected → ...bhook/replicationcontroller.yaml.injected
diff --git a/...estdata/webhook/resource_annotations.yaml → ...estdata/webhook/resource_annotations.yaml b/...estdata/webhook/resource_annotations.yaml → ...estdata/webhook/resource_annotations.yaml
diff --git a/...ebhook/resource_annotations.yaml.injected → ...ebhook/resource_annotations.yaml.injected b/...ebhook/resource_annotations.yaml.injected → ...ebhook/resource_annotations.yaml.injected
diff --git a/.../inject/testdata/webhook/statefulset.yaml → .../inject/testdata/webhook/statefulset.yaml b/.../inject/testdata/webhook/statefulset.yaml → .../inject/testdata/webhook/statefulset.yaml
diff --git a/...estdata/webhook/statefulset.yaml.injected → ...estdata/webhook/statefulset.yaml.injected b/...estdata/webhook/statefulset.yaml.injected → ...estdata/webhook/statefulset.yaml.injected
diff --git a/.../testdata/webhook/status_annotations.yaml → .../testdata/webhook/status_annotations.yaml b/.../testdata/webhook/status_annotations.yaml → .../testdata/webhook/status_annotations.yaml
diff --git a/.../webhook/status_annotations.yaml.injected → .../webhook/status_annotations.yaml.injected b/.../webhook/status_annotations.yaml.injected → .../webhook/status_annotations.yaml.injected
diff --git a/...k/traffic-annotations-empty-includes.yaml → ...k/traffic-annotations-empty-includes.yaml b/...k/traffic-annotations-empty-includes.yaml → ...k/traffic-annotations-empty-includes.yaml
diff --git a/...-annotations-empty-includes.yaml.injected → ...-annotations-empty-includes.yaml.injected b/...-annotations-empty-includes.yaml.injected → ...-annotations-empty-includes.yaml.injected
diff --git a/...ebhook/traffic-annotations-wildcards.yaml → ...ebhook/traffic-annotations-wildcards.yaml b/...ebhook/traffic-annotations-wildcards.yaml → ...ebhook/traffic-annotations-wildcards.yaml
diff --git a/...affic-annotations-wildcards.yaml.injected → ...affic-annotations-wildcards.yaml.injected b/...affic-annotations-wildcards.yaml.injected → ...affic-annotations-wildcards.yaml.injected
diff --git a/...testdata/webhook/traffic-annotations.yaml → ...testdata/webhook/traffic-annotations.yaml b/...testdata/webhook/traffic-annotations.yaml → ...testdata/webhook/traffic-annotations.yaml
diff --git a/...webhook/traffic-annotations.yaml.injected → ...webhook/traffic-annotations.yaml.injected b/...webhook/traffic-annotations.yaml.injected → ...webhook/traffic-annotations.yaml.injected
diff --git a/.../inject/testdata/webhook/user-volume.yaml → .../inject/testdata/webhook/user-volume.yaml b/.../inject/testdata/webhook/user-volume.yaml → .../inject/testdata/webhook/user-volume.yaml
diff --git a/...estdata/webhook/user-volume.yaml.injected → ...estdata/webhook/user-volume.yaml.injected b/...estdata/webhook/user-volume.yaml.injected → ...estdata/webhook/user-volume.yaml.injected
diff --git a/pilot/pkg/kube/inject/webhook.go → pkg/kube/inject/webhook.go b/pilot/pkg/kube/inject/webhook.go → pkg/kube/inject/webhook.go
diff --git a/pilot/pkg/kube/inject/webhook_test.go → pkg/kube/inject/webhook_test.go b/pilot/pkg/kube/inject/webhook_test.go → 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 → ...car-injector/cmd/sidecar-injector/main.go b/pilot/cmd/sidecar-injector/main.go → ...car-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 → ...jector/docker/Dockerfile.sidecar_injector b/pilot/docker/Dockerfile.sidecar_injector → ...jector/docker/Dockerfile.sidecar_injector
diff --git 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
@@ -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)