Merge pull request #7246 from satnam6502/es

Convert Elasticsearch logging to v1beta3 and de-salt

cluster/addons/fluentd-elasticsearch/es-controller.yaml

@@ -0,0 +1,33 @@
+apiVersion: v1beta3
+kind: ReplicationController
+metadata:
+  labels:
+    name: elasticsearch-logging
+    kubernetes.io/cluster-service: "true"
+  name: elasticsearch-logging
+spec:
+  replicas: 1
+  selector:
+    name: elasticsearch-logging
+  template:
+    metadata:
+      labels:
+        name: elasticsearch-logging
+        kubernetes.io/cluster-service: "true"
+    spec:
+      containers:
+      - image: gcr.io/google_containers/elasticsearch:1.0
+        name: elasticsearch-logging
+        ports:
+        - containerPort: 9200
+          name: es-port
+          protocol: TCP
+        - containerPort: 9300
+          name: es-transport-port
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /data
+          name: es-persistent-storage
+      volumes:
+      - name: es-persistent-storage
+        emptyDir: {}

cluster/addons/fluentd-elasticsearch/es-controller.yaml.in

@@ -1,33 +0,0 @@
-apiVersion: v1beta1
-kind: ReplicationController
-id: elasticsearch-logging-controller
-desiredState:
-  replicas: {{ pillar['elasticsearch_replicas'] }}
-  replicaSelector:
-    name: elasticsearch-logging
-  podTemplate:
-    desiredState:
-      manifest:
-        version: v1beta1
-        id: es-log-ingestion
-        containers:
-          - name: elasticsearch-logging
-            image: gcr.io/google_containers/elasticsearch:1.0
-            ports:
-              - name: es-port
-                containerPort: 9200
-              - name: es-transport-port
-                containerPort: 9300
-            volumeMounts:
-              - name: es-persistent-storage
-                mountPath: /data
-        volumes:
-          - name: es-persistent-storage
-            source:
-              emptyDir: {}
-    labels:
-      name: elasticsearch-logging
-      kubernetes.io/cluster-service: "true"
-labels:
-  name: elasticsearch-logging
-  kubernetes.io/cluster-service: "true"

cluster/addons/fluentd-elasticsearch/es-service.yaml

@@ -1,10 +1,14 @@
-apiVersion: v1beta1
+apiVersion: v1beta3
 kind: Service
-id: elasticsearch-logging
+metadata:
-port: 9200
+  labels:
-containerPort: 9200
+    name: elasticsearch-logging
-labels:
+    kubernetes.io/cluster-service: "true"
-  name: elasticsearch-logging
-  kubernetes.io/cluster-service: "true"
-selector:
   name: elasticsearch-logging
+spec:
+  ports:
+  - port: 9200
+    protocol: TCP
+    targetPort: es-port
+  selector:
+    name: elasticsearch-logging

cluster/saltbase/salt/kube-addons/init.sls

@@ -38,14 +38,6 @@
     - group: root
     - dir_mode: 755
     - file_mode: 644
-
-/etc/kubernetes/addons/fluentd-elasticsearch/es-controller.yaml:
-  file.managed:
-    - source: salt://kube-addons/fluentd-elasticsearch/es-controller.yaml.in
-    - template: jinja
-    - group: root
-    - dir_mode: 755
-    - makedirs: True
 {% endif %}
 
 /etc/kubernetes/kube-addons.sh: