Keep ECK, GKE and Elastis Stack up2date

elasticsearch-cn · Oct 31, 2024 · b8a37a4 · b8a37a4
1 parent 57fb13f
commit b8a37a4
Show file tree

Hide file tree

Showing 12 changed files with 230 additions and 57 deletions.
diff --git a/bin/demo.sh b/bin/demo.sh
@@ -4,15 +4,15 @@
 
 pwd=`pwd`
 cluster_name=elastic-demo
-region=asia-east1
-# zone=asia-east1-a
+region=us-central1
+# zone=us-central1-a
 project_id=`gcloud config get-value project`
 default_pool=default-pool
 nodes_per_zone=5 # per zone
 machine_type=e2-standard-2
 release_channel=None # None -> static, e.g. rapid, regular, stable
-gke_version=1.29.6-gke.1038001
-eck_version=2.13.0
+gke_version=1.30.5-gke.1014001
+eck_version=2.14.0
 es_cluster_name=dingo-demo
 
 __create_gke() {

diff --git a/bin/gke.sh b/bin/gke.sh
@@ -4,15 +4,15 @@
 
 pwd=`pwd`
 cluster_name=elk
-region=asia-east1
-# zone=asia-east1-a
+region=us-central1
+# zone=us-central1-a
 project_id=`gcloud config get-value project`
 default_pool=default-pool
 nodes_per_zone=6 # per zone
 machine_type=n2-standard-8
 release_channel=None # None -> static, e.g. rapid, regular, stable
-gke_version=1.29.6-gke.1038001
-eck_version=2.13.0
+gke_version=1.30.5-gke.1014001
+eck_version=2.14.0
 __usage() {
     echo "Usage: ./bin/gke.sh {create|(delete,del,d)|scale|fix}"
 }

diff --git a/conf/crds.yaml b/conf/crds.yaml
diff --git a/conf/operator.yaml b/conf/operator.yaml
@@ -15,7 +15,7 @@ metadata:
   namespace: elastic-system
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 ---
 # Source: eck-operator/templates/webhook.yaml
 apiVersion: v1
@@ -25,7 +25,7 @@ metadata:
   namespace: elastic-system
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 ---
 # Source: eck-operator/templates/configmap.yaml
 apiVersion: v1
@@ -35,7 +35,7 @@ metadata:
   namespace: elastic-system
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 data:
   eck.yaml: |-
     log-verbosity: 0
@@ -69,7 +69,7 @@ metadata:
   name: elastic-operator
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 rules:
 - apiGroups:
   - "authorization.k8s.io"
@@ -313,7 +313,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 rules:
 - apiGroups: ["elasticsearch.k8s.elastic.co"]
   resources: ["elasticsearches"]
@@ -355,7 +355,7 @@ metadata:
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 rules:
 - apiGroups: ["elasticsearch.k8s.elastic.co"]
   resources: ["elasticsearches"]
@@ -395,7 +395,7 @@ metadata:
   name: elastic-operator
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -413,7 +413,7 @@ metadata:
   namespace: elastic-system
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 spec:
   ports:
   - name: https
@@ -430,7 +430,7 @@ metadata:
   namespace: elastic-system
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 spec:
   selector:
     matchLabels:
@@ -443,7 +443,7 @@ spec:
         # Rename the fields "error" to "error.message" and "source" to "event.source"
         # This is to avoid a conflict with the ECS "error" and "source" documents.
         "co.elastic.logs/raw": "[{\"type\":\"container\",\"json.keys_under_root\":true,\"paths\":[\"/var/log/containers/*${data.kubernetes.container.id}.log\"],\"processors\":[{\"convert\":{\"mode\":\"rename\",\"ignore_missing\":true,\"fields\":[{\"from\":\"error\",\"to\":\"_error\"}]}},{\"convert\":{\"mode\":\"rename\",\"ignore_missing\":true,\"fields\":[{\"from\":\"_error\",\"to\":\"error.message\"}]}},{\"convert\":{\"mode\":\"rename\",\"ignore_missing\":true,\"fields\":[{\"from\":\"source\",\"to\":\"_source\"}]}},{\"convert\":{\"mode\":\"rename\",\"ignore_missing\":true,\"fields\":[{\"from\":\"_source\",\"to\":\"event.source\"}]}}]}]"
-        "checksum/config": 8b10381ca4067cf2c56aecc94c799473b09486202e146d2d7e5d6714f4c2e533
+        "checksum/config": 882102069a9b11c3a4edfd77edcbbf9c3873f3dfc0d3f41676bd953ed4a3ce28
       labels:
         control-plane: elastic-operator
     spec:
@@ -453,7 +453,7 @@ spec:
       securityContext:
         runAsNonRoot: true
       containers:
-      - image: "docker.elastic.co/eck/eck-operator:2.13.0"
+      - image: "docker.elastic.co/eck/eck-operator:2.14.0"
         imagePullPolicy: IfNotPresent
         name: manager
         args:
@@ -511,7 +511,7 @@ metadata:
   name: elastic-webhook.k8s.elastic.co
   labels:
     control-plane: elastic-operator
-    app.kubernetes.io/version: "2.13.0"
+    app.kubernetes.io/version: "2.14.0"
 webhooks:
 - clientConfig:
     service:

diff --git a/readme.md b/readme.md
@@ -35,7 +35,7 @@ Elasticsearch status:
   "cluster_name" : "dingo-demo",
   "cluster_uuid" : "ouod-dk1R8-o_Et1LhJ19g",
   "version" : {
-    "number" : "8.12.2",
+    "number" : "8.15.3",
     "build_flavor" : "default",
     "build_type" : "docker",
     "build_hash" : "48a287ab9497e852de30327444b0809e55d46466",
@@ -96,7 +96,7 @@ For targeting region, you will need to update two files
 - [./bin/gke.sh](https://github.com/bindiego/local_services/blob/develop/k8s/gke/elastic/bin/gke.sh#L7)
 - [Makefile](https://github.com/bindiego/local_services/blob/develop/k8s/gke/elastic/Makefile#L1)
 
-Change the `region` variable on your choice, `asia-east1` by default.
+Change the `region` variable on your choice, `us-central1` by default.
 
 #### Choose a predefined Elasticsearch deployment 选择一个预置的集群架构
 
@@ -351,7 +351,7 @@ kind: Kibana
 metadata:
   name: kbn
   spec:
-    version: 8.11.3
+    version: 8.15.3
     count: 1
     config:
       elasticsearch.hosts:
@@ -369,7 +369,7 @@ kind: Kibana
 metadata:
   name: kbn
 spec:
-  version: 8.11.3
+  version: 8.15.3
   count: 1
   config:
     elasticsearch.hosts:

diff --git a/templates/apm.yml b/templates/apm.yml
@@ -3,7 +3,7 @@ kind: ApmServer
 metadata:
       name: dingo-apm
 spec:
-    version: 8.14.3
+    version: 8.15.3
     count: 1
     elasticsearchRef:
         name: dingo

diff --git a/templates/es.all_role.yml b/templates/es.all_role.yml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo
 spec:
-    version: 8.14.3
+    version: 8.15.3
     #http:
         #service:
             #spec:

diff --git a/templates/es.demo.yml b/templates/es.demo.yml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo-demo
 spec:
-    version: 8.14.3
+    version: 8.15.3
     http:
         service:
             spec:

diff --git a/templates/es.prod.yml b/templates/es.prod.yml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo
 spec:
-    version: 8.14.3
+    version: 8.15.3
     #http:
         #service:
             #spec:

diff --git a/templates/es.single_node.yml b/templates/es.single_node.yml
@@ -3,7 +3,7 @@ kind: Elasticsearch
 metadata:
     name: dingo
 spec:
-    version: 8.14.3
+    version: 8.15.3
     #http:
         #service:
             #spec:

diff --git a/templates/kbn.demo.yml b/templates/kbn.demo.yml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
     name: dingo-demo-kbn 
 spec:
-    version: 8.14.3
+    version: 8.15.3
     count: 1
     http:
         service:

diff --git a/templates/kbn.yml b/templates/kbn.yml
@@ -3,7 +3,7 @@ kind: Kibana
 metadata:
     name: dingo-kbn 
 spec:
-    version: 8.14.3
+    version: 8.15.3
     count: 1
     #http:
         #service: