Merge pull request #10453 from satnam6502/fix-es

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

@@ -24,10 +24,10 @@ spec:
         name: elasticsearch-logging         
         ports:
         - containerPort: 9200
-          name: es-port
+          name: db
           protocol: TCP
         - containerPort: 9300
-          name: es-transport-port
+          name: transport
           protocol: TCP
         volumeMounts:
         - name: es-persistent-storage

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

@@ -11,6 +11,6 @@ spec:
   ports:
   - port: 9200
     protocol: TCP
-    targetPort: es-port
+    targetPort: db
   selector:
     k8s-app: elasticsearch-logging

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

@@ -27,5 +27,5 @@ spec:
             value: "http://elasticsearch-logging:9200"
         ports:
         - containerPort: 5601
-          name: kibana-port
+          name: ui
           protocol: TCP

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

@@ -12,6 +12,6 @@ spec:
   ports:
   - port: 5601
     protocol: TCP
-    targetPort: kibana-port
+    targetPort: ui
   selector:
     k8s-app: kibana-logging

docs/getting-started-guides/coreos/azure/addons/fluentd-elasticsearch/es-controller.yaml

@@ -24,10 +24,10 @@ spec:
         name: elasticsearch-logging
         ports:
         - containerPort: 9200
-          name: es-port
+          name: db
           protocol: TCP
         - containerPort: 9300
-          name: es-transport-port
+          name: transport
           protocol: TCP
         volumeMounts:
         - name: es-persistent-storage

pkg/api/replication_controller_example.json

@@ -49,12 +49,12 @@
                         "image": "gcr.io/google_containers/elasticsearch:1.0",
                         "ports": [
                             {
-                                "name": "es-port",
+                                "name": "db",
                                 "containerPort": 9200,
                                 "protocol": "TCP"
                             },
                             {
-                                "name": "es-transport-port",
+                                "name": "transport",
                                 "containerPort": 9300,
                                 "protocol": "TCP"
                             }