Skip to content

Commit 814d184

Browse files
yurishkurohellspawn679rgaduputmehulchahatsagarmain
authored
Upgrade main charts to Jaeger v2 (#660)
* Jaeger v2 with v1 (#613) * Jaeger allInOne allow different storage types (#603) Signed-off-by: Reddysekhar Gaduputi <[email protected]> upgrade jaeger-operator to latest 1.61.0 (#605) Signed-off-by: Blair Bowden <[email protected]> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed using pre-hook Signed-off-by: Mehul <[email protected]> fixed --config flag is not been passed Signed-off-by: mehul <[email protected]> release ns for config-map.yaml Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed template Signed-off-by: mehul <[email protected]> removed sampling Signed-off-by: mehul <[email protected]> removed adaptive sampling from processors Signed-off-by: mehul <[email protected]> Revert "Jaeger v2 test2" Signed-off-by: mehul <[email protected]> attempt to create v2 chart in v1 Signed-off-by: mehul <[email protected]> enabled collector query and agent Signed-off-by: mehul <[email protected]> version bump Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> added --helm-extra-set-args flag Signed-off-by: mehul <[email protected]> fixed healthcheck port-v2 Signed-off-by: mehul <[email protected]> Fix health check path Signed-off-by: Yuri Shkuro <[email protected]> minor changes Signed-off-by: mehul <[email protected]> * minor changes Signed-off-by: mehul <[email protected]> * added image changes Signed-off-by: mehul <[email protected]> * fix lint Signed-off-by: mehul <[email protected]> * removed v1 allInOne and added jaeger-v2 Signed-off-by: mehul <[email protected]> * removed v2 references Signed-off-by: mehul <[email protected]> * added allInOne again Signed-off-by: mehul <[email protected]> * minor fix Signed-off-by: mehul <[email protected]> * fixed how the config is being passed Signed-off-by: mehul <[email protected]> * fixed mirror template change Signed-off-by: mehul <[email protected]> * use --set-file for user config Signed-off-by: mehul <[email protected]> * removed config-test and updated configmap template Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed minor naming Signed-off-by: mehul <[email protected]> * indentation Signed-off-by: Yuri Shkuro <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> * [jaeger-v2] Add support for Elasticsearch (#617) * Jaeger allInOne allow different storage types (#603) Signed-off-by: Reddysekhar Gaduputi <[email protected]> upgrade jaeger-operator to latest 1.61.0 (#605) Signed-off-by: Blair Bowden <[email protected]> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed using pre-hook Signed-off-by: Mehul <[email protected]> fixed --config flag is not been passed Signed-off-by: mehul <[email protected]> release ns for config-map.yaml Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed template Signed-off-by: mehul <[email protected]> removed sampling Signed-off-by: mehul <[email protected]> removed adaptive sampling from processors Signed-off-by: mehul <[email protected]> Revert "Jaeger v2 test2" Signed-off-by: mehul <[email protected]> attempt to create v2 chart in v1 Signed-off-by: mehul <[email protected]> enabled collector query and agent Signed-off-by: mehul <[email protected]> version bump Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> added --helm-extra-set-args flag Signed-off-by: mehul <[email protected]> fixed healthcheck port-v2 Signed-off-by: mehul <[email protected]> Fix health check path Signed-off-by: Yuri Shkuro <[email protected]> minor changes Signed-off-by: mehul <[email protected]> * minor changes Signed-off-by: mehul <[email protected]> * added image changes Signed-off-by: mehul <[email protected]> * fix lint Signed-off-by: mehul <[email protected]> * removed v1 allInOne and added jaeger-v2 Signed-off-by: mehul <[email protected]> * removed v2 references Signed-off-by: mehul <[email protected]> * added allInOne again Signed-off-by: mehul <[email protected]> * minor fix Signed-off-by: mehul <[email protected]> * fixed how the config is being passed Signed-off-by: mehul <[email protected]> * fixed mirror template change Signed-off-by: mehul <[email protected]> * use --set-file for user config Signed-off-by: mehul <[email protected]> * removed config-test and updated configmap template Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed minor naming Signed-off-by: mehul <[email protected]> * indentation Signed-off-by: Yuri Shkuro <[email protected]> * v2-elasticsearch Signed-off-by: mehul <[email protected]> * fix ci Signed-off-by: mehul <[email protected]> * fix ci Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed and added docs Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * added port Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed typo Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * removed test config Signed-off-by: mehul <[email protected]> * updated docs Signed-off-by: mehul <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> * bump python (#649) * Allow Configurable path for livenessProbe and readinessProbe in hotrod (#647) Signed-off-by: chahat sagar <[email protected]> * [jaeger] Add default probes path for hotrod (#651) * add deafult path Signed-off-by: chahat sagar <[email protected]> * fix Signed-off-by: chahat sagar <[email protected]> * add deafult path Signed-off-by: chahat sagar <[email protected]> --------- Signed-off-by: chahat sagar <[email protected]> * add ui-config (#654) * Remove Operator chart Signed-off-by: Yuri Shkuro <[email protected]> * Fix ES test by overriding Bitnami images Elasticsearch subchart (#661) * Fix ES test by overriding Bitnami images for provisioned Elasticsearch Signed-off-by: danish9039 <[email protected]> * . Signed-off-by: danish9039 <[email protected]> --------- Signed-off-by: danish9039 <[email protected]> * Update README to remove Jaeger-v2 note Removed outdated note about Helm Chart for Jaeger-v2. Signed-off-by: Yuri Shkuro <[email protected]> * Update main chart's README to reflect v2 specifics (#663) * Initial plan * Merge README files for Jaeger v2 chart - Updated introduction to reflect Jaeger v2 architecture (unified binary on OTel Collector framework) - Updated default deployment description (allInOne mode with memory storage) - Added new YAML-based configuration section showing OTel Collector format - Added userconfig parameter documentation - Updated storage configuration to use jaeger_storage extension format - Added Storage Configuration Options with primary and archive store settings - Updated Elasticsearch installation examples for v2 architecture - Added notes about legacy components (Cassandra, Ingester, grpc-plugin) - Added Separate Collector and Query Mode section for production deployments - Removed outdated references to jaeger-agent DaemonSet as default - Updated dependency documentation (removed deprecated incubator repo) - Fixed typo: "Offical" -> "Official" Co-authored-by: yurishkuro <[email protected]> * Create merged README.md for Jaeger v2 chart (from v2 branch) Merged content from README.md and README-v2.md in the v2 branch: - Updated introduction to reflect Jaeger v2 architecture (unified binary on OTel Collector framework) - Updated default deployment description (allInOne mode with memory storage) - Added new YAML-based configuration section showing OTel Collector format - Added userconfig parameter documentation - Updated storage configuration to use jaeger_storage extension format - Added Storage Configuration Options with primary and archive store settings - Updated Elasticsearch installation examples for v2 architecture - Added notes about legacy components (Cassandra, Ingester, grpc-plugin) - Added Separate Collector and Query Mode section for production deployments - Removed outdated references to jaeger-agent DaemonSet as default - Updated dependency documentation (removed deprecated incubator repo) - Fixed typo: "Offical" -> "Official" - Fixed typo: "Updating to Kafka to" -> "Updating Kafka to" Note: README-v2.md should be deleted from v2 branch after merging this PR Co-authored-by: yurishkuro <[email protected]> --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: yurishkuro <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: chahat sagar <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Signed-off-by: danish9039 <[email protected]> Co-authored-by: mehul gautam <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: chahat sagar <[email protected]> Co-authored-by: hippie-danish <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: yurishkuro <[email protected]>
1 parent bd7ce6d commit 814d184

35 files changed

+703
-16100
lines changed

‎.github/workflows/lint-test.yaml‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Run chart-testing (lint)
3939
run: ct lint --config ct.yaml
4040

41-
test-with-cassandra:
41+
test-with-all-in-one:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- uses: actions/checkout@v2
@@ -47,43 +47,31 @@ jobs:
4747

4848
- uses: ./.github/actions/prepare-k8s
4949

50-
- name: Run cassandra-chart-testing (install)
51-
run: ct install --config ct.yaml
52-
test-with-allInOne:
53-
runs-on: ubuntu-latest
54-
steps:
55-
- uses: actions/checkout@v2
56-
with:
57-
fetch-depth: 0
58-
59-
- uses: ./.github/actions/prepare-k8s
60-
61-
- name: Run allInOne-chart-testing (install)
50+
- name: Run chart-testing (install)
6251
run: |
63-
ct install --config ct.yaml --helm-extra-set-args "
64-
--set provisionDataStore.cassandra=false
65-
--set storage.type=memory
66-
--set allInOne.enabled=true
67-
--set agent.enabled=false
68-
--set collector.enabled=false
69-
--set query.enabled=false"
52+
ct install --config ct.yaml
7053
test-with-elasticsearch:
71-
runs-on: ubuntu-latest
72-
steps:
54+
runs-on: ubuntu-latest
55+
steps:
7356
- uses: actions/checkout@v2
7457
with:
7558
fetch-depth: 0
7659

7760
- uses: ./.github/actions/prepare-k8s
7861

79-
- name: Run elasticsearch-chart-testing (install)
62+
- name: Run chart-testing (install)
8063
run: |
81-
ct install --config ct.yaml --helm-extra-set-args "
82-
--set provisionDataStore.cassandra=false
83-
--set provisionDataStore.elasticsearch=true
84-
--set storage.type=elasticsearch
85-
--set elasticsearch.master.masterOnly=false
86-
--set elasticsearch.master.replicaCount=1
87-
--set elasticsearch.data.replicaCount=0
88-
--set elasticsearch.coordinating.replicaCount=0
89-
--set elasticsearch.ingest.replicaCount=0"
64+
ct install --config ct.yaml \
65+
--helm-extra-set-args " \
66+
--set provisionDataStore.elasticsearch=true \
67+
--set allInOne.enabled=false \
68+
--set storage.type=elasticsearch \
69+
--set elasticsearch.master.masterOnly=false \
70+
--set elasticsearch.master.replicaCount=1 \
71+
--set elasticsearch.data.replicaCount=0 \
72+
--set elasticsearch.coordinating.replicaCount=0 \
73+
--set elasticsearch.ingest.replicaCount=0
74+
--set agent.enabled=true \
75+
--set collector.enabled=true \
76+
--set query.enabled=true"
77+

‎README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
This functionality is in beta and is subject to change. The code is provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features.
77

8-
# 🛑 If you are looking for Helm Chart for Jaeger-v2
9-
10-
it is located in the [v2 branch](https://github.com/jaegertracing/helm-charts/blob/v2/charts/jaeger/README-v2.md).
11-
12-
138
## Usage
149

1510
[Helm](https://helm.sh) must be installed to use the charts.
@@ -25,7 +20,6 @@ You can then run `helm search repo jaegertracing` to see the charts.
2520

2621
See additional documentation:
2722
* [Jaeger chart](./charts/jaeger)
28-
* [Jaeger Operator chart](./charts/jaeger-operator)
2923

3024
## Contributing
3125

‎charts/jaeger-operator/.helmignore‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎charts/jaeger-operator/COMPATIBILITY.md‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎charts/jaeger-operator/Chart.yaml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎charts/jaeger-operator/README.md‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)