Skip to content

Commit e60cee0

Browse files
committed
Stack updates
1 parent db295ca commit e60cee0

File tree

12 files changed

+129
-68
lines changed

12 files changed

+129
-68
lines changed

bin/demo.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ pwd=`pwd`
66
cluster_name=elastic-demo
77
region=asia-east1
88
# zone=asia-east1-a
9-
project_id=du-hast-mich
9+
project_id=`gcloud config get-value project`
1010
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.5-gke.1500
15-
eck_version=2.6.1
14+
gke_version=1.25.7-gke.1000
15+
eck_version=2.7.0
1616
es_cluster_name=dingo-demo
1717

1818
__create_gke() {

bin/gke.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ pwd=`pwd`
66
cluster_name=elk
77
region=asia-east1
88
# zone=asia-east1-a
9-
project_id=du-hast-mich
9+
project_id=`gcloud config get-value project`
1010
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.5-gke.1500
15-
eck_version=2.6.1
14+
gke_version=1.25.7-gke.1000
15+
eck_version=2.7.0
1616
__usage() {
1717
echo "Usage: ./bin/gke.sh {create|(delete,del,d)|scale|fix}"
1818
}

conf/crds.yaml

Lines changed: 64 additions & 24 deletions
Large diffs are not rendered by default.

conf/operator.yaml

Lines changed: 44 additions & 23 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.6.1"
17+
app.kubernetes.io/version: "2.7.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.6.1"
27+
app.kubernetes.io/version: "2.7.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.6.1"
37+
app.kubernetes.io/version: "2.7.0"
3838
data:
3939
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"
4040
---
@@ -45,7 +45,7 @@ metadata:
4545
name: elastic-operator
4646
labels:
4747
control-plane: elastic-operator
48-
app.kubernetes.io/version: "2.6.1"
48+
app.kubernetes.io/version: "2.7.0"
4949
rules:
5050
- apiGroups:
5151
- "authorization.k8s.io"
@@ -276,7 +276,7 @@ metadata:
276276
rbac.authorization.k8s.io/aggregate-to-edit: "true"
277277
rbac.authorization.k8s.io/aggregate-to-admin: "true"
278278
control-plane: elastic-operator
279-
app.kubernetes.io/version: "2.6.1"
279+
app.kubernetes.io/version: "2.7.0"
280280
rules:
281281
- apiGroups: ["elasticsearch.k8s.elastic.co"]
282282
resources: ["elasticsearches"]
@@ -315,7 +315,7 @@ metadata:
315315
rbac.authorization.k8s.io/aggregate-to-edit: "true"
316316
rbac.authorization.k8s.io/aggregate-to-admin: "true"
317317
control-plane: elastic-operator
318-
app.kubernetes.io/version: "2.6.1"
318+
app.kubernetes.io/version: "2.7.0"
319319
rules:
320320
- apiGroups: ["elasticsearch.k8s.elastic.co"]
321321
resources: ["elasticsearches"]
@@ -352,7 +352,7 @@ metadata:
352352
name: elastic-operator
353353
labels:
354354
control-plane: elastic-operator
355-
app.kubernetes.io/version: "2.6.1"
355+
app.kubernetes.io/version: "2.7.0"
356356
roleRef:
357357
apiGroup: rbac.authorization.k8s.io
358358
kind: ClusterRole
@@ -370,7 +370,7 @@ metadata:
370370
namespace: elastic-system
371371
labels:
372372
control-plane: elastic-operator
373-
app.kubernetes.io/version: "2.6.1"
373+
app.kubernetes.io/version: "2.7.0"
374374
spec:
375375
ports:
376376
- name: https
@@ -387,7 +387,7 @@ metadata:
387387
namespace: elastic-system
388388
labels:
389389
control-plane: elastic-operator
390-
app.kubernetes.io/version: "2.6.1"
390+
app.kubernetes.io/version: "2.7.0"
391391
spec:
392392
selector:
393393
matchLabels:
@@ -400,7 +400,7 @@ spec:
400400
# Rename the fields "error" to "error.message" and "source" to "event.source"
401401
# This is to avoid a conflict with the ECS "error" and "source" documents.
402402
"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": 0167077654d0c8023b9201c09b02b9213c73d47b50aab990b1e2e8cd41653ca7
403+
"checksum/config": e58cbb3b8467599c33d5c3a30c38d480d0c47cc783fd2fcbe33c08441312d93e
404404
labels:
405405
control-plane: elastic-operator
406406
spec:
@@ -409,7 +409,7 @@ spec:
409409
securityContext:
410410
runAsNonRoot: true
411411
containers:
412-
- image: "docker.elastic.co/eck/eck-operator:2.6.1"
412+
- image: "docker.elastic.co/eck/eck-operator:2.7.0"
413413
imagePullPolicy: IfNotPresent
414414
name: manager
415415
args:
@@ -467,7 +467,7 @@ metadata:
467467
name: elastic-webhook.k8s.elastic.co
468468
labels:
469469
control-plane: elastic-operator
470-
app.kubernetes.io/version: "2.6.1"
470+
app.kubernetes.io/version: "2.7.0"
471471
webhooks:
472472
- clientConfig:
473473
caBundle: Cg==
@@ -478,7 +478,7 @@ webhooks:
478478
failurePolicy: Ignore
479479
name: elastic-agent-validation-v1alpha1.k8s.elastic.co
480480
matchPolicy: Exact
481-
admissionReviewVersions: [v1beta1]
481+
admissionReviewVersions: [v1, v1beta1]
482482
sideEffects: None
483483
rules:
484484
- apiGroups:
@@ -499,7 +499,7 @@ webhooks:
499499
failurePolicy: Ignore
500500
name: elastic-apm-validation-v1.k8s.elastic.co
501501
matchPolicy: Exact
502-
admissionReviewVersions: [v1beta1]
502+
admissionReviewVersions: [v1, v1beta1]
503503
sideEffects: None
504504
rules:
505505
- apiGroups:
@@ -520,7 +520,7 @@ webhooks:
520520
failurePolicy: Ignore
521521
name: elastic-apm-validation-v1beta1.k8s.elastic.co
522522
matchPolicy: Exact
523-
admissionReviewVersions: [v1beta1]
523+
admissionReviewVersions: [v1, v1beta1]
524524
sideEffects: None
525525
rules:
526526
- apiGroups:
@@ -541,7 +541,7 @@ webhooks:
541541
failurePolicy: Ignore
542542
name: elastic-beat-validation-v1beta1.k8s.elastic.co
543543
matchPolicy: Exact
544-
admissionReviewVersions: [v1beta1]
544+
admissionReviewVersions: [v1, v1beta1]
545545
sideEffects: None
546546
rules:
547547
- apiGroups:
@@ -562,7 +562,7 @@ webhooks:
562562
failurePolicy: Ignore
563563
name: elastic-ent-validation-v1.k8s.elastic.co
564564
matchPolicy: Exact
565-
admissionReviewVersions: [v1beta1]
565+
admissionReviewVersions: [v1, v1beta1]
566566
sideEffects: None
567567
rules:
568568
- apiGroups:
@@ -583,7 +583,7 @@ webhooks:
583583
failurePolicy: Ignore
584584
name: elastic-ent-validation-v1beta1.k8s.elastic.co
585585
matchPolicy: Exact
586-
admissionReviewVersions: [v1beta1]
586+
admissionReviewVersions: [v1, v1beta1]
587587
sideEffects: None
588588
rules:
589589
- apiGroups:
@@ -604,7 +604,7 @@ webhooks:
604604
failurePolicy: Ignore
605605
name: elastic-es-validation-v1.k8s.elastic.co
606606
matchPolicy: Exact
607-
admissionReviewVersions: [v1beta1]
607+
admissionReviewVersions: [v1, v1beta1]
608608
sideEffects: None
609609
rules:
610610
- apiGroups:
@@ -625,7 +625,7 @@ webhooks:
625625
failurePolicy: Ignore
626626
name: elastic-es-validation-v1beta1.k8s.elastic.co
627627
matchPolicy: Exact
628-
admissionReviewVersions: [v1beta1]
628+
admissionReviewVersions: [v1, v1beta1]
629629
sideEffects: None
630630
rules:
631631
- apiGroups:
@@ -637,6 +637,27 @@ webhooks:
637637
- UPDATE
638638
resources:
639639
- elasticsearches
640+
- clientConfig:
641+
caBundle: Cg==
642+
service:
643+
name: elastic-webhook-server
644+
namespace: elastic-system
645+
path: /validate-ems-k8s-elastic-co-v1alpha1-mapsservers
646+
failurePolicy: Ignore
647+
name: elastic-ems-validation-v1alpha1.k8s.elastic.co
648+
matchPolicy: Exact
649+
admissionReviewVersions: [v1, v1beta1]
650+
sideEffects: None
651+
rules:
652+
- apiGroups:
653+
- maps.k8s.elastic.co
654+
apiVersions:
655+
- v1alpha1
656+
operations:
657+
- CREATE
658+
- UPDATE
659+
resources:
660+
- mapsservers
640661
- clientConfig:
641662
caBundle: Cg==
642663
service:
@@ -646,7 +667,7 @@ webhooks:
646667
failurePolicy: Ignore
647668
name: elastic-kb-validation-v1.k8s.elastic.co
648669
matchPolicy: Exact
649-
admissionReviewVersions: [v1beta1]
670+
admissionReviewVersions: [v1, v1beta1]
650671
sideEffects: None
651672
rules:
652673
- apiGroups:
@@ -667,7 +688,7 @@ webhooks:
667688
failurePolicy: Ignore
668689
name: elastic-kb-validation-v1beta1.k8s.elastic.co
669690
matchPolicy: Exact
670-
admissionReviewVersions: [v1beta1]
691+
admissionReviewVersions: [v1, v1beta1]
671692
sideEffects: None
672693
rules:
673694
- apiGroups:
@@ -688,7 +709,7 @@ webhooks:
688709
failurePolicy: Ignore
689710
name: elastic-esa-validation-v1alpha1.k8s.elastic.co
690711
matchPolicy: Exact
691-
admissionReviewVersions: [v1beta1]
712+
admissionReviewVersions: [v1, v1beta1]
692713
sideEffects: None
693714
rules:
694715
- apiGroups:

readme.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ Elasticsearch status:
3535
"cluster_name" : "dingo-demo",
3636
"cluster_uuid" : "j8RlyvPEQNCoZcZi0yg8sQ",
3737
"version" : {
38-
"number" : "8.4.3",
38+
"number" : "8.6.2",
3939
"build_flavor" : "default",
4040
"build_type" : "docker",
41-
"build_hash" : "42f05b9372a9a4a470db3b52817899b99a76ee73",
42-
"build_date" : "2022-10-04T07:17:24.662462378Z",
41+
"build_hash" : "2d58d0f136141f03239816a4e360a8d17b6d8f29",
42+
"build_date" : "2023-02-13T09:35:20.314882762Z",
4343
"build_snapshot" : false,
44-
"lucene_version" : "9.3.0",
44+
"lucene_version" : "9.4.2",
4545
"minimum_wire_compatibility_version" : "7.17.0",
4646
"minimum_index_compatibility_version" : "7.0.0"
4747
},
@@ -50,8 +50,8 @@ Elasticsearch status:
5050
5151
---------------------------------
5252
53-
Kibana: https://34.81.97.125:5601
54-
Elasticsearch: https://34.81.86.175:9200
53+
Kibana: https://35.201.182.178:5601
54+
Elasticsearch: https://35.234.3.182:9200
5555
Username: elastic
5656
Password: Sc1JLJ203L2Q7Vvi9XYou802
5757
=================================
@@ -351,7 +351,7 @@ kind: Kibana
351351
metadata:
352352
name: kbn
353353
spec:
354-
version: 7.15.2
354+
version: 8.6.2
355355
count: 1
356356
config:
357357
elasticsearch.hosts:
@@ -369,7 +369,7 @@ kind: Kibana
369369
metadata:
370370
name: kbn
371371
spec:
372-
version: 7.15.2
372+
version: 8.6.2
373373
count: 1
374374
config:
375375
elasticsearch.hosts:

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.5.3
6+
version: 8.6.2
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.5.3
6+
version: 8.6.2
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.5.3
6+
version: 8.6.2
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.5.3
6+
version: 8.6.2
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.5.3
6+
version: 8.6.2
77
#http:
88
#service:
99
#spec:

0 commit comments

Comments
 (0)