Skip to content

Commit

Permalink
Explicitly embed CRDs for installation ONLY in the OKS (#1214)
Browse files Browse the repository at this point in the history
* Embed crds

* bumpy

* fix syntax

* add a note

* more notes

* update note

---------

Co-authored-by: Jared Tan <[email protected]>
Co-authored-by: Tyler Helmuth <[email protected]>
  • Loading branch information
3 people authored Jun 10, 2024
1 parent 192a4c9 commit 45d0d77
Show file tree
Hide file tree
Showing 9 changed files with 11,344 additions and 6 deletions.
9 changes: 6 additions & 3 deletions charts/opentelemetry-kube-stack/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
dependencies:
- name: crds
repository: ""
version: 0.0.0
- name: opentelemetry-operator
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.55.0
digest: sha256:933606128dca525a98558f3eed7cebfaaa45b0662a3ebc51c196030d949ed958
generated: "2024-04-16T16:35:14.330381-04:00"
version: 0.61.0
digest: sha256:0eedb0c3014ffbab4516d2ef28e1254e699daa4f64980033783e44f2b5ceed3e
generated: "2024-06-05T15:15:04.402697-04:00"
9 changes: 6 additions & 3 deletions charts/opentelemetry-kube-stack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-kube-stack
version: 0.0.5
version: 0.0.6
description: |
OpenTelemetry Quickstart chart for Kubernetes.
Installs an operator and collector for an easy way to get started with Kubernetes observability.
Expand All @@ -13,9 +13,12 @@ maintainers:
- name: dmitryax
- name: TylerHelmuth
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
appVersion: 0.98.0
appVersion: 0.101.0
dependencies:
- name: crds
version: "0.0.0"
condition: crds.install
- name: opentelemetry-operator
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.55.0
version: 0.61.0
condition: opentelemetry-operator.enabled
3 changes: 3 additions & 0 deletions charts/opentelemetry-kube-stack/charts/crds/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
apiVersion: v2
name: crds
version: 0.0.0
18 changes: 18 additions & 0 deletions charts/opentelemetry-kube-stack/charts/crds/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# OpenTelemetry Collector CRDs

This chart contains the CRDs for _*installation*_ only right now for the opentelemetry-operator. This allows the OpenTelemetry Kubernetes Stack chart to work on install. You can see more discussion about this [here](https://github.com/open-telemetry/opentelemetry-helm-charts/issues/677) and [here](https://github.com/open-telemetry/opentelemetry-helm-charts/pull/1203).

This approach is inspired by the kube-prometheus-stack approach which you can see discussion on [here](https://github.com/prometheus-community/helm-charts/issues/3548).

> [!NOTE]
> This chart explicitly _does not_ support the conversion webhook that is currently in the opentelemetry-operator chart. This is because the opentelemetry-kube-stack chart will only work with v1beta1 CRDs. This chart is not meant for use with v1alpha1 Collector CRDs.
# Upgrade Notes

Right now, upgrades are NOT handled by this chart, however that could change in the future. This is what is run to bring in the CRDs today.

```bash
wget https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/main/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
wget https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/main/config/crd/bases/opentelemetry.io_opampbridges.yaml
wget https://raw.githubusercontent.com/open-telemetry/opentelemetry-operator/main/config/crd/bases/opentelemetry.io_instrumentations.yaml\n
```
Loading

0 comments on commit 45d0d77

Please sign in to comment.