From: hylom <hylom@users.sourceforge.jp>
Date: Fri, 6 Jul 2018 10:53:27 +0000 (+0900)
Subject: test-container: merge k8s svc settings to k8s-newslash-dev.yaml
X-Git-Tag: v0.1.5~126
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b70d8355e5daa7c8d994dc4d647d6ceef07177d8;p=newslash%2Fnewslash.git

test-container: merge k8s svc settings to k8s-newslash-dev.yaml
---

diff --git a/test-container/k8s-newslash-dev.yaml b/test-container/k8s-newslash-dev.yaml
index 54729613..a1033a9b 100644
--- a/test-container/k8s-newslash-dev.yaml
+++ b/test-container/k8s-newslash-dev.yaml
@@ -1,9 +1,27 @@
 apiVersion: v1
+kind: Service
+metadata:
+  name: newslash-dev
+spec:
+  type: NodePort
+  clusterIP: 10.254.100.100
+  ports:
+    - port: 22
+      protocol: TCP
+      name: ssh
+    - port: 3000
+      nodePort: 30100
+      protocol: TCP
+      name: https
+  selector:
+    app: newslash-dev
+---
+apiVersion: v1
 kind: Pod
 metadata:
   name: newslash-dev
   labels:
-    app: newslash-test
+    app: newslash-dev
 spec:
   imagePullSecrets:
     - name: regcred
diff --git a/test-container/k8s-newslash-test-svc.yaml b/test-container/k8s-newslash-test-svc.yaml
deleted file mode 100644
index d92d17d4..00000000
--- a/test-container/k8s-newslash-test-svc.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: newslash-test
-spec:
-  type: NodePort
-  clusterIP: 10.254.100.100
-  ports:
-    - port: 22
-      protocol: TCP
-      name: ssh
-    - port: 3000
-      nodePort: 30100
-      protocol: TCP
-      name: https
-  selector:
-    app: newslash-test