Modifing namespace from default to devops

aliasmee · Aug 16, 2017 · 53407f1 · 53407f1
1 parent fa15ccc
commit 53407f1
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 42 deletions.
diff --git a/es-client.yaml b/es-client.yaml
@@ -5,8 +5,9 @@ metadata:
   labels:
     component: elasticsearch
     role: client
+  namespace: devops
 spec:
-  replicas: 2
+  replicas: 3
   template:
     metadata:
       labels:
@@ -41,7 +42,6 @@ spec:
               fieldPath: metadata.name
         - name: "CLUSTER_NAME"
           value: "graylog"
-          value: "graylog"
         - name: NODE_MASTER
           value: "false"
         - name: NODE_DATA

diff --git a/es-data.yaml b/es-data.yaml
@@ -5,8 +5,9 @@ metadata:
   labels:
     component: elasticsearch
     role: data
+  namespace: devops
 spec:
-  replicas: 2
+  replicas: 3
   template:
     metadata:
       labels:
@@ -41,7 +42,6 @@ spec:
               fieldPath: metadata.name
         - name: "CLUSTER_NAME"
           value: "graylog"
-          value: "graylog"
         - name: NODE_MASTER
           value: "false"
         - name: NODE_INGEST
@@ -57,12 +57,12 @@ spec:
           name: transport
           protocol: TCP
         volumeMounts:
-        - name: nfs
+        - name: esdata
           mountPath: /data
       imagePullSecrets:
       - name: qcloudregistrykey
       volumes:
-      - name: nfs
-        nfs:
-            server: 172.17.255.16
-            path: "/"
+        - name: esdata
+          hostPath:
+            path: /data/esnode
+
diff --git a/es-discovery-svc.yaml b/es-discovery-svc.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     component: elasticsearch
     role: master
+  namespace: devops
 spec:
   selector:
     component: elasticsearch

diff --git a/es-master.yaml b/es-master.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     component: elasticsearch
     role: master
+  namespace: devops
 spec:
   replicas: 3
   template:
@@ -41,9 +42,8 @@ spec:
               fieldPath: metadata.name
         - name: "CLUSTER_NAME"
           value: "graylog"
-          value: "graylog"
         - name: "NUMBER_OF_MASTERS"
-          value: "2"
+          value: "3"
         - name: NODE_MASTER
           value: "true"
         - name: NODE_INGEST
@@ -66,4 +66,4 @@ spec:
       volumes:
           - name: storage
             hostPath:
-              path: /tmp
+              path: /data/esmaster
diff --git a/es-svc-qcloud-lb.yaml b/es-svc-qcloud-lb.yaml
@@ -8,7 +8,7 @@ metadata:
     component: elasticsearch
     role: client
   name: elasticsearch
-  namespace: default
+  namespace: devops
 spec:
   clusterIP: 172.20.255.27
   ports:

diff --git a/es-curator-config.yaml → future/es-curator-config.yaml b/es-curator-config.yaml → future/es-curator-config.yaml
diff --git a/es-curator.yaml → future/es-curator.yaml b/es-curator.yaml → future/es-curator.yaml
diff --git a/kibana-svc.yaml → future/kibana-svc.yaml b/kibana-svc.yaml → future/kibana-svc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: kibana
-  namespace: default
+  namespace: devops
   labels:
     component: kibana
 spec:

diff --git a/kibana.yaml → future/kibana.yaml b/kibana.yaml → future/kibana.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: kibana
-  namespace: default
+  namespace: devops
   labels:
     component: kibana
 spec:

diff --git a/graylog-node-svc.yaml b/graylog-node-svc.yaml
@@ -5,25 +5,35 @@ metadata:
     service.kubernetes.io/qcloud-loadbalancer-internal: "21186"
     service.kubernetes.io/qcloud-loadbalancer-internal-subnetid: subnet-p9oq3uc1
   labels:
+    component: graylog
     role: graylog-node
   name: graylog-node
-  namespace: default
+  namespace: devops
 spec:
   clusterIP: 172.20.255.34
   ports:
-  - name: http
-    port: 9000
-    targetPort: 9000
-    protocol: TCP
-  - name: apiport
-    port: 12900
-    protocol: TCP
-    targetPort: 12900
-  - name: tcpin
-    port: 1234
-    targetPort: 1234
-    protocol: TCP
+  - name: udpin
+    port: 12300
+    targetPort: 12300
+    protocol: UDP
+  - name: udpin1
+    port: 12301
+    targetPort: 12301
+    protocol: UDP
+  - name: udpin2
+    port: 12302
+    targetPort: 12302
+    protocol: UDP
+  - name: udpin3
+    port: 12303
+    targetPort: 12303
+    protocol: UDP
+  - name: udpin4
+    port: 12304
+    targetPort: 12304
+    protocol: UDP
   selector:
+    component: graylog
     role: graylog-node
   sessionAffinity: None
   type: LoadBalancer
diff --git a/graylog-node.yaml b/graylog-node.yaml
@@ -2,24 +2,27 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: graylog-node
-  namespace: default
+  namespace: devops
   labels:
+    component: graylog
     role: graylog-node
 spec:
-  replicas: 2
+  replicas: 3
   selector:
     matchLabels:
+      component: graylog
       role: graylog-node
   template:
     metadata:
       labels:
+        component: graylog
         role: graylog-node
     spec:
       containers:
       - name: graylog
         image: ccr.ccs.tencentyun.com/zhulux_sre/graylog:v2.3.0
         ports:
-        - containerPort: 1234
+        - containerPort: 12300
           name: udp
           protocol: UDP
         - containerPort: 9000
@@ -46,5 +49,7 @@ spec:
           value: "false"
         - name: "GRAYLOG_WEB_ENABLE"
           value: "false"
+        - name: "GRAYLOG_OUTPUT_BATCH_SIZE"
+          value: "5000"
       imagePullSecrets:
       - name: qcloudregistrykey
diff --git a/graylog-svc.yaml b/graylog-svc.yaml
@@ -6,8 +6,9 @@ metadata:
     service.kubernetes.io/qcloud-loadbalancer-internal-subnetid: subnet-p9oq3uc1
   labels:
     component: graylog
+    role: master
   name: graylog
-  namespace: default
+  namespace: devops
 spec:
   clusterIP: 172.20.255.33
   ports:
@@ -20,10 +21,23 @@ spec:
     protocol: TCP
     targetPort: 12900
   - name: tcpin
-    port: 1234
-    targetPort: 1234
+    port: 12300
+    targetPort: 12300
+    protocol: TCP
+  - name: tcpin1
+    port: 12301
+    targetPort: 12301
+    protocol: TCP
+  - name: tcpin2
+    port: 12302
+    targetPort: 12302
+    protocol: TCP
+  - name: tcpin3
+    port: 12303
+    targetPort: 12303
     protocol: TCP
   selector:
     component: graylog
+    role: master
   sessionAffinity: None
   type: LoadBalancer
diff --git a/graylog.yaml b/graylog.yaml
@@ -2,25 +2,28 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: graylog
-  namespace: default
+  namespace: devops
   labels:
     component: graylog
+    role: master
 spec:
   replicas: 1
   selector:
     matchLabels:
       component: graylog
+      role: master
   template:
     metadata:
       labels:
         component: graylog
+        role: master
     spec:
       containers:
       - name: graylog
         image: ccr.ccs.tencentyun.com/zhulux_sre/graylog:v2.3.0
         ports:
-        - containerPort: 1234
-          name: datain
+        - containerPort: 12300
+          name: tcpin
           protocol: TCP
         - containerPort: 9000
           name: graylog-api
@@ -41,11 +44,11 @@ spec:
         - name: "GRAYLOG_MONGODB_URI"
           value: "mongodb://mongo:27017/graylog"
         - name: "GRAYLOG_PASSWORD_SECRET"
-          value: somepasswordpepper
+          value: "somepasswordpepper"
         - name: "GRAYLOG_ROOT_PASSWORD_SHA2"
           value: "8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918"
         - name: "GRAYLOG_REST_TRANSPORT_URI"
-          value: "http://172.17.1.4:12900"
+          value: "http://172.17.1.7:12900"
         - name: "GRAYLOG_REST_LISTEN_URI"
           value: "http://0.0.0.0:12900"
         - name: "GRAYLOG_WEB_LISTEN_URI"

diff --git a/mongo-svc.yaml → mongodb-svc.yaml b/mongo-svc.yaml → mongodb-svc.yaml
@@ -2,14 +2,14 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mongo
-  namespace: default
+  namespace: devops
   labels:
     component: mongo
 spec:
   selector:
     component: mongo
   ports:
-    - name: mongo
+    - name: db
       port: 27017
       protocol: TCP
 
diff --git a/mongo.yaml → mongodb.yaml b/mongo.yaml → mongodb.yaml
@@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: mongo
-  namespace: default
+  namespace: devops
   labels:
     component: mongo
 spec: