Skip to content

Commit

Permalink
fix: reorganize stack subcharts to fix the enable toggle for subcharts (
Browse files Browse the repository at this point in the history
#13)

Helm seems to choke on condition statements in subcharts that themselves have dependencies.
Managing the first-level subcharts as dependencies via Chart.yaml (rather than including
them directly in the charts/ directory) seems to resolve the issue. In local testing,
this fixes the problem, and when this PR is merged I will confirm it still works as
expected for installing from the remote repository.

This new layout is similar to what we tried previously, except that the subcharts of stack
are in an "internal" directory rather than the top level, to signify that they are not
useable in isolation.
  • Loading branch information
obs-gh-jeremyjackins authored May 3, 2023
1 parent 1fea653 commit 59ab873
Show file tree
Hide file tree
Showing 15 changed files with 32 additions and 9 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions charts/internal/logs/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: fluent-bit
repository: https://fluent.github.io/helm-charts
version: 0.25.0
digest: sha256:b1fb614f3fe47886c997ab9f3fd952ad2558b0007c292553d66f9b7500262d52
generated: "2023-05-03T14:00:45.012194-07:00"
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ dependencies:
- name: fluent-bit
version: 0.25.0
repository: https://fluent.github.io/helm-charts
condition: logs.enabled
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ dependencies:
repository: https://grafana.github.io/helm-charts
version: 0.10.0
digest: sha256:55f0ec4f01251b545575e3c61dbfa9bedca18bae098cc7721e0a99ff2989b8fa
generated: "2023-04-07T16:47:48.09337-07:00"
generated: "2023-05-03T14:00:44.249481-07:00"
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ dependencies:
- name: grafana-agent
version: 0.10.0
repository: https://grafana.github.io/helm-charts
condition: metrics.enabled
File renamed without changes.
12 changes: 12 additions & 0 deletions charts/stack/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
dependencies:
- name: logs
repository: file://../internal/logs
version: 0.1.0
- name: metrics
repository: file://../internal/metrics
version: 0.1.0
- name: events
repository: file://../internal/events
version: 0.1.2
digest: sha256:0ff59089263ba806f216691434b7d0fb1df7212a89c04bcebb802f5370b327bb
generated: "2023-05-03T14:01:19.620154-07:00"
13 changes: 13 additions & 0 deletions charts/stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,16 @@ name: stack
description: Observe Kubernetes agent stack
type: application
version: 0.1.3
dependencies:
- name: logs
version: 0.1.0
repository: file://../internal/logs
condition: logs.enabled
- name: metrics
version: 0.1.0
repository: file://../internal/metrics
condition: metrics.enabled
- name: events
version: 0.1.2
repository: file://../internal/events
condition: events.enabled
6 changes: 0 additions & 6 deletions charts/stack/charts/logs/Chart.lock

This file was deleted.

0 comments on commit 59ab873

Please sign in to comment.