test(injector): add unit test for sidecar feature

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Feb 21, 2024 · 22fc07b · 22fc07b
1 parent e7d7b49
commit 22fc07b
Show file tree

Hide file tree

Showing 65 changed files with 5,811 additions and 118 deletions.
diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/injector_test.go b/pkg/plugins/runtime/k8s/webhooks/injector/injector_test.go
@@ -32,11 +32,10 @@ var _ = Describe("Injector", func() {
 	)
 
 	type testCase struct {
-		num                      string
-		mesh                     string
-		cfgFile                  string
-		namespace                string
-		sidecarContainersEnabled bool
+		num       string
+		mesh      string
+		cfgFile   string
+		namespace string
 	}
 
 	BeforeAll(func() {
@@ -77,57 +76,77 @@ spec:
 		Expect(err).ToNot(HaveOccurred())
 	})
 
-	DescribeTable("should inject Kuma into a Pod",
+	DescribeTableSubtree("should inject Kuma into a Pod",
 		func(given testCase) {
 			// setup
 			inputFile := filepath.Join("testdata", fmt.Sprintf("inject.%s.input.yaml", given.num))
-			goldenFile := filepath.Join("testdata", fmt.Sprintf("inject.%s.golden.yaml", given.num))
 
-			var cfg conf.Injector
-			Expect(config.Load(filepath.Join("testdata", given.cfgFile), &cfg)).To(Succeed())
-			cfg.CaCertFile = caCertPath
-			injector, err := inject.New(cfg, "http://kuma-control-plane.kuma-system:5681", k8sClient, given.sidecarContainersEnabled, k8s.NewSimpleConverter(), 9901, systemNamespace)
-			Expect(err).ToNot(HaveOccurred())
-
-			// and create mesh
-			decoder := serializer.NewCodecFactory(k8sClientScheme).UniversalDeserializer()
-			obj, _, errMesh := decoder.Decode([]byte(given.mesh), nil, nil)
-			Expect(errMesh).ToNot(HaveOccurred())
-			errCreate := k8sClient.Create(context.Background(), obj.(kube_client.Object))
-			Expect(errCreate).ToNot(HaveOccurred())
-			ns, _, errNs := decoder.Decode([]byte(given.namespace), nil, nil)
-			Expect(errNs).ToNot(HaveOccurred())
-			errUpd := k8sClient.Update(context.Background(), ns.(kube_client.Object))
-			Expect(errUpd).ToNot(HaveOccurred())
-
-			// given
-			pod := &kube_core.Pod{}
-
-			By("loading input Pod")
-			// when
-			input, err := os.ReadFile(inputFile)
-			// then
-			Expect(err).ToNot(HaveOccurred())
-			// when
-			err = yaml.Unmarshal(input, pod)
-			// then
-			Expect(err).ToNot(HaveOccurred())
-
-			By("injecting Kuma")
-			// when
-			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
-			actual, err := yaml.Marshal(pod)
-			// then
-			Expect(err).ToNot(HaveOccurred())
-
-			By("comparing actual against golden")
-			Expect(actual).To(matchers.MatchGoldenYAML(goldenFile))
+			run := func(sidecarsEnabled bool) {
+				var goldenFile string
+				if sidecarsEnabled {
+					goldenFile = filepath.Join("testdata", fmt.Sprintf("inject.sidecar-feature.%s.golden.yaml", given.num))
+				} else {
+					goldenFile = filepath.Join("testdata", fmt.Sprintf("inject.%s.golden.yaml", given.num))
+				}
+
+				var cfg conf.Injector
+				Expect(config.Load(filepath.Join("testdata", given.cfgFile), &cfg)).To(Succeed())
+				cfg.CaCertFile = caCertPath
+				injector, err := inject.New(cfg, "http://kuma-control-plane.kuma-system:5681", k8sClient, sidecarsEnabled, k8s.NewSimpleConverter(), 9901, systemNamespace)
+				Expect(err).ToNot(HaveOccurred())
+
+				// and create mesh
+				decoder := serializer.NewCodecFactory(k8sClientScheme).UniversalDeserializer()
+				obj, _, errMesh := decoder.Decode([]byte(given.mesh), nil, nil)
+				Expect(errMesh).ToNot(HaveOccurred())
+				errCreate := k8sClient.Create(context.Background(), obj.(kube_client.Object))
+				Expect(errCreate).ToNot(HaveOccurred())
+				ns, _, errNs := decoder.Decode([]byte(given.namespace), nil, nil)
+				Expect(errNs).ToNot(HaveOccurred())
+				errUpd := k8sClient.Update(context.Background(), ns.(kube_client.Object))
+				Expect(errUpd).ToNot(HaveOccurred())
+
+				// given
+				pod := &kube_core.Pod{}
+
+				By("loading input Pod")
+				// when
+				input, err := os.ReadFile(inputFile)
+				// then
+				Expect(err).ToNot(HaveOccurred())
+				// when
+				err = yaml.Unmarshal(input, pod)
+				// then
+				Expect(err).ToNot(HaveOccurred())
+
+				By("injecting Kuma")
+				// when
+				err = injector.InjectKuma(context.Background(), pod)
+				// then
+				Expect(err).ToNot(HaveOccurred())
+				if !sidecarsEnabled {
+					Expect(pod.Spec.Containers[0].Name).To(BeEquivalentTo(k8s_util.KumaSidecarContainerName))
+				} else {
+					Expect(pod.Spec.InitContainers).To(ContainElement(
+						WithTransform(func(c kube_core.Container) string { return c.Name }, Equal(k8s_util.KumaSidecarContainerName))),
+					)
+				}
+
+				By("loading golden Pod")
+				// when
+				actual, err := yaml.Marshal(pod)
+				// then
+				Expect(err).ToNot(HaveOccurred())
+
+				By("comparing actual against golden")
+				Expect(actual).To(matchers.MatchGoldenYAML(goldenFile))
+			}
+			It("injects as traditional sidecar container", func() {
+				run(false)
+			})
+			It("injects with sidecar containers feature", func() {
+				run(true)
+			})
 		},
 		Entry("01. Pod without init containers and annotations", testCase{
 			num: "01",
@@ -683,7 +702,7 @@ spec:
 			var cfg conf.Injector
 			Expect(config.Load(filepath.Join("testdata", given.cfgFile), &cfg)).To(Succeed())
 			cfg.CaCertFile = caCertPath
-			injector, err := inject.New(cfg, "http://kuma-control-plane.kuma-system:5681", k8sClient, given.sidecarContainersEnabled, k8s.NewSimpleConverter(), 9901, systemNamespace)
+			injector, err := inject.New(cfg, "http://kuma-control-plane.kuma-system:5681", k8sClient, false, k8s.NewSimpleConverter(), 9901, systemNamespace)
 			Expect(err).ToNot(HaveOccurred())
 
 			// and create mesh
@@ -789,7 +808,7 @@ spec:
 			var cfg conf.Injector
 			Expect(config.Load(filepath.Join("testdata", given.cfgFile), &cfg)).To(Succeed())
 			cfg.CaCertFile = caCertPath
-			injector, err := inject.New(cfg, "http://kuma-control-plane.kuma-system:5681", k8sClient, given.sidecarContainersEnabled, k8s.NewSimpleConverter(), 9901, systemNamespace)
+			injector, err := inject.New(cfg, "http://kuma-control-plane.kuma-system:5681", k8sClient, false, k8s.NewSimpleConverter(), 9901, systemNamespace)
 			Expect(err).ToNot(HaveOccurred())
 
 			// and create mesh

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.01.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.01.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.02.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.02.golden.yaml
@@ -97,12 +97,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.03.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.03.golden.yaml
@@ -104,12 +104,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.04.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.04.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.05.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.05.golden.yaml
@@ -97,12 +97,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.06.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.06.golden.yaml
@@ -97,12 +97,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.07.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.07.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.08.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.08.golden.yaml
@@ -99,12 +99,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.09.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.09.golden.yaml
@@ -98,12 +98,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.10.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.10.golden.yaml
@@ -97,12 +97,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.11.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.11.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.12.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.12.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.13.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.13.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.14.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.14.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.15.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.15.golden.yaml
@@ -96,12 +96,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678

diff --git a/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.16.golden.yaml b/pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.16.golden.yaml
@@ -98,12 +98,12 @@ spec:
     resources:
       limits:
         cpu: 1100m
-        memory: 1512Mi
         ephemeral-storage: 1G
+        memory: 1512Mi
       requests:
         cpu: 150m
-        memory: 164Mi
         ephemeral-storage: 50M
+        memory: 164Mi
     securityContext:
       readOnlyRootFilesystem: true
       runAsGroup: 5678