diff --git a/bin/demo.sh b/bin/demo.sh index 202354b..154b236 100755 --- 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 index a47f6fd..b3141c1 100755 --- 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 index bfb1b0c..75be9d5 100644 --- a/conf/crds.yaml +++ b/conf/crds.yaml @@ -3,12 +3,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: agents.agent.k8s.elastic.co spec: group: agent.k8s.elastic.co @@ -377,6 +377,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -492,6 +493,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -619,6 +621,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -855,6 +867,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: description: |- dataSource field can be used to specify either: @@ -991,11 +1004,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -1023,7 +1038,7 @@ spec: If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass + More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/ (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled. type: string volumeMode: @@ -1094,12 +1109,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: apmservers.apm.k8s.elastic.co spec: group: apm.k8s.elastic.co @@ -1288,6 +1303,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -1403,6 +1419,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -1530,6 +1547,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -1884,6 +1911,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -1999,6 +2027,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -2126,6 +2155,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -2266,12 +2305,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: beats.beat.k8s.elastic.co spec: group: beat.k8s.elastic.co @@ -2731,12 +2770,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: elasticmapsservers.maps.k8s.elastic.co spec: group: maps.k8s.elastic.co @@ -2934,6 +2973,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -3049,6 +3089,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -3176,6 +3217,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -3307,12 +3358,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: elasticsearchautoscalers.autoscaling.k8s.elastic.co spec: group: autoscaling.k8s.elastic.co @@ -3627,12 +3678,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: elasticsearches.elasticsearch.k8s.elastic.co spec: group: elasticsearch.k8s.elastic.co @@ -3816,6 +3867,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -3931,6 +3983,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -4058,6 +4111,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -4286,6 +4349,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: description: |- dataSource field can be used to specify either: @@ -4422,11 +4486,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -4454,7 +4520,7 @@ spec: If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass + More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/ (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled. type: string volumeMode: @@ -4556,11 +4622,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -4777,6 +4845,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -4892,6 +4961,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -5019,6 +5089,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -5072,6 +5152,13 @@ spec: extension of each Elasticsearch node's transport TLS certificate. Example: if set to "node.cluster.local", the generated certificate will have its otherName set to ".node.cluster.local". type: string + selfSignedCertificates: + description: SelfSignedCertificates allows configuring the self-signed certificate generated by the operator. + properties: + disabled: + description: Disabled indicates that provisioning of the self-signed certificates should be disabled. + type: boolean + type: object subjectAltNames: description: SubjectAlternativeNames is a list of SANs to include in the generated node transport TLS certificates. items: @@ -5442,6 +5529,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -5557,6 +5645,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -5684,6 +5773,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -5825,6 +5924,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: description: |- dataSource field can be used to specify either: @@ -5961,11 +6061,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -5993,7 +6095,7 @@ spec: If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass + More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/ (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled. type: string volumeMode: @@ -6096,11 +6198,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -6237,12 +6341,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: enterprisesearches.enterprisesearch.k8s.elastic.co spec: group: enterprisesearch.k8s.elastic.co @@ -6440,6 +6544,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -6555,6 +6660,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -6682,6 +6788,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -6993,6 +7109,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -7108,6 +7225,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -7235,6 +7353,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -7353,12 +7481,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: kibanas.kibana.k8s.elastic.co spec: group: kibana.k8s.elastic.co @@ -7576,6 +7704,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -7691,6 +7820,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -7818,6 +7948,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -8232,6 +8372,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -8347,6 +8488,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -8474,6 +8616,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -8608,12 +8760,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: logstashes.logstash.k8s.elastic.co spec: group: logstash.k8s.elastic.co @@ -8981,6 +9133,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic externalName: description: |- externalName is the external reference that discovery mechanisms will @@ -9096,6 +9249,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic ports: description: |- The list of ports that are exposed by this service. @@ -9223,6 +9377,16 @@ spec: type: integer type: object type: object + trafficDistribution: + description: |- + TrafficDistribution offers a way to express preferences for how traffic is + distributed to Service endpoints. Implementations can use this field as a + hint, but are not required to guarantee strict adherence. If the field is + not set, the implementation will apply its default routing strategy. If set + to "PreferClose", implementations should prioritize endpoints that are + topologically close (e.g., same zone). + This is an alpha field and requires enabling ServiceTrafficDistribution feature. + type: string type: description: |- type determines how the Service is exposed. Defaults to ClusterIP. Valid @@ -9378,6 +9542,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic dataSource: description: |- dataSource field can be used to specify either: @@ -9514,11 +9679,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string @@ -9546,7 +9713,7 @@ spec: If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. - More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass + More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/ (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled. type: string volumeMode: @@ -9571,6 +9738,7 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic allocatedResourceStatuses: additionalProperties: description: |- @@ -9602,7 +9770,7 @@ spec: conditions: description: |- conditions is the current Condition of persistent volume claim. If underlying persistent volume is being - resized then the Condition will be set to 'ResizeStarted'. + resized then the Condition will be set to 'Resizing'. items: description: PersistentVolumeClaimCondition contains details about state of pvc properties: @@ -9620,7 +9788,7 @@ spec: reason: description: |- reason is a unique, this should be a short, machine understandable string that gives the reason - for condition's last transition. If it reports "ResizeStarted" that means the underlying + for condition's last transition. If it reports "Resizing" that means the underlying persistent volume is being resized. type: string status: @@ -9633,6 +9801,9 @@ spec: - type type: object type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map currentVolumeAttributesClassName: description: |- currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using. @@ -9719,12 +9890,12 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.15.0 helm.sh/resource-policy: keep labels: app.kubernetes.io/instance: 'elastic-operator' app.kubernetes.io/name: 'eck-operator-crds' - app.kubernetes.io/version: '2.13.0' + app.kubernetes.io/version: '2.14.0' name: stackconfigpolicies.stackconfigpolicy.k8s.elastic.co spec: group: stackconfigpolicy.k8s.elastic.co @@ -9935,11 +10106,13 @@ spec: items: type: string type: array + x-kubernetes-list-type: atomic required: - key - operator type: object type: array + x-kubernetes-list-type: atomic matchLabels: additionalProperties: type: string diff --git a/conf/operator.yaml b/conf/operator.yaml index 0f60141..ec2c0b6 100644 --- 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 index e3be95d..18c2779 100644 --- 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 index 3c258f2..b3708f1 100644 --- 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 index 40ad224..4113aa2 100644 --- 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 index d2e6461..efdf8c2 100644 --- 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 index 9e499ed..f85062b 100644 --- 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 index 9786563..9ccce7b 100644 --- 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 index fcedfd7..bbba0c9 100644 --- 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 index 95745d9..b14feb6 100644 --- 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: