From 4aa1b645782f1642042fbd4d3beff2cf2388c4fb Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Wed, 13 Mar 2024 18:06:43 -0400 Subject: [PATCH 1/4] Create scaffolding for otel-cloud-stack chart --- .github/workflows/otel-cloud-stack-test.yaml | 31 +++++++++++++++++++ .gitignore | 1 + Makefile | 2 +- charts/otel-cloud-stack/.helmignore | 23 ++++++++++++++ charts/otel-cloud-stack/Chart.yaml | 16 ++++++++++ .../otel-cloud-stack/templates/_helpers.tpl | 0 .../otel-cloud-stack/templates/collector.yaml | 0 charts/otel-cloud-stack/values.schema.json | 10 ++++++ charts/otel-cloud-stack/values.yaml | 0 9 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/otel-cloud-stack-test.yaml create mode 100644 charts/otel-cloud-stack/.helmignore create mode 100644 charts/otel-cloud-stack/Chart.yaml create mode 100644 charts/otel-cloud-stack/templates/_helpers.tpl create mode 100644 charts/otel-cloud-stack/templates/collector.yaml create mode 100644 charts/otel-cloud-stack/values.schema.json create mode 100644 charts/otel-cloud-stack/values.yaml diff --git a/.github/workflows/otel-cloud-stack-test.yaml b/.github/workflows/otel-cloud-stack-test.yaml new file mode 100644 index 000000000..f13ce0c99 --- /dev/null +++ b/.github/workflows/otel-cloud-stack-test.yaml @@ -0,0 +1,31 @@ +name: Test Otel Cloud Stack Charts + +on: + pull_request: + paths: + - "charts/otel-cloud-stack/**" + branches: + - main + +jobs: + operator-test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup + uses: ./.github/actions/setup + with: + create-kind-cluster: "true" + + # We'll need this eventually, but for now leave it commented. + # - name: Install cert-manager + # run: | + # kubectl apply -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml + # kubectl wait --timeout=5m --for=condition=available deployment cert-manager -n cert-manager + # kubectl wait --timeout=5m --for=condition=available deployment cert-manager-webhook -n cert-manager + + - name: Run chart-testing (install) + run: ct install --charts charts/otel-cloud-stack diff --git a/.gitignore b/.gitignore index 7477bd557..b8b7f86f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .vscode .idea +.DS_Store ### Helm ### **/charts/*.tgz diff --git a/Makefile b/Makefile index bc0f1eb18..de9f6ad5c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TMP_DIRECTORY = ./tmp -CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf +CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf otel-cloud-stack .PHONY: generate-examples generate-examples: diff --git a/charts/otel-cloud-stack/.helmignore b/charts/otel-cloud-stack/.helmignore new file mode 100644 index 000000000..0e8a0eb36 --- /dev/null +++ b/charts/otel-cloud-stack/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/otel-cloud-stack/Chart.yaml b/charts/otel-cloud-stack/Chart.yaml new file mode 100644 index 000000000..496a8e7d2 --- /dev/null +++ b/charts/otel-cloud-stack/Chart.yaml @@ -0,0 +1,16 @@ +apiVersion: v2 +name: otel-cloud-stack +version: 0.0.1 +description: | + OpenTelemetry Quickstart chart for Kubernetes. + Installs an operator and collector for an easy way to get started with Kubernetes observability. +type: application +home: https://opentelemetry.io/ +sources: + - https://github.com/open-telemetry/opentelemetry-operator +maintainers: + - name: Allex1 + - name: dmitryax + - name: TylerHelmuth +icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png +appVersion: 0.95.0 diff --git a/charts/otel-cloud-stack/templates/_helpers.tpl b/charts/otel-cloud-stack/templates/_helpers.tpl new file mode 100644 index 000000000..e69de29bb diff --git a/charts/otel-cloud-stack/templates/collector.yaml b/charts/otel-cloud-stack/templates/collector.yaml new file mode 100644 index 000000000..e69de29bb diff --git a/charts/otel-cloud-stack/values.schema.json b/charts/otel-cloud-stack/values.schema.json new file mode 100644 index 000000000..f90b1e7a5 --- /dev/null +++ b/charts/otel-cloud-stack/values.schema.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://json-schema.org/draft/2019-09/schema", + "$id": "http://example.com/example.json", + "type": "object", + "default": {}, + "title": "Root Schema", + "required": [], + "properties": {}, + "examples": [] +} diff --git a/charts/otel-cloud-stack/values.yaml b/charts/otel-cloud-stack/values.yaml new file mode 100644 index 000000000..e69de29bb From e46902003e0dca860b0d776fadfccb0d06e9741a Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Wed, 13 Mar 2024 18:11:06 -0400 Subject: [PATCH 2/4] rename --- .github/workflows/otel-cloud-stack-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otel-cloud-stack-test.yaml b/.github/workflows/otel-cloud-stack-test.yaml index f13ce0c99..305f4a122 100644 --- a/.github/workflows/otel-cloud-stack-test.yaml +++ b/.github/workflows/otel-cloud-stack-test.yaml @@ -8,7 +8,7 @@ on: - main jobs: - operator-test: + otel-cloud-stack-test: runs-on: ubuntu-latest steps: - name: Checkout From e524b1df58400454ab497bff6c1fa6ad9b0ba4e4 Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Thu, 21 Mar 2024 09:54:28 -0400 Subject: [PATCH 3/4] Name change --- .../{otel-cloud-stack-test.yaml => kube-stack-test.yaml} | 6 +++--- Makefile | 2 +- .../.helmignore | 0 .../Chart.yaml | 2 +- .../templates/_helpers.tpl | 0 .../templates/collector.yaml | 0 .../values.schema.json | 0 .../values.yaml | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{otel-cloud-stack-test.yaml => kube-stack-test.yaml} (85%) rename charts/{otel-cloud-stack => opentelemetry-kube-stack}/.helmignore (100%) rename charts/{otel-cloud-stack => opentelemetry-kube-stack}/Chart.yaml (94%) rename charts/{otel-cloud-stack => opentelemetry-kube-stack}/templates/_helpers.tpl (100%) rename charts/{otel-cloud-stack => opentelemetry-kube-stack}/templates/collector.yaml (100%) rename charts/{otel-cloud-stack => opentelemetry-kube-stack}/values.schema.json (100%) rename charts/{otel-cloud-stack => opentelemetry-kube-stack}/values.yaml (100%) diff --git a/.github/workflows/otel-cloud-stack-test.yaml b/.github/workflows/kube-stack-test.yaml similarity index 85% rename from .github/workflows/otel-cloud-stack-test.yaml rename to .github/workflows/kube-stack-test.yaml index 305f4a122..835219e39 100644 --- a/.github/workflows/otel-cloud-stack-test.yaml +++ b/.github/workflows/kube-stack-test.yaml @@ -3,12 +3,12 @@ name: Test Otel Cloud Stack Charts on: pull_request: paths: - - "charts/otel-cloud-stack/**" + - "charts/opentelemetry-kube-stack/**" branches: - main jobs: - otel-cloud-stack-test: + opentelemetry-kube-stack-test: runs-on: ubuntu-latest steps: - name: Checkout @@ -28,4 +28,4 @@ jobs: # kubectl wait --timeout=5m --for=condition=available deployment cert-manager-webhook -n cert-manager - name: Run chart-testing (install) - run: ct install --charts charts/otel-cloud-stack + run: ct install --charts charts/opentelemetry-kube-stack diff --git a/Makefile b/Makefile index de9f6ad5c..1cb9e5a8a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TMP_DIRECTORY = ./tmp -CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf otel-cloud-stack +CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf opentelemetry-kube-stack .PHONY: generate-examples generate-examples: diff --git a/charts/otel-cloud-stack/.helmignore b/charts/opentelemetry-kube-stack/.helmignore similarity index 100% rename from charts/otel-cloud-stack/.helmignore rename to charts/opentelemetry-kube-stack/.helmignore diff --git a/charts/otel-cloud-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml similarity index 94% rename from charts/otel-cloud-stack/Chart.yaml rename to charts/opentelemetry-kube-stack/Chart.yaml index 496a8e7d2..c883dfce2 100644 --- a/charts/otel-cloud-stack/Chart.yaml +++ b/charts/opentelemetry-kube-stack/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: otel-cloud-stack +name: opentelemetry-kube-stack version: 0.0.1 description: | OpenTelemetry Quickstart chart for Kubernetes. diff --git a/charts/otel-cloud-stack/templates/_helpers.tpl b/charts/opentelemetry-kube-stack/templates/_helpers.tpl similarity index 100% rename from charts/otel-cloud-stack/templates/_helpers.tpl rename to charts/opentelemetry-kube-stack/templates/_helpers.tpl diff --git a/charts/otel-cloud-stack/templates/collector.yaml b/charts/opentelemetry-kube-stack/templates/collector.yaml similarity index 100% rename from charts/otel-cloud-stack/templates/collector.yaml rename to charts/opentelemetry-kube-stack/templates/collector.yaml diff --git a/charts/otel-cloud-stack/values.schema.json b/charts/opentelemetry-kube-stack/values.schema.json similarity index 100% rename from charts/otel-cloud-stack/values.schema.json rename to charts/opentelemetry-kube-stack/values.schema.json diff --git a/charts/otel-cloud-stack/values.yaml b/charts/opentelemetry-kube-stack/values.yaml similarity index 100% rename from charts/otel-cloud-stack/values.yaml rename to charts/opentelemetry-kube-stack/values.yaml From 75780f88ab7c8875526fcf320ab22a38bbf14980 Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Thu, 21 Mar 2024 10:07:20 -0400 Subject: [PATCH 4/4] rename --- .github/workflows/kube-stack-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kube-stack-test.yaml b/.github/workflows/kube-stack-test.yaml index 835219e39..4428b0f5e 100644 --- a/.github/workflows/kube-stack-test.yaml +++ b/.github/workflows/kube-stack-test.yaml @@ -1,4 +1,4 @@ -name: Test Otel Cloud Stack Charts +name: Test Opentelemetry Kube Stack Charts on: pull_request: