New issue

Jump to bottom

[demo] - add ingress #540

Merged

TylerHelmuth merged 24 commits into open-telemetry:main from puckpuck:demo.add-ingress

Dec 14, 2022

+5,622 −61

Contributor

puckpuck commented Dec 6, 2022 •

edited

Loading

Fixes: #525

Adds capability to specify Ingress(es) for each component. This follows the same pattern used for the collector chart.

The following config will create an Ingress using the default ingress controller. As with the collector chart, annotations are also supported.

components:
  frontendProxy:
    ingress:
      enabled: true
      hosts:
        - host: otel-demo.example.com
          paths:
            - path: /
              pathType: Prefix
              port: 8080

puckpuck added 15 commits

November 25, 2022 22:59


          use Jaeger sub chart

9f074e7

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          Merge remote-tracking branch 'upstream/main' into jaeger_subchart

b28991c


          bump collector version

ad7f31a

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          add jaeger dependency

1a404df

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          add jaeger dependency

8ebe011

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          add ingress support

8da4d5e

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          Merge remote-tracking branch 'upstream/main' into jaeger_subchart

bbcd8cc

# Conflicts:
#	charts/opentelemetry-demo/Chart.lock
#	charts/opentelemetry-demo/Chart.yaml
#	charts/opentelemetry-demo/examples/default/rendered/component.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrole.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/clusterrolebinding.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/configmap.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/deployment.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/role.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/rolebinding.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/secret.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/service.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/serviceaccount.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-configmap.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-role.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-rolebinding.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test-serviceaccount.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana/tests/test.yaml
#	charts/opentelemetry-demo/examples/default/rendered/jaeger.yaml
#	charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/configmap.yaml
#	charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/deployment.yaml
#	charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/service.yaml
#	charts/opentelemetry-demo/examples/default/rendered/opentelemetry-collector/serviceaccount.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrole.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/clusterrolebinding.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/cm.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/deploy.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/pvc.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/service.yaml
#	charts/opentelemetry-demo/examples/default/rendered/prometheus/serviceaccount.yaml


          update jaeger version

3d82792

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          update for kube-state-metrics

ff08870

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          Merge remote-tracking branch 'upstream/main' into demo.add-ingress

05cf47a

# Conflicts:
#	charts/opentelemetry-demo/Chart.yaml


          Merge branch 'jaeger_subchart' into demo.add-ingress

52fc44f


          add ingress docs

be73c01

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          Merge remote-tracking branch 'upstream/main' into demo.add-ingress

849c79c


          Merge remote-tracking branch 'upstream/main' into demo.add-ingress

5194fdb

# Conflicts:
#	charts/opentelemetry-demo/Chart.yaml
#	charts/opentelemetry-demo/README.md
#	charts/opentelemetry-demo/examples/default/rendered/component.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml
#	charts/opentelemetry-demo/values.yaml


          check for ingress logic

5c88312

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

puckpuck marked this pull request as ready for review

December 11, 2022 02:45

puckpuck requested a review from a team

December 11, 2022 02:45

Contributor Author

puckpuck commented Dec 11, 2022

Linters are happy, this one is ready for review now

puckpuck added the chart:demo label

puckpuck added 4 commits

December 11, 2022 20:57


          Merge branch 'main' into demo.add-ingress

621061f


          Merge branch 'main' into demo.add-ingress

7302f08


          bump chart minor version

ca795b1

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          bump chart minor version

9f56b6b

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

dmitryax approved these changes

View reviewed changes

Member

dmitryax left a comment

LGTM. @puckpuck please rebase

puckpuck added 2 commits

December 13, 2022 15:57


          Merge remote-tracking branch 'upstream/main' into demo.add-ingress

47789a4

# Conflicts:
#	charts/opentelemetry-demo/Chart.yaml
#	charts/opentelemetry-demo/examples/default/rendered/component.yaml
#	charts/opentelemetry-demo/examples/default/rendered/grafana-dashboards.yaml


          run generate-examples

0c405bd

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

TylerHelmuth reviewed

View reviewed changes

charts/opentelemetry-demo/templates/_helpers.tpl Outdated Show resolved Hide resolved

charts/opentelemetry-demo/templates/_objects.tpl Show resolved Hide resolved

puckpuck added 3 commits

December 13, 2022 17:51


          only use released ingress spec

8e0b4db

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          document ingress parameters

913dd03

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>


          add ingress ci and examples

a6e93d3

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

TylerHelmuth approved these changes

View reviewed changes

TylerHelmuth merged commit c38d5ba into open-telemetry:main

puckpuck deleted the demo.add-ingress branch

December 15, 2022 00:50

JaredTan95 pushed a commit to JaredTan95/opentelemetry-helm-charts that referenced this pull request


          [demo] - add ingress (open-telemetry#540)

fde6af6

* use Jaeger sub chart

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* bump collector version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add jaeger dependency

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add jaeger dependency

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add ingress support

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update jaeger version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update for kube-state-metrics

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add ingress docs

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* check for ingress logic

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* bump chart minor version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* bump chart minor version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* run generate-examples

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* only use released ingress spec

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* document ingress parameters

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add ingress ci and examples

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

moh-osman3 pushed a commit to moh-osman3/opentelemetry-helm-charts that referenced this pull request


          [demo] - add ingress (open-telemetry#540)

59b6b09

* use Jaeger sub chart

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* bump collector version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add jaeger dependency

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add jaeger dependency

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add ingress support

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update jaeger version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update for kube-state-metrics

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add ingress docs

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* check for ingress logic

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* bump chart minor version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* bump chart minor version

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* run generate-examples

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* only use released ingress spec

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* document ingress parameters

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* add ingress ci and examples

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels