Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[jaeger] Elasticsearch chart migration #554

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
fetch-depth: 0

- name: Set up Helm
uses: azure/setup-helm@v1
uses: azure/setup-helm@v4
with:
version: v3.4.1
version: v3.14.4

# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# yamllint (https://github.com/adrienverge/yamllint) which require Python
Expand All @@ -24,9 +24,9 @@ jobs:
python-version: 3.7

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.0.1
uses: helm/chart-testing-action@v2.6.1
with:
version: v3.3.0
version: v3.10.1

- name: Run chart-testing (list-changed)
id: list-changed
Expand All @@ -40,13 +40,13 @@ jobs:
run: ct lint --config ct.yaml

- name: Create kind cluster
uses: helm/kind-action@v1.2.0
uses: helm/kind-action@v1.9.0
if: steps.list-changed.outputs.changed == 'true'

- name: Install kubectl
uses: azure/setup-kubectl@v2.0
uses: azure/setup-kubectl@v4.0.0
with:
version: 'v1.22.0'
version: 'v1.28.8'
id: install

- name: Set up cert-manager
Expand Down
10 changes: 5 additions & 5 deletions charts/jaeger/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ dependencies:
repository: https://charts.helm.sh/incubator
version: 0.15.3
- name: elasticsearch
repository: https://helm.elastic.co
version: 7.17.3
repository: https://charts.bitnami.com/bitnami
version: 20.0.4
- name: kafka
repository: https://charts.bitnami.com/bitnami
version: 26.6.2
dpericaxon marked this conversation as resolved.
Show resolved Hide resolved
- name: common
repository: https://charts.bitnami.com/bitnami
version: 2.14.1
digest: sha256:3c95910df1461e41daaa77958b63b7739c5291468ffbffd702dcc7550b5cf117
generated: "2024-01-09T14:23:43.089557-05:00"
version: 2.19.1
digest: sha256:16dad4387f2b392d5034731f997518ff05b77909220ce45ee6dd69664942f2df
generated: "2024-04-11T08:42:48.824851-04:00"
8 changes: 4 additions & 4 deletions charts/jaeger/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 1.53.0
description: A Jaeger Helm chart for Kubernetes
name: jaeger
type: application
version: 2.1.0
version: 3.0.0
# CronJobs require v1.21
kubeVersion: ">= 1.21-0"
keywords:
Expand Down Expand Up @@ -32,11 +32,11 @@ dependencies:
repository: https://charts.helm.sh/incubator
condition: provisionDataStore.cassandra
- name: elasticsearch
version: ^7.11.1
repository: https://helm.elastic.co
version: 20.0.4
repository: https://charts.bitnami.com/bitnami
condition: provisionDataStore.elasticsearch
- name: kafka
version: ^26.6.2
version: 26.6.2
repository: https://charts.bitnami.com/bitnami
condition: provisionDataStore.kafka
- name: common
Expand Down
39 changes: 38 additions & 1 deletion charts/jaeger/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,46 @@ schema:
# value: "0"

# For configurable values of the elasticsearch if provisioned, please see:
# https://github.com/elastic/helm-charts/tree/master/elasticsearch#configuration
# https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch
elasticsearch: {}

# Example that uses no auth:
# elasticsearch:
# fullnameOverride: "elasticsearch"
# image:
# registry: ""
# repository: docker.io/bitnami/elasticsearch
# tag: ""
# master:
# masterOnly: false
# replicaCount: 3
# extraEnvVars:
# - name: ES_JAVA_OPTS
# value: "-Xmx20g -Xms20g"
# persistence:
# enabled: true
# storageClass: managed-premium
# accessModes: [ "ReadWriteOnce" ]
# size: 100gb
# extraConfig:
# cluster.max_shards_per_node: 3000
# sysctlImage:
# registry: ""
# repository: docker.io/bitnami/os-shell
# tag: 12-debian-12-r18
# volumePermissions:
# enabled: true
# image:
# registry: ""
# repository: docker.io/bitnami/os-shell
# tag: 12-debian-12-r18
# data:
# replicaCount: 0
# coordinating:
# replicaCount: 0
# ingest:
# replicaCount: 0

ingester:
enabled: false
podSecurityContext: {}
Expand Down
Loading