Skip to content

Commit 05b4ac1

Browse files
committed
updated GKE, ECK & Elastic Stack to v8.8.0
1 parent e60cee0 commit 05b4ac1

File tree

11 files changed

+514
-67
lines changed

11 files changed

+514
-67
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.25.7-gke.1000
15-
eck_version=2.7.0
14+
gke_version=1.26.4-gke.500
15+
eck_version=2.8.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.25.7-gke.1000
15-
eck_version=2.7.0
14+
gke_version=1.26.4-gke.500
15+
eck_version=2.8.0
1616
__usage() {
1717
echo "Usage: ./bin/gke.sh {create|(delete,del,d)|scale|fix}"
1818
}

conf/crds.yaml

Lines changed: 451 additions & 30 deletions
Large diffs are not rendered by default.

conf/operator.yaml

Lines changed: 52 additions & 26 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.7.0"
17+
app.kubernetes.io/version: "2.8.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.7.0"
27+
app.kubernetes.io/version: "2.8.0"
2828
---
2929
# Source: eck-operator/templates/configmap.yaml
3030
apiVersion: v1
@@ -34,9 +34,29 @@ metadata:
3434
namespace: elastic-system
3535
labels:
3636
control-plane: elastic-operator
37-
app.kubernetes.io/version: "2.7.0"
37+
app.kubernetes.io/version: "2.8.0"
3838
data:
39-
eck.yaml: "log-verbosity: 0\nmetrics-port: 0\ncontainer-registry: docker.elastic.co\ncontainer-suffix: \nmax-concurrent-reconciles: 3\nca-cert-validity: 8760h\nca-cert-rotate-before: 24h\ncert-validity: 8760h\ncert-rotate-before: 24h\nexposed-node-labels: [topology.kubernetes.io/.*,failure-domain.beta.kubernetes.io/.*]\nset-default-security-context: auto-detect\nkube-client-timeout: 60s\nelasticsearch-client-timeout: 180s\ndisable-telemetry: false\ndistribution-channel: all-in-one\nvalidate-storage-class: true\nenable-webhook: true\nwebhook-name: elastic-webhook.k8s.elastic.co\nenable-leader-election: true\nelasticsearch-observation-interval: 10s"
39+
eck.yaml: |-
40+
log-verbosity: 0
41+
metrics-port: 0
42+
container-registry: docker.elastic.co
43+
max-concurrent-reconciles: 3
44+
ca-cert-validity: 8760h
45+
ca-cert-rotate-before: 24h
46+
cert-validity: 8760h
47+
cert-rotate-before: 24h
48+
exposed-node-labels: [topology.kubernetes.io/.*,failure-domain.beta.kubernetes.io/.*]
49+
set-default-security-context: auto-detect
50+
kube-client-timeout: 60s
51+
elasticsearch-client-timeout: 180s
52+
disable-telemetry: false
53+
distribution-channel: all-in-one
54+
validate-storage-class: true
55+
enable-webhook: true
56+
webhook-name: elastic-webhook.k8s.elastic.co
57+
webhook-port: 9443
58+
enable-leader-election: true
59+
elasticsearch-observation-interval: 10s
4060
---
4161
# Source: eck-operator/templates/cluster-roles.yaml
4262
apiVersion: rbac.authorization.k8s.io/v1
@@ -45,7 +65,7 @@ metadata:
4565
name: elastic-operator
4666
labels:
4767
control-plane: elastic-operator
48-
app.kubernetes.io/version: "2.7.0"
68+
app.kubernetes.io/version: "2.8.0"
4969
rules:
5070
- apiGroups:
5171
- "authorization.k8s.io"
@@ -237,6 +257,19 @@ rules:
237257
- create
238258
- update
239259
- patch
260+
- apiGroups:
261+
- logstash.k8s.elastic.co
262+
resources:
263+
- logstashes
264+
- logstashes/status
265+
- logstashes/finalizers # needed for ownerReferences with blockOwnerDeletion on OCP
266+
verbs:
267+
- get
268+
- list
269+
- watch
270+
- create
271+
- update
272+
- patch
240273
- apiGroups:
241274
- storage.k8s.io
242275
resources:
@@ -276,7 +309,7 @@ metadata:
276309
rbac.authorization.k8s.io/aggregate-to-edit: "true"
277310
rbac.authorization.k8s.io/aggregate-to-admin: "true"
278311
control-plane: elastic-operator
279-
app.kubernetes.io/version: "2.7.0"
312+
app.kubernetes.io/version: "2.8.0"
280313
rules:
281314
- apiGroups: ["elasticsearch.k8s.elastic.co"]
282315
resources: ["elasticsearches"]
@@ -305,6 +338,9 @@ rules:
305338
- apiGroups: ["stackconfigpolicy.k8s.elastic.co"]
306339
resources: ["stackconfigpolicies"]
307340
verbs: ["get", "list", "watch"]
341+
- apiGroups: ["logstash.k8s.elastic.co"]
342+
resources: ["logstashes"]
343+
verbs: ["get", "list", "watch"]
308344
---
309345
# Source: eck-operator/templates/cluster-roles.yaml
310346
apiVersion: rbac.authorization.k8s.io/v1
@@ -315,7 +351,7 @@ metadata:
315351
rbac.authorization.k8s.io/aggregate-to-edit: "true"
316352
rbac.authorization.k8s.io/aggregate-to-admin: "true"
317353
control-plane: elastic-operator
318-
app.kubernetes.io/version: "2.7.0"
354+
app.kubernetes.io/version: "2.8.0"
319355
rules:
320356
- apiGroups: ["elasticsearch.k8s.elastic.co"]
321357
resources: ["elasticsearches"]
@@ -344,6 +380,9 @@ rules:
344380
- apiGroups: ["stackconfigpolicy.k8s.elastic.co"]
345381
resources: ["stackconfigpolicies"]
346382
verbs: ["create", "delete", "deletecollection", "patch", "update"]
383+
- apiGroups: ["logstash.k8s.elastic.co"]
384+
resources: ["logstashes"]
385+
verbs: ["create", "delete", "deletecollection", "patch", "update"]
347386
---
348387
# Source: eck-operator/templates/role-bindings.yaml
349388
apiVersion: rbac.authorization.k8s.io/v1
@@ -352,7 +391,7 @@ metadata:
352391
name: elastic-operator
353392
labels:
354393
control-plane: elastic-operator
355-
app.kubernetes.io/version: "2.7.0"
394+
app.kubernetes.io/version: "2.8.0"
356395
roleRef:
357396
apiGroup: rbac.authorization.k8s.io
358397
kind: ClusterRole
@@ -370,7 +409,7 @@ metadata:
370409
namespace: elastic-system
371410
labels:
372411
control-plane: elastic-operator
373-
app.kubernetes.io/version: "2.7.0"
412+
app.kubernetes.io/version: "2.8.0"
374413
spec:
375414
ports:
376415
- name: https
@@ -387,7 +426,7 @@ metadata:
387426
namespace: elastic-system
388427
labels:
389428
control-plane: elastic-operator
390-
app.kubernetes.io/version: "2.7.0"
429+
app.kubernetes.io/version: "2.8.0"
391430
spec:
392431
selector:
393432
matchLabels:
@@ -400,7 +439,7 @@ spec:
400439
# Rename the fields "error" to "error.message" and "source" to "event.source"
401440
# This is to avoid a conflict with the ECS "error" and "source" documents.
402441
"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\"}]}}]}]"
403-
"checksum/config": e58cbb3b8467599c33d5c3a30c38d480d0c47cc783fd2fcbe33c08441312d93e
442+
"checksum/config": f5dd5faf7957b8681c25599dfb9862fa493377fc9a4525517707c7a633411235
404443
labels:
405444
control-plane: elastic-operator
406445
spec:
@@ -409,7 +448,7 @@ spec:
409448
securityContext:
410449
runAsNonRoot: true
411450
containers:
412-
- image: "docker.elastic.co/eck/eck-operator:2.7.0"
451+
- image: "docker.elastic.co/eck/eck-operator:2.8.0"
413452
imagePullPolicy: IfNotPresent
414453
name: manager
415454
args:
@@ -467,10 +506,9 @@ metadata:
467506
name: elastic-webhook.k8s.elastic.co
468507
labels:
469508
control-plane: elastic-operator
470-
app.kubernetes.io/version: "2.7.0"
509+
app.kubernetes.io/version: "2.8.0"
471510
webhooks:
472511
- clientConfig:
473-
caBundle: Cg==
474512
service:
475513
name: elastic-webhook-server
476514
namespace: elastic-system
@@ -491,7 +529,6 @@ webhooks:
491529
resources:
492530
- agents
493531
- clientConfig:
494-
caBundle: Cg==
495532
service:
496533
name: elastic-webhook-server
497534
namespace: elastic-system
@@ -512,7 +549,6 @@ webhooks:
512549
resources:
513550
- apmservers
514551
- clientConfig:
515-
caBundle: Cg==
516552
service:
517553
name: elastic-webhook-server
518554
namespace: elastic-system
@@ -533,7 +569,6 @@ webhooks:
533569
resources:
534570
- apmservers
535571
- clientConfig:
536-
caBundle: Cg==
537572
service:
538573
name: elastic-webhook-server
539574
namespace: elastic-system
@@ -554,7 +589,6 @@ webhooks:
554589
resources:
555590
- beats
556591
- clientConfig:
557-
caBundle: Cg==
558592
service:
559593
name: elastic-webhook-server
560594
namespace: elastic-system
@@ -575,7 +609,6 @@ webhooks:
575609
resources:
576610
- enterprisesearches
577611
- clientConfig:
578-
caBundle: Cg==
579612
service:
580613
name: elastic-webhook-server
581614
namespace: elastic-system
@@ -596,7 +629,6 @@ webhooks:
596629
resources:
597630
- enterprisesearches
598631
- clientConfig:
599-
caBundle: Cg==
600632
service:
601633
name: elastic-webhook-server
602634
namespace: elastic-system
@@ -617,7 +649,6 @@ webhooks:
617649
resources:
618650
- elasticsearches
619651
- clientConfig:
620-
caBundle: Cg==
621652
service:
622653
name: elastic-webhook-server
623654
namespace: elastic-system
@@ -638,7 +669,6 @@ webhooks:
638669
resources:
639670
- elasticsearches
640671
- clientConfig:
641-
caBundle: Cg==
642672
service:
643673
name: elastic-webhook-server
644674
namespace: elastic-system
@@ -659,7 +689,6 @@ webhooks:
659689
resources:
660690
- mapsservers
661691
- clientConfig:
662-
caBundle: Cg==
663692
service:
664693
name: elastic-webhook-server
665694
namespace: elastic-system
@@ -680,7 +709,6 @@ webhooks:
680709
resources:
681710
- kibanas
682711
- clientConfig:
683-
caBundle: Cg==
684712
service:
685713
name: elastic-webhook-server
686714
namespace: elastic-system
@@ -701,7 +729,6 @@ webhooks:
701729
resources:
702730
- kibanas
703731
- clientConfig:
704-
caBundle: Cg==
705732
service:
706733
name: elastic-webhook-server
707734
namespace: elastic-system
@@ -722,7 +749,6 @@ webhooks:
722749
resources:
723750
- elasticsearchautoscalers
724751
- clientConfig:
725-
caBundle: Cg==
726752
service:
727753
name: elastic-webhook-server
728754
namespace: elastic-system

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.6.2
6+
version: 8.8.0
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.6.2
6+
version: 8.8.0
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.6.2
6+
version: 8.8.0
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.6.2
6+
version: 8.8.0
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.6.2
6+
version: 8.8.0
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.6.2
6+
version: 8.8.0
77
count: 1
88
http:
99
service:

0 commit comments

Comments
 (0)