Skip to content

Commit 5109d64

Browse files
committed
Upgraded GKE, ECK & Elastic Stack
1 parent ae5cbcd commit 5109d64

File tree

11 files changed

+76
-37
lines changed

11 files changed

+76
-37
lines changed

bin/demo.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ default_pool=default-pool
1111
nodes_per_zone=5 # per zone
1212
machine_type=e2-standard-2
1313
release_channel=None # None -> static, e.g. rapid, regular, stable
14-
gke_version=1.23.7-gke.1400
15-
eck_version=2.3.0
14+
gke_version=1.24.3-gke.2100
15+
eck_version=2.4.0
1616
es_cluster_name=dingo-demo
1717

1818
__create_gke() {

bin/gke.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ default_pool=default-pool
1111
nodes_per_zone=6 # per zone
1212
machine_type=n2-standard-8
1313
release_channel=None # None -> static, e.g. rapid, regular, stable
14-
gke_version=1.23.7-gke.1400
15-
eck_version=2.3.0
14+
gke_version=1.24.3-gke.2100
15+
eck_version=2.4.0
1616
__usage() {
1717
echo "Usage: ./bin/gke.sh {create|(delete,del,d)|scale|fix}"
1818
}

conf/crds.yaml

Lines changed: 53 additions & 14 deletions
Large diffs are not rendered by default.

conf/operator.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ metadata:
1414
namespace: elastic-system
1515
labels:
1616
control-plane: elastic-operator
17-
app.kubernetes.io/version: "2.3.0"
17+
app.kubernetes.io/version: "2.4.0"
1818
---
1919
# Source: eck-operator/templates/webhook.yaml
2020
apiVersion: v1
@@ -24,7 +24,7 @@ metadata:
2424
namespace: elastic-system
2525
labels:
2626
control-plane: elastic-operator
27-
app.kubernetes.io/version: "2.3.0"
27+
app.kubernetes.io/version: "2.4.0"
2828
---
2929
# Source: eck-operator/templates/configmap.yaml
3030
apiVersion: v1
@@ -34,7 +34,7 @@ metadata:
3434
namespace: elastic-system
3535
labels:
3636
control-plane: elastic-operator
37-
app.kubernetes.io/version: "2.3.0"
37+
app.kubernetes.io/version: "2.4.0"
3838
data:
3939
eck.yaml: |-
4040
log-verbosity: 0
@@ -63,7 +63,7 @@ metadata:
6363
name: elastic-operator
6464
labels:
6565
control-plane: elastic-operator
66-
app.kubernetes.io/version: "2.3.0"
66+
app.kubernetes.io/version: "2.4.0"
6767
rules:
6868
- apiGroups:
6969
- "authorization.k8s.io"
@@ -268,7 +268,7 @@ metadata:
268268
rbac.authorization.k8s.io/aggregate-to-edit: "true"
269269
rbac.authorization.k8s.io/aggregate-to-admin: "true"
270270
control-plane: elastic-operator
271-
app.kubernetes.io/version: "2.3.0"
271+
app.kubernetes.io/version: "2.4.0"
272272
rules:
273273
- apiGroups: ["elasticsearch.k8s.elastic.co"]
274274
resources: ["elasticsearches"]
@@ -301,7 +301,7 @@ metadata:
301301
rbac.authorization.k8s.io/aggregate-to-edit: "true"
302302
rbac.authorization.k8s.io/aggregate-to-admin: "true"
303303
control-plane: elastic-operator
304-
app.kubernetes.io/version: "2.3.0"
304+
app.kubernetes.io/version: "2.4.0"
305305
rules:
306306
- apiGroups: ["elasticsearch.k8s.elastic.co"]
307307
resources: ["elasticsearches"]
@@ -332,7 +332,7 @@ metadata:
332332
name: elastic-operator
333333
labels:
334334
control-plane: elastic-operator
335-
app.kubernetes.io/version: "2.3.0"
335+
app.kubernetes.io/version: "2.4.0"
336336
roleRef:
337337
apiGroup: rbac.authorization.k8s.io
338338
kind: ClusterRole
@@ -350,7 +350,7 @@ metadata:
350350
namespace: elastic-system
351351
labels:
352352
control-plane: elastic-operator
353-
app.kubernetes.io/version: "2.3.0"
353+
app.kubernetes.io/version: "2.4.0"
354354
spec:
355355
ports:
356356
- name: https
@@ -367,7 +367,7 @@ metadata:
367367
namespace: elastic-system
368368
labels:
369369
control-plane: elastic-operator
370-
app.kubernetes.io/version: "2.3.0"
370+
app.kubernetes.io/version: "2.4.0"
371371
spec:
372372
selector:
373373
matchLabels:
@@ -380,7 +380,7 @@ spec:
380380
# Rename the fields "error" to "error.message" and "source" to "event.source"
381381
# This is to avoid a conflict with the ECS "error" and "source" documents.
382382
"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\"}]}}]}]"
383-
"checksum/config": c59021a608a21d8c08fb6dfa1fbd39c976ce05ccacb7edb22a3f40ef5e5148e6
383+
"checksum/config": a99a5f63f628a1ca8df440c12506cdfbf17827a1175dc5765b05f22f92b12b95
384384
labels:
385385
control-plane: elastic-operator
386386
spec:
@@ -389,7 +389,7 @@ spec:
389389
securityContext:
390390
runAsNonRoot: true
391391
containers:
392-
- image: "docker.elastic.co/eck/eck-operator:2.3.0"
392+
- image: "docker.elastic.co/eck/eck-operator:2.4.0"
393393
imagePullPolicy: IfNotPresent
394394
name: manager
395395
args:
@@ -440,7 +440,7 @@ metadata:
440440
name: elastic-webhook.k8s.elastic.co
441441
labels:
442442
control-plane: elastic-operator
443-
app.kubernetes.io/version: "2.3.0"
443+
app.kubernetes.io/version: "2.4.0"
444444
webhooks:
445445
- clientConfig:
446446
caBundle: Cg==

templates/apm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ApmServer
33
metadata:
44
name: dingo-apm
55
spec:
6-
version: 8.3.1
6+
version: 8.4.1
77
count: 1
88
elasticsearchRef:
99
name: dingo

templates/es.all_role.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Elasticsearch
33
metadata:
44
name: dingo
55
spec:
6-
version: 8.3.1
6+
version: 8.4.1
77
#http:
88
#service:
99
#spec:

templates/es.demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Elasticsearch
33
metadata:
44
name: dingo-demo
55
spec:
6-
version: 8.3.1
6+
version: 8.4.1
77
http:
88
service:
99
spec:

templates/es.prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Elasticsearch
33
metadata:
44
name: dingo
55
spec:
6-
version: 8.3.1
6+
version: 8.4.1
77
#http:
88
#service:
99
#spec:

templates/es.single_node.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Elasticsearch
33
metadata:
44
name: dingo
55
spec:
6-
version: 8.2.1
6+
version: 8.4.1
77
#http:
88
#service:
99
#spec:

templates/kbn.demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Kibana
33
metadata:
44
name: dingo-demo-kbn
55
spec:
6-
version: 8.3.1
6+
version: 8.4.1
77
count: 1
88
http:
99
service:

0 commit comments

Comments
 (0)