chore(k8s): always inject Kuma as the first container

Signed-off-by: c <curtis@commonstock.com>
kumahq · Dec 9, 2022 · b5c37fe · b5c37fe
1 parent e8e08b7
commit b5c37fe
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 33 deletions.
diff --git a/api/mesh/v1alpha1/gateway_route.pb.go b/api/mesh/v1alpha1/gateway_route.pb.go
diff --git a/api/mesh/v1alpha1/health_check.pb.go b/api/mesh/v1alpha1/health_check.pb.go
diff --git a/api/mesh/v1alpha1/kds.pb.go b/api/mesh/v1alpha1/kds.pb.go
diff --git a/api/mesh/v1alpha1/mux.pb.go b/api/mesh/v1alpha1/mux.pb.go
diff --git a/api/mesh/v1alpha1/proxy_template.pb.go b/api/mesh/v1alpha1/proxy_template.pb.go
diff --git a/api/mesh/v1alpha1/retry.pb.go b/api/mesh/v1alpha1/retry.pb.go
diff --git a/api/mesh/v1alpha1/traffic_route.pb.go b/api/mesh/v1alpha1/traffic_route.pb.go
diff --git a/api/observability/v1/mads.pb.go b/api/observability/v1/mads.pb.go
diff --git a/api/system/v1alpha1/datasource.pb.go b/api/system/v1alpha1/datasource.pb.go
diff --git a/pkg/plugins/policies/donothingpolicy/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/donothingpolicy/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/policies/meshaccesslog/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/meshaccesslog/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/meshhealthcheck/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/policies/meshratelimit/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/meshratelimit/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/policies/meshtimeout/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/meshtimeout/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/policies/meshtrace/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/meshtrace/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/meshtrafficpermission.go b/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/meshtrafficpermission.go
@@ -34,7 +34,8 @@ var ALLOW Action = "ALLOW"
 var DENY Action = "DENY"
 
 // ALLOW_WITH_SHADOW_DENY action lets the requests pass but emits logs as if
-//  requests are denied
+//
+//	requests are denied
 var ALLOW_WITH_SHADOW_DENY Action = "ALLOW_WITH_SHADOW_DENY"
 
 type Conf struct {

diff --git a/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/zz_generated.resource.go b/pkg/plugins/policies/meshtrafficpermission/api/v1alpha1/zz_generated.resource.go
@@ -15,7 +15,7 @@ import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/validation"
 )
 
-//go:embed schema.yaml
+// go:embed schema.yaml
 var rawSchema []byte
 var schema = spec.Schema{}
 

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/injector.go b/pkg/plugins/runtime/k8s/webhooks/injector/injector.go
@@ -109,7 +109,9 @@ func (i *KumaInjector) InjectKuma(ctx context.Context, pod *kube_core.Pod) error
 	if err != nil {
 		return err
 	}
-	pod.Spec.Containers = append(pod.Spec.Containers, patchedContainer)
+
+	// inject sidecar as first container
+	pod.Spec.Containers = append([]kube_core.Container{patchedContainer}, pod.Spec.Containers...)
 
 	// annotations
 	if pod.Annotations == nil {

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/injector_test.go b/pkg/plugins/runtime/k8s/webhooks/injector/injector_test.go
@@ -18,6 +18,7 @@ import (
 	conf "github.com/kumahq/kuma/pkg/config/plugins/runtime/k8s"
 	"github.com/kumahq/kuma/pkg/plugins/resources/k8s"
 	"github.com/kumahq/kuma/pkg/plugins/resources/k8s/native/api/v1alpha1"
+	k8s_util "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/util"
 	inject "github.com/kumahq/kuma/pkg/plugins/runtime/k8s/webhooks/injector"
 	"github.com/kumahq/kuma/pkg/test/matchers"
 )
@@ -117,6 +118,7 @@ spec:
 			err = injector.InjectKuma(context.Background(), pod)
 			// then
 			Expect(err).ToNot(HaveOccurred())
+			Expect(pod.Spec.Containers[0].Name).To(BeEquivalentTo(k8s_util.KumaSidecarContainerName))
 
 			By("loading golden Pod")
 			// when