Merge pull request #95284 from coffeepac/pc/es-addon-1.18

v1.18 support changes

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

@@ -9,9 +9,18 @@ metadata:
     addonmanager.kubernetes.io/mode: Reconcile
     kubernetes.io/name: "Elasticsearch"
 spec:
+  clusterIP: None
   ports:
-  - port: 9200
+    - name: db
+      port: 9200
       protocol: TCP
-    targetPort: db
+      targetPort: 9200
+    - name: transport
+      port: 9300
+      protocol: TCP
+      targetPort: 9300
+  publishNotReadyAddresses: true
   selector:
     k8s-app: elasticsearch-logging
+  sessionAffinity: None
+  type: ClusterIP

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

@@ -16,13 +16,13 @@ metadata:
     k8s-app: elasticsearch-logging
     addonmanager.kubernetes.io/mode: Reconcile
 rules:
-- apiGroups:
+  - apiGroups:
       - ""
-  resources:
+  - resources:
       - "services"
       - "namespaces"
       - "endpoints"
-  verbs:
+  - verbs:
       - "get"
 ---
 kind: ClusterRoleBinding
@@ -34,7 +34,7 @@ metadata:
     k8s-app: elasticsearch-logging
     addonmanager.kubernetes.io/mode: Reconcile
 subjects:
-- kind: ServiceAccount
+  - kind: ServiceAccount
     name: elasticsearch-logging
     namespace: kube-system
     apiGroup: ""
@@ -59,12 +59,12 @@ spec:
   selector:
     matchLabels:
       k8s-app: elasticsearch-logging
-      version: v7.4.2
+      version: v7.4.2-1
   template:
     metadata:
       labels:
         k8s-app: elasticsearch-logging
-        version: v7.4.2
+        version: v7.4.2-1
     spec:
       serviceAccountName: elasticsearch-logging
       containers:
@@ -104,6 +104,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: "MINIMUM_MASTER_NODES"
+              value: "1"
       volumes:
         - name: elasticsearch-logging
           emptyDir: {}