Merge pull request #649 from cybozu-go/rename-pod-and-containers

Rename test pod and containers

mtest/assets_test.go

@@ -2,8 +2,8 @@ package mtest
 
 import _ "embed"
 
-//go:embed nginx.yml
-var nginxYAML []byte
+//go:embed httpd.yml
+var httpdYAML []byte
 
 //go:embed reboot-deployment.yaml
 var rebootDeploymentYAML []byte

mtest/nginx.yml → mtest/httpd.yml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: nginx
+  name: httpd
   labels:
-    app.kubernetes.io/name: nginx
+    app.kubernetes.io/name: httpd
 spec:
   containers:
-    - name: nginx
+    - name: httpd
       image: quay.io/cybozu/testhttpd:0
   hostNetwork: true

mtest/kubernetes_test.go

@@ -33,13 +33,13 @@ func testKubernetes() {
 			return nil
 		}).Should(Succeed())
 
-		By("running nginx")
-		_, stderr, err = kubectlWithInput(nginxYAML, "apply", "-f", "-", "-n="+namespace)
+		By("running httpd")
+		_, stderr, err = kubectlWithInput(httpdYAML, "apply", "-f", "-", "-n="+namespace)
 		Expect(err).NotTo(HaveOccurred(), "stderr=%s", stderr)
 
-		By("checking nginx pod status")
+		By("checking httpd pod status")
 		Eventually(func() error {
-			stdout, stderr, err := kubectl("get", "pods/nginx", "-n="+namespace, "-o", "json")
+			stdout, stderr, err := kubectl("get", "pods/httpd", "-n="+namespace, "-o", "json")
 			if err != nil {
 				return fmt.Errorf("%v: stderr=%s", err, stderr)
 			}
@@ -111,10 +111,10 @@ func testKubernetes() {
 		}).Should(Succeed())
 
 		By("deploying Service resource")
-		_, stderr, err = kubectlWithInput(nginxYAML, "apply", "-f", "-", "-n="+namespace)
+		_, stderr, err = kubectlWithInput(httpdYAML, "apply", "-f", "-", "-n="+namespace)
 		Expect(err).NotTo(HaveOccurred(), "stderr=%s", stderr)
 
-		_, stderr, err = kubectl("expose", "-n="+namespace, "pod", "nginx", "--port=8000")
+		_, stderr, err = kubectl("expose", "-n="+namespace, "pod", "httpd", "--port=8000")
 		Expect(err).NotTo(HaveOccurred(), "stderr=%s", stderr)
 
 		overrides := fmt.Sprintf(`{
@@ -138,12 +138,12 @@ func testKubernetes() {
 
 		By("resolving domain names")
 		Eventually(func() error {
-			_, stderr, err := kubectl("exec", "-n="+namespace, "client", "getent", "hosts", "nginx")
+			_, stderr, err := kubectl("exec", "-n="+namespace, "client", "getent", "hosts", "httpd")
 			if err != nil {
 				return fmt.Errorf("%v: stderr=%s", err, stderr)
 			}
 
-			_, stderr, err = kubectl("exec", "-n="+namespace, "client", "getent", "hosts", "nginx."+namespace+".svc.cluster.local")
+			_, stderr, err = kubectl("exec", "-n="+namespace, "client", "getent", "hosts", "httpd."+namespace+".svc.cluster.local")
 			if err != nil {
 				return fmt.Errorf("%v: stderr=%s", err, stderr)
 			}

mtest/reboot-deployment.yaml

@@ -14,7 +14,7 @@ spec:
         reboot-app: sample
     spec:
       containers:
-        - name: ubuntu
+        - name: httpd
           image: quay.io/cybozu/testhttpd:0
 ---
 apiVersion: policy/v1