Merge pull request #59 from cybozu-go/rename-name-label

Update to use app.kubernetes.io/name
cybozu-go · Jul 11, 2019 · 6e0ead7 · 6e0ead7
2 parents 7bc641c + 95691e7
commit 6e0ead7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/mtest/controller.go b/mtest/controller.go
@@ -38,7 +38,7 @@ func TestCoilController() {
 		Expect(err).NotTo(HaveOccurred(), "stderr: %s", stderr)
 
 		Eventually(func() error {
-			stdout, stderr, err := kubectl("get", "pods", "--selector=run=nginx", "-o=json")
+			stdout, stderr, err := kubectl("get", "pods", "--selector=app.kubernetes.io/name=nginx", "-o=json")
 			if err != nil {
 				return fmt.Errorf("%v: stderr=%s", err, stderr)
 			}
@@ -87,7 +87,7 @@ func TestCoilController() {
 		Expect(err).NotTo(HaveOccurred(), "stderr: %s", stderr)
 
 		Eventually(func() error {
-			stdout, stderr, err := kubectl("get", "pods", "--selector=run=nginx", "-o=json")
+			stdout, stderr, err := kubectl("get", "pods", "--selector=app.kubernetes.io/name=nginx", "-o=json")
 			if err != nil {
 				return fmt.Errorf("%v: stderr=%s", err, stderr)
 			}
@@ -109,7 +109,7 @@ func TestCoilController() {
 		Expect(err).NotTo(HaveOccurred(), "stderr: %s", stderr)
 
 		Eventually(func() error {
-			stdout, stderr, err := kubectl("get", "deployment", "--selector=k8s-app=coil-controllers", "--namespace=kube-system", "-o=json")
+			stdout, stderr, err := kubectl("get", "deployment", "--selector=app.kubernetes.io/name=coil-controllers", "--namespace=kube-system", "-o=json")
 			if err != nil {
 				return fmt.Errorf("%v: stderr=%s", err, stderr)
 			}

diff --git a/mtest/deploy.yml b/mtest/deploy.yml
@@ -106,19 +106,19 @@ metadata:
   name: coil-node
   namespace: kube-system
   labels:
-    k8s-app: coil-node
+    app.kubernetes.io/name: coil-node
 spec:
   selector:
     matchLabels:
-      k8s-app: coil-node
+      app.kubernetes.io/name: coil-node
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
       maxUnavailable: 1
   template:
     metadata:
       labels:
-        k8s-app: coil-node
+        app.kubernetes.io/name: coil-node
     spec:
       priorityClassName: system-node-critical
       nodeSelector:
@@ -220,21 +220,21 @@ metadata:
   name: coil-controllers
   namespace: kube-system
   labels:
-    k8s-app: coil-controllers
+    app.kubernetes.io/name: coil-controllers
 spec:
   # coil-controller can only have a single active instance.
   replicas: 1
   selector:
     matchLabels:
-      k8s-app: coil-controllers
+      app.kubernetes.io/name: coil-controllers
   strategy:
     type: Recreate
   template:
     metadata:
       name: coil-controllers
       namespace: kube-system
       labels:
-        k8s-app: coil-controllers
+        app.kubernetes.io/name: coil-controllers
     spec:
       priorityClassName: system-cluster-critical
       nodeSelector:

diff --git a/mtest/pod.go b/mtest/pod.go
@@ -285,7 +285,7 @@ func TestPod() {
 			}
 
 			if pod.Status.Phase != corev1.PodRunning {
-				return errors.New("pod is not Running")
+				return fmt.Errorf("pod is not Running: %v", pod)
 			}
 			if len(pod.Status.PodIP) == 0 {
 				return errors.New("pod is not assigned IP")