make injection pod and service easier to read

Signed-off-by: Austin Abro <AustinAbro321@gmail.com>
zarf-dev · Oct 18, 2024 · ca48559 · ca48559
1 parent 5736f56
commit ca48559
Show file tree

Hide file tree

Showing 3 changed files with 137 additions and 4 deletions.
diff --git a/src/pkg/cluster/injector_test.go b/src/pkg/cluster/injector_test.go
@@ -121,7 +121,7 @@ func TestInjector(t *testing.T) {
 		// Managed fields are auto-set and contain timestamps
 		svc.ManagedFields = nil
 		require.NoError(t, err)
-		b, err := json.Marshal(svc)
+		b, err := json.MarshalIndent(svc, "", "  ")
 		require.NoError(t, err)
 		require.Equal(t, strings.TrimSpace(string(expected)), string(b))
 
@@ -162,7 +162,7 @@ func TestBuildInjectionPod(t *testing.T) {
 			})
 	pod := buildInjectionPod("injection-node", "docker.io/library/ubuntu:latest", []string{"foo", "bar"}, "shasum", resReq)
 	require.Equal(t, "injector", *pod.Name)
-	b, err := json.Marshal(pod)
+	b, err := json.MarshalIndent(pod, "", "  ")
 	require.NoError(t, err)
 
 	expected, err := os.ReadFile("./testdata/expected-injection-pod.json")

diff --git a/src/pkg/cluster/testdata/expected-injection-pod.json b/src/pkg/cluster/testdata/expected-injection-pod.json
@@ -1 +1,111 @@
-{"kind":"Pod","apiVersion":"v1","metadata":{"name":"injector","namespace":"zarf","labels":{"app":"zarf-injector","zarf.dev/agent":"ignore"}},"spec":{"volumes":[{"name":"init","configMap":{"name":"rust-binary","defaultMode":511}},{"name":"seed","emptyDir":{}},{"name":"foo","configMap":{"name":"foo"}},{"name":"bar","configMap":{"name":"bar"}}],"containers":[{"name":"injector","image":"docker.io/library/ubuntu:latest","command":["/zarf-init/zarf-injector","shasum"],"workingDir":"/zarf-init","resources":{"limits":{"cpu":"1","memory":"256Mi"},"requests":{"cpu":"500m","memory":"64Mi"}},"volumeMounts":[{"name":"init","mountPath":"/zarf-init/zarf-injector","subPath":"zarf-injector"},{"name":"seed","mountPath":"/zarf-seed"},{"name":"foo","mountPath":"/zarf-init/foo","subPath":"foo"},{"name":"bar","mountPath":"/zarf-init/bar","subPath":"bar"}],"readinessProbe":{"httpGet":{"path":"/v2/","port":5000},"periodSeconds":2,"successThreshold":1,"failureThreshold":10},"imagePullPolicy":"IfNotPresent","securityContext":{"capabilities":{"drop":["ALL"]},"runAsNonRoot":true,"readOnlyRootFilesystem":true,"allowPrivilegeEscalation":false}}],"restartPolicy":"Never","nodeName":"injection-node","securityContext":{"runAsUser":1000,"runAsGroup":2000,"fsGroup":2000,"seccompProfile":{"type":"RuntimeDefault"}}}}
+{
+  "kind": "Pod",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "injector",
+    "namespace": "zarf",
+    "labels": {
+      "app": "zarf-injector",
+      "zarf.dev/agent": "ignore"
+    }
+  },
+  "spec": {
+    "volumes": [
+      {
+        "name": "init",
+        "configMap": {
+          "name": "rust-binary",
+          "defaultMode": 511
+        }
+      },
+      {
+        "name": "seed",
+        "emptyDir": {}
+      },
+      {
+        "name": "foo",
+        "configMap": {
+          "name": "foo"
+        }
+      },
+      {
+        "name": "bar",
+        "configMap": {
+          "name": "bar"
+        }
+      }
+    ],
+    "containers": [
+      {
+        "name": "injector",
+        "image": "docker.io/library/ubuntu:latest",
+        "command": [
+          "/zarf-init/zarf-injector",
+          "shasum"
+        ],
+        "workingDir": "/zarf-init",
+        "resources": {
+          "limits": {
+            "cpu": "1",
+            "memory": "256Mi"
+          },
+          "requests": {
+            "cpu": "500m",
+            "memory": "64Mi"
+          }
+        },
+        "volumeMounts": [
+          {
+            "name": "init",
+            "mountPath": "/zarf-init/zarf-injector",
+            "subPath": "zarf-injector"
+          },
+          {
+            "name": "seed",
+            "mountPath": "/zarf-seed"
+          },
+          {
+            "name": "foo",
+            "mountPath": "/zarf-init/foo",
+            "subPath": "foo"
+          },
+          {
+            "name": "bar",
+            "mountPath": "/zarf-init/bar",
+            "subPath": "bar"
+          }
+        ],
+        "readinessProbe": {
+          "httpGet": {
+            "path": "/v2/",
+            "port": 5000
+          },
+          "periodSeconds": 2,
+          "successThreshold": 1,
+          "failureThreshold": 10
+        },
+        "imagePullPolicy": "IfNotPresent",
+        "securityContext": {
+          "capabilities": {
+            "drop": [
+              "ALL"
+            ]
+          },
+          "runAsNonRoot": true,
+          "readOnlyRootFilesystem": true,
+          "allowPrivilegeEscalation": false
+        }
+      }
+    ],
+    "restartPolicy": "Never",
+    "nodeName": "injection-node",
+    "securityContext": {
+      "runAsUser": 1000,
+      "runAsGroup": 2000,
+      "fsGroup": 2000,
+      "seccompProfile": {
+        "type": "RuntimeDefault"
+      }
+    }
+  }
+}
diff --git a/src/pkg/cluster/testdata/expected-injection-service.json b/src/pkg/cluster/testdata/expected-injection-service.json
@@ -1 +1,24 @@
-{"kind":"Service","apiVersion":"v1","metadata":{"name":"zarf-injector","namespace":"zarf","creationTimestamp":null},"spec":{"ports":[{"port":5000,"targetPort":0}],"selector":{"app":"zarf-injector"},"type":"NodePort"},"status":{"loadBalancer":{}}}
+{
+  "kind": "Service",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "zarf-injector",
+    "namespace": "zarf",
+    "creationTimestamp": null
+  },
+  "spec": {
+    "ports": [
+      {
+        "port": 5000,
+        "targetPort": 0
+      }
+    ],
+    "selector": {
+      "app": "zarf-injector"
+    },
+    "type": "NodePort"
+  },
+  "status": {
+    "loadBalancer": {}
+  }
+}