From 9f2a7eeeadae457dff3a1f2e97c501baec7f07c5 Mon Sep 17 00:00:00 2001 From: "zhangkun9038@dingtalk.com" Date: Mon, 31 Mar 2025 11:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E5=8C=BA=EF=BC=8Csnapshot=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=85=B1=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- elasticsearch-configMap.yaml | 9 ++- elasticsearch-pvandpvc_incluster.yaml | 93 --------------------------- elasticsearch-statefulSet.yaml | 73 ++++++++++++++++++++- 3 files changed, 78 insertions(+), 97 deletions(-) diff --git a/elasticsearch-configMap.yaml b/elasticsearch-configMap.yaml index 19645e1..ae7bc89 100644 --- a/elasticsearch-configMap.yaml +++ b/elasticsearch-configMap.yaml @@ -10,4 +10,11 @@ data: node.attr.data-tier.elasticsearch-0: "hot" node.attr.data-tier.elasticsearch-1: "warm" node.attr.data-tier.elasticsearch-2: "cold" - +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: timezone-config + namespace: efk +data: + timezone: Asia/Shanghai diff --git a/elasticsearch-pvandpvc_incluster.yaml b/elasticsearch-pvandpvc_incluster.yaml index 3bf1c1e..e8733bb 100644 --- a/elasticsearch-pvandpvc_incluster.yaml +++ b/elasticsearch-pvandpvc_incluster.yaml @@ -222,51 +222,6 @@ spec: server: 10.100.93.1 # fenny path: /root/elasticsearch/coldData/config ---- -# PV for Hot Snapshot -apiVersion: v1 -kind: PersistentVolume -metadata: - name: elasticsearch-hot-snapshot-pv -spec: - capacity: - storage: 100Gi - accessModes: - - ReadWriteOnce - nfs: - server: 10.100.93.1 - path: /root/elasticsearch/hotSnapshot - ---- -# PV for Warm Snapshot -apiVersion: v1 -kind: PersistentVolume -metadata: - name: elasticsearch-warm-snapshot-pv -spec: - capacity: - storage: 100Gi - accessModes: - - ReadWriteOnce - nfs: - server: 10.100.93.1 - path: /root/elasticsearch/warmSnapshot - ---- -# PV for Warm2 Snapshot -apiVersion: v1 -kind: PersistentVolume -metadata: - name: elasticsearch-warm2-snapshot-pv -spec: - capacity: - storage: 100Gi - accessModes: - - ReadWriteOnce - nfs: - server: 10.100.93.1 - path: /root/elasticsearch/warmSnapshot2 - --- # PV for Cold Snapshot apiVersion: v1 @@ -282,54 +237,6 @@ spec: server: 10.100.93.1 path: /root/elasticsearch/coldSnapshot ---- -# PVC for Hot Snapshot -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: elasticsearch-snapshot-pvc-elasticsearch-0 - namespace: efk -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Gi - volumeName: elasticsearch-hot-snapshot-pv - storageClassName: "" - ---- -# PVC for Warm Snapshot -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: elasticsearch-snapshot-pvc-elasticsearch-1 - namespace: efk -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Gi - volumeName: elasticsearch-warm-snapshot-pv - storageClassName: "" - ---- -# PVC for Warm2 Snapshot -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: elasticsearch-snapshot-pvc-elasticsearch-3 - namespace: efk -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Gi - volumeName: elasticsearch-warm2-snapshot-pv - storageClassName: "" - --- # PVC for Cold Snapshot apiVersion: v1 diff --git a/elasticsearch-statefulSet.yaml b/elasticsearch-statefulSet.yaml index 44583ef..f1800c2 100644 --- a/elasticsearch-statefulSet.yaml +++ b/elasticsearch-statefulSet.yaml @@ -29,6 +29,8 @@ spec: - containerPort: 9300 name: transport env: + - name: TZ + value: Asia/Shanghai - name: cluster.name value: "my-es-cluster" - name: node.name @@ -51,6 +53,11 @@ spec: memory: "8Gi" cpu: "4" volumeMounts: + - name: tz-db + mountPath: /usr/share/zoneinfo + - name: tz-config + mountPath: /etc/localtime + subPath: timezone - name: data mountPath: /usr/share/elasticsearch/data - name: config-volume @@ -69,6 +76,16 @@ spec: nodeSelector: kubernetes.io/hostname: miracle volumes: + - name: tz-db + hostPath: + path: /usr/share/zoneinfo + type: Directory + - name: tz-config + configMap: + name: timezone-config + items: + - key: timezone + path: timezone - name: data persistentVolumeClaim: claimName: "elasticsearch-data-pvc-elasticsearch-0" @@ -77,7 +94,7 @@ spec: claimName: "elasticsearch-config-pvc-elasticsearch-0" - name: snapshot-volume persistentVolumeClaim: - claimName: "elasticsearch-snapshot-pvc-elasticsearch-0" + claimName: "elasticsearch-snapshot-pvc-elasticsearch-2" --- @@ -112,6 +129,8 @@ spec: - containerPort: 9300 name: transport env: + - name: TZ + value: Asia/Shanghai - name: cluster.name value: "my-es-cluster" - name: node.name @@ -134,6 +153,11 @@ spec: memory: "6Gi" cpu: "2" volumeMounts: + - name: tz-db + mountPath: /usr/share/zoneinfo + - name: tz-config + mountPath: /etc/localtime + subPath: timezone - name: data mountPath: /usr/share/elasticsearch/data - name: config-volume @@ -152,6 +176,16 @@ spec: nodeSelector: kubernetes.io/hostname: lydia volumes: + - name: tz-db + hostPath: + path: /usr/share/zoneinfo + type: Directory + - name: tz-config + configMap: + name: timezone-config + items: + - key: timezone + path: timezone - name: data persistentVolumeClaim: claimName: "elasticsearch-data-pvc-elasticsearch-1" @@ -160,7 +194,7 @@ spec: claimName: "elasticsearch-config-pvc-elasticsearch-1" - name: snapshot-volume persistentVolumeClaim: - claimName: "elasticsearch-snapshot-pvc-elasticsearch-1" + claimName: "elasticsearch-snapshot-pvc-elasticsearch-2" --- @@ -195,6 +229,8 @@ spec: - containerPort: 9300 name: transport env: + - name: TZ + value: Asia/Shanghai - name: cluster.name value: "my-es-cluster" - name: node.name @@ -217,6 +253,11 @@ spec: memory: "6Gi" cpu: "2" volumeMounts: + - name: tz-db + mountPath: /usr/share/zoneinfo + - name: tz-config + mountPath: /etc/localtime + subPath: timezone - name: data mountPath: /usr/share/elasticsearch/data - name: config-volume @@ -235,6 +276,16 @@ spec: nodeSelector: kubernetes.io/hostname: emma volumes: + - name: tz-db + hostPath: + path: /usr/share/zoneinfo + type: Directory + - name: tz-config + configMap: + name: timezone-config + items: + - key: timezone + path: timezone - name: data persistentVolumeClaim: claimName: "elasticsearch-data-pvc-elasticsearch-2" @@ -278,6 +329,8 @@ spec: - containerPort: 9300 name: transport env: + - name: TZ + value: Asia/Shanghai - name: cluster.name value: "my-es-cluster" - name: node.name @@ -300,6 +353,10 @@ spec: memory: "6Gi" cpu: "2" volumeMounts: + - name: tz-db + mountPath: /usr/share/zoneinfo + - name: tz-config + mountPath: /etc/localtime - name: data mountPath: /usr/share/elasticsearch/data - name: config-volume @@ -318,6 +375,16 @@ spec: nodeSelector: kubernetes.io/hostname: niyon volumes: + - name: tz-db + hostPath: + path: /usr/share/zoneinfo + type: Directory + - name: tz-config + configMap: + name: timezone-config + items: + - key: timezone + path: timezone - name: data persistentVolumeClaim: claimName: "elasticsearch-data-pvc-elasticsearch-3" @@ -326,4 +393,4 @@ spec: claimName: "elasticsearch-config-pvc-elasticsearch-3" - name: snapshot-volume persistentVolumeClaim: - claimName: "elasticsearch-snapshot-pvc-elasticsearch-3" + claimName: "elasticsearch-snapshot-pvc-elasticsearch-2"