Skip to content

Commit

Permalink
chore: Remove old helm charts and associated tooling (vectordotdev#10639
Browse files Browse the repository at this point in the history
)

* chore: Remove old helm charts and associated tooling

Signed-off-by: Spencer Gilbert <[email protected]>

* run integration tests

* Remove helm tasks from CI

Signed-off-by: Spencer Gilbert <[email protected]>
  • Loading branch information
spencergilbert authored Jan 4, 2022
1 parent dc274bd commit 95b9a2f
Show file tree
Hide file tree
Showing 85 changed files with 3 additions and 4,760 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -608,22 +608,6 @@ jobs:
republish: "true"
file: "target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm"

release-helm:
runs-on: ubuntu-18.04
needs:
# This is not strictly required, but ensures that Helm Chart doesn't
# appear before the image it refers to.
- release-docker
steps:
- uses: actions/[email protected]
- name: Install Helm
run: scripts/environment/setup-helm.sh
- name: Release Helm Chart
env:
AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}"
run: make release-helm

nightly-failure:
name: nightly-failure
if: failure() && github.ref == 'refs/heads/master'
Expand All @@ -640,7 +624,6 @@ jobs:
- release-docker
- release-s3
- release-cloudsmith
- release-helm
- deb-verify
- rpm-verify
- osx-verify
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
source: ${{ steps.filter.outputs.source }}
dependencies: ${{ steps.filter.outputs.dependencies }}
internal_events: ${{ steps.filter.outputs.internal_events }}
helm: ${{ steps.filter.outputs.helm }}
cue: ${{ steps.filter.outputs.cue }}
markdown: ${{ steps.filter.outputs.markdown }}
steps:
Expand Down Expand Up @@ -78,8 +77,6 @@ jobs:
- '**/**.md'
internal_events:
- 'src/internal_events/**'
helm:
- 'distribution/helm/**'
docker:
- 'distribution/docker/**'
Expand Down Expand Up @@ -376,18 +373,6 @@ jobs:
run: make check-version
- name: Check scripts
run: make check-scripts
- name: Check helm dependencies
if: needs.changes.outputs.helm == 'true'
run: make check-helm-dependencies
- name: Check helm lint
if: needs.changes.outputs.helm == 'true'
run: make check-helm-lint
- name: Check that Helm template snapshots don't diverge from Helm
if: needs.changes.outputs.helm == 'true'
run: make check-helm-snapshots
- name: Check that generated Kubernetes YAMLs don't diverge from Helm
if: needs.changes.outputs.helm == 'true'
run: make check-kubernetes-yaml
- name: Check events
if: needs.changes.outputs.source == 'true'
run: make check-events
Expand Down
34 changes: 0 additions & 34 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -659,8 +659,6 @@ check-all: ## Check everything
check-all: check-fmt check-clippy check-style check-docs
check-all: check-version check-examples check-component-features
check-all: check-scripts
check-all: check-helm-lint check-helm-dependencies check-helm-snapshots
check-all: check-kubernetes-yaml

.PHONY: check-component-features
check-component-features: ## Check that all component features are setup properly
Expand Down Expand Up @@ -698,22 +696,6 @@ check-examples: ## Check that the config/examples files are valid
check-scripts: ## Check that scipts do not have common mistakes
${MAYBE_ENVIRONMENT_EXEC} ./scripts/check-scripts.sh

.PHONY: check-helm-lint
check-helm-lint: ## Check that Helm charts pass helm lint
${MAYBE_ENVIRONMENT_EXEC} ./scripts/check-helm-lint.sh

.PHONY: check-helm-dependencies
check-helm-dependencies: ## Check that Helm charts have up-to-date dependencies
${MAYBE_ENVIRONMENT_EXEC} ./scripts/helm-dependencies.sh validate

.PHONY: check-helm-snapshots
check-helm-snapshots: ## Check that the Helm template snapshots do not diverge from the Helm charts
${MAYBE_ENVIRONMENT_EXEC} ./scripts/helm-template-snapshot.sh check

.PHONY: check-kubernetes-yaml
check-kubernetes-yaml: ## Check that the generated Kubernetes YAML configs are up to date
${MAYBE_ENVIRONMENT_EXEC} ./scripts/kubernetes-yaml.sh check

check-events: ## Check that events satisfy patterns set in https://github.com/timberio/vector/blob/master/rfcs/2020-03-17-2064-event-driven-observability.md
${MAYBE_ENVIRONMENT_EXEC} ./scripts/check-events

Expand Down Expand Up @@ -850,10 +832,6 @@ release-rollback: ## Rollback pending release changes
release-s3: ## Release artifacts to S3
@scripts/release-s3.sh

.PHONY: release-helm
release-helm: ## Package and release Helm Chart
@scripts/release-helm.sh

.PHONY: sync-install
sync-install: ## Sync the install.sh script for access via sh.vector.dev
@aws s3 cp distribution/install.sh s3://sh.vector.dev --sse --acl public-read
Expand Down Expand Up @@ -912,18 +890,6 @@ version: ## Get the current Vector version
git-hooks: ## Add Vector-local git hooks for commit sign-off
@scripts/install-git-hooks.sh

.PHONY: update-helm-dependencies
update-helm-dependencies: ## Recursively update the dependencies of the Helm charts in the proper order
${MAYBE_ENVIRONMENT_EXEC} ./scripts/helm-dependencies.sh update

.PHONY: update-helm-snapshots
update-helm-snapshots: ## Update the Helm template snapshots from the Helm charts
${MAYBE_ENVIRONMENT_EXEC} ./scripts/helm-template-snapshot.sh update

.PHONY: update-kubernetes-yaml
update-kubernetes-yaml: ## Regenerate the Kubernetes YAML configs
${MAYBE_ENVIRONMENT_EXEC} ./scripts/kubernetes-yaml.sh update

.PHONY: cargo-install-%
cargo-install-%: override TOOL = $(@:cargo-install-%=%)
cargo-install-%:
Expand Down
30 changes: 3 additions & 27 deletions distribution/helm/README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,5 @@
# Vector Helm Chart
# Moved

## Important design aspects
The helm charts originally developed as part of this repository have been moved to [vectordotdev/helm-charts](https://github.com/vectordotdev/helm-charts/).

Our charts use Helm dependency system, however we only use local (`file://...`)
dependencies, and *no external dependencies*.

The mental model we use to manage our charts, and the automation around them
relies on this fact, so if you're introducing external dependencies know that
some of the design decisions have to be revisited.

## Development

As previously noted, our charts use Helm dependency system.

Helm vendors it's dependencies, so, when working on Helm charts, it's important
to keep the local dependencies up to date.

To aid with this task, a script `scripts/helm-dependencies.sh` was created.
Calling it with `update` argument will update the dependencies of all our crates
to each other in the proper order, making sure the changes are propagated to all
the charts.

Typical development iteration cycle looks like this:

1. Edit a file that is part of, for instance, the `vector-shared` chart, save it.
2. `scripts/helm-dependencies.sh update`
3. `helm install vector distribution/helm/vector` (or `helm template ...`, or
whatever you prefer to test your work).
Issues and pull requests should be tracked using the [vectordotdev/helm-charts](https://github.com/vectordotdev/helm-charts/) repository.
27 changes: 0 additions & 27 deletions distribution/helm/scripting-config.sh

This file was deleted.

23 changes: 0 additions & 23 deletions distribution/helm/vector-agent/.helmignore

This file was deleted.

17 changes: 0 additions & 17 deletions distribution/helm/vector-agent/Chart.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions distribution/helm/vector-agent/README.md

This file was deleted.

1 change: 0 additions & 1 deletion distribution/helm/vector-agent/charts/vector-shared

This file was deleted.

7 changes: 0 additions & 7 deletions distribution/helm/vector-agent/templates/NOTES.txt

This file was deleted.

10 changes: 0 additions & 10 deletions distribution/helm/vector-agent/templates/_helpers.tpl

This file was deleted.

65 changes: 0 additions & 65 deletions distribution/helm/vector-agent/templates/configmap.yaml

This file was deleted.

Loading

0 comments on commit 95b9a2f

Please sign in to comment.