Skip to content

Commit

Permalink
Remove Helm chart
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinpollet committed Sep 18, 2020
1 parent 89d176d commit eebee26
Show file tree
Hide file tree
Showing 48 changed files with 14 additions and 3,550 deletions.
3 changes: 0 additions & 3 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,3 @@ blocks:
- name: KubeDNS Suite
commands:
- "make test-integration-nobuild TESTFLAGS=\"-check.f KubeDNSSuite\""
- name: Helm Suite
commands:
- "make test-integration-nobuild TESTFLAGS=\"-check.f HelmSuite\""
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ before_deploy:
structor -o traefik -r mesh --dockerfile-url="https://raw.githubusercontent.com/traefik/mesh/master/docs/docs.Dockerfile" --menu.js-url="https://raw.githubusercontent.com/traefik/structor/master/traefik-menu.js.gotmpl" --rqts-url="https://raw.githubusercontent.com/traefik/structor/master/requirements-override.txt" --force-edit-url --exp-branch=master --debug;
mixtus --dst-doc-path="./mesh" --dst-owner=traefik --dst-repo-name=doc --git-user-email="30906710+traefiker@users.noreply.github.com" --git-user-name=traefiker --src-doc-path="./site" --src-owner=traefik --src-repo-name=mesh;
fi
# Copy helm packages
- cp -r pages/charts/. site/charts
# Copy CNAME file
- cp pages/CNAME site/CNAME
# Copy Semaphore yml file
Expand All @@ -79,12 +77,6 @@ deploy:
on:
tags: true
condition: $STABLE = true
- provider: script
skip_cleanup: true
script: make helm-package
on:
tags: true
condition: $STABLE = true
- provider: pages
strategy: git
edge: false
Expand Down
36 changes: 7 additions & 29 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ clean:
rm -rf $(CURDIR)/dist/ cover.out $(CURDIR)/pages $(CURDIR)/gh-pages.zip $(CURDIR)/mesh-gh-pages

# Static linting of source files. See .golangci.toml for options
local-check: $(DIST_DIR) helm-lint
local-check: $(DIST_DIR)
golangci-lint run --config .golangci.toml

# Local commands
Expand All @@ -40,13 +40,13 @@ local-test: clean
go test -v -cover ./...

ifeq ($(UNAME), Linux)
test-integration: $(DIST_DIR) kubectl helm build k3d
test-integration: $(DIST_DIR) kubectl build k3d
else
test-integration: $(DIST_DIR) kubectl helm build local-build k3d
test-integration: $(DIST_DIR) kubectl build local-build k3d
endif
CGO_ENABLED=0 go test ./integration -integration $(INTEGRATION_TEST_OPTS) $(TESTFLAGS)

test-integration-nobuild: $(DIST_DIR) kubectl helm k3d
test-integration-nobuild: $(DIST_DIR) kubectl k3d
CGO_ENABLED=0 go test ./integration -integration $(INTEGRATION_TEST_OPTS) $(TESTFLAGS)

kubectl:
Expand All @@ -61,7 +61,7 @@ build: $(DIST_DIR)
test: $(DIST_DIR)
docker build --tag "$(DOCKER_IMAGE_NAME):test" --target maker --build-arg="MAKE_TARGET=local-test" $(CURDIR)/

check: $(DIST_DIR) helm-lint
check: $(DIST_DIR)
docker build --tag "$(DOCKER_IMAGE_NAME):check" --target base-image $(CURDIR)/
docker run --rm \
-v $(CURDIR):/go/src/$(PROJECT) \
Expand Down Expand Up @@ -101,36 +101,14 @@ upgrade:
tidy:
go mod tidy

helm:
@command -v helm >/dev/null 2>&1 || curl -L https://git.io/get_helm.sh | bash -s -- -v v3.0.1

helm-lint: helm
helm lint helm/chart/mesh

k3d:
@command -v k3d >/dev/null 2>&1 || curl -s https://raw.githubusercontent.com/rancher/k3d/v3.0.1/install.sh | TAG=v3.0.1 bash

pages:
docs-package:
mkdir -p $(CURDIR)/pages
rm -rf $(CURDIR)/gh-pages.zip $(CURDIR)/mesh-gh-pages
curl -sSLO https://$(PROJECT)/archive/gh-pages.zip
unzip $(CURDIR)/gh-pages.zip
# We only keep the directory "charts" so documentation may remove files
cp -r $(CURDIR)/mesh-gh-pages/charts $(CURDIR)/pages/
rm -rf $(CURDIR)/gh-pages.zip $(CURDIR)/mesh-gh-pages

docs-package: pages
make -C $(CURDIR)/docs
cp -r $(CURDIR)/docs/site/* $(CURDIR)/pages/
cp $(CURDIR)/docs/CNAME $(CURDIR)/pages/CNAME

helm-package: helm-lint pages
helm package --app-version $(TAG_NAME) $(CURDIR)/helm/chart/mesh
cp helm/chart/mesh/README.md index.md
mkdir -p $(CURDIR)/pages/charts
mv *.tgz index.md $(CURDIR)/pages/charts/
helm repo index $(CURDIR)/pages/charts/

.PHONY: local-check local-build local-test check build test publish-images \
vendor kubectl test-integration local-test-integration pages \
helm helm-lint helm-package k3d
vendor kubectl test-integration local-test-integration pages k3d
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ To run this app, you require the following:
## Install (Helm v3 only)

```shell
helm repo add traefik-mesh https://traefik.github.io/mesh/charts
helm repo add traefik-mesh https://helm.traefik.io/mesh
helm repo update
helm install traefik-mesh traefik-mesh/traefik-mesh
```
Expand Down
2 changes: 1 addition & 1 deletion docs/content/contributing/building-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ ok github.com/traefik/mesh/pkg/providers/smi 3.634s
Run the integration tests in the `integration` directory by using the `go test ./integration -integration` command:

```bash
$ go test -v ./integration -integration -check.f HelmSuite
$ go test -v ./integration -integration -check.f CoreDNSSuite
#[...]
OK: 2 passed
--- PASS: Test (161.20s)
Expand Down
4 changes: 2 additions & 2 deletions docs/content/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
To install Traefik Mesh, the installation method is quite simple:

```bash
helm repo add traefik-mesh https://traefik.github.io/mesh/charts
helm repo add traefik-mesh https://helm.traefik.io/mesh
helm repo update
```

Expand Down Expand Up @@ -33,7 +33,7 @@ You will then be able to use the tagged image as your image in your `values.yaml
To deploy the Helm Chart, run:

```shell
helm install traefik-mesh helm/chart/mesh --set controller.image.pullPolicy=IfNotPresent --set controller.image.tag=latest
helm install traefik-mesh traefik-mesh/traefik-mesh --set controller.image.pullPolicy=IfNotPresent --set controller.image.tag=latest
```

## KubeDNS support
Expand Down
2 changes: 1 addition & 1 deletion docs/content/migration/helm-chart.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ You should use the new `defaultMode` option to configure the default traffic mod

Prior to version `v2.1`, when the Metrics chart is deployed, Prometheus and Grafana services are exposed by default through a `NodePort`.
For security reasons, those services are not exposed by default anymore.
To expose them you should use the new `prometheus.service` and `grafana.service` options, more details in the corresponding [values.yaml](https://github.com/traefik/mesh/blob/e59b861ac91261b950663410a6223a02fc7e2290/helm/chart/maesh/charts/metrics/values.yaml).
To expose them you should use the new `prometheus.service` and `grafana.service` options, more details in the corresponding [values.yaml](https://github.com/traefik/mesh-helm-chart/blob/8a7a193a1718129ad6e02ff313b219029d6daffe/mesh/charts/metrics/values.yaml).

## v1.x to v2.0

Expand Down
2 changes: 1 addition & 1 deletion docs/content/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ If you used `kubeadm` to deploy your cluster, a fast way to allow the helm insta
## Installing Traefik Mesh
```bash tab="Command"
helm repo add traefik-mesh https://traefik.github.io/mesh/charts
helm repo add traefik-mesh https://helm.traefik.io/mesh
helm repo update
helm install traefik-mesh traefik-mesh/traefik-mesh
```
Expand Down
24 changes: 0 additions & 24 deletions helm/chart/mesh/.helmignore

This file was deleted.

34 changes: 0 additions & 34 deletions helm/chart/mesh/Chart.yaml

This file was deleted.

105 changes: 0 additions & 105 deletions helm/chart/mesh/Guidelines.md

This file was deleted.

Loading

0 comments on commit eebee26

Please sign in to comment.