Skip to content

Commit

Permalink
feat: split crds into external chart
Browse files Browse the repository at this point in the history
  • Loading branch information
JossWhittle committed Jul 9, 2024
1 parent b41144a commit 90f25be
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 18 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-canary-chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ jobs:
chart: charts/canary
test-command: |
helm template $CHART \
--values charts/canary/values.yaml \
--include-crds \
--name-template canary \
--namespace canary \
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/build-canary-crds-chart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Build Canary CRDS Chart
name: Build Canary CRDs Chart

on:
pull_request:
# Only consider PRs that change files for this asset, including ci scripts
paths:
- '.github/workflows/build-canary-crds-chart.yaml'
- 'charts/canary/**'
- 'charts/canary-crds/**'
# Make sure all workflows that are "required checks" for a given
# branch protection rule have the same paths: and branches-ignore:
# filters. Otherwise, you can end up in a deadlock waiting on a
Expand All @@ -17,7 +17,7 @@ on:
# Only consider pushes that change files for this asset, including ci scripts
paths:
- '.github/workflows/build-canary-crds-chart.yaml'
- 'charts/canary/**'
- 'charts/canary-crds/**'

permissions:
contents: write
Expand All @@ -42,15 +42,14 @@ jobs:
registry: ${{ vars.HARBOR_REGISTRY }}
registry-user: ${{ vars.HARBOR_USER }}
registry-project: ${{ vars.HARBOR_PROJECT }}
registry-repo: canary
registry-repo: canary-crds
release-tag-format: 'canary-crds-chart-${version}'
cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}
chart: charts/canary/charts/crds
chart: charts/canary-crds
test-command: |
helm template $CHART \
--values charts/canary/charts/crds/values.yaml \
--include-crds \
--name-template canary \
--name-template canary-crds \
--namespace canary \
--create-namespace \
--debug
Expand Down
File renamed without changes.
6 changes: 6 additions & 0 deletions charts/canary-crds/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: v2
appVersion: 1.0.0
description: Canary HTTP Monitor CRDs
name: canary-crds
type: application
version: 1.0.0
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions charts/canary/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,3 @@ description: Canary HTTP Monitor
name: canary
type: application
version: 1.0.0
dependencies:
- name: crds
version: "0.0.0"
condition: crds.enabled
3 changes: 0 additions & 3 deletions charts/canary/charts/crds/Chart.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions charts/canary/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
crds:
enabled: true

podMonitor:
enabled: true

Expand Down

0 comments on commit 90f25be

Please sign in to comment.