Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linting errors and use of deprecated repositories #2742

Merged
merged 3 commits into from
Oct 12, 2020
Merged

Fix linting errors and use of deprecated repositories #2742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
425c84d
Bump Helm chart dependencies to fix linting
steven-sheehy Oct 8, 2020
b8f4d71
Fix ct config
steven-sheehy Oct 8, 2020
139b394
Add new repos to Makefile
steven-sheehy Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,8 @@ jobs:
- run:
name: Run Chart Tests
command: |
helm repo add elastic https://helm.elastic.co
ct lint --chart-dirs=production/helm --check-version-increment=false --validate-maintainers=false
ct install --build-id=${CIRCLE_BUILD_NUM} --charts production/helm/loki-stack
ct lint --chart-dirs=production/helm --config=production/helm/ct.yaml
ct install --build-id=${CIRCLE_BUILD_NUM} --charts production/helm/loki-stack --config=production/helm/ct.yaml

publish-helm:
<<: *defaults
Expand Down
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,8 @@ helm:
@set -e; \
helm init -c; \
helm repo add elastic https://helm.elastic.co ; \
helm repo add grafana https://grafana.github.io/helm-charts ; \
helm repo add prometheus https://prometheus-community.github.io/helm-charts ; \
for chart in $(CHARTS); do \
helm dependency build $$chart; \
helm lint $$chart; \
Expand Down
6 changes: 6 additions & 0 deletions production/helm/ct.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
chart-repos:
- elastic=https://helm.elastic.co
- grafana=https://grafana.github.io/helm-charts
- prometheus=https://prometheus-community.github.io/helm-charts
check-version-increment: false
validate-maintainers: false
2 changes: 1 addition & 1 deletion production/helm/loki-stack/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: "v1"
name: loki-stack
version: 0.41.1
version: 0.41.2
appVersion: v1.6.0
kubeVersion: "^1.10.0-0"
description: "Loki: like Prometheus, but for logs."
Expand Down
14 changes: 7 additions & 7 deletions production/helm/loki-stack/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ dependencies:
- name: "loki"
condition: loki.enabled
repository: "file://../loki"
version: "^0.30.0"
version: "^0.31.1"
- name: "promtail"
condition: promtail.enabled
repository: "file://../promtail"
version: "^0.23.0"
version: "^0.25.1"
- name: "fluent-bit"
condition: fluent-bit.enabled
repository: "file://../fluent-bit"
version: "^0.1.0"
version: "^0.3.1"
- name: "grafana"
condition: grafana.enabled
version: "~3.8.15"
repository: "https://kubernetes-charts.storage.googleapis.com/"
version: "~5.7.0"
repository: "https://grafana.github.io/helm-charts"
- name: "prometheus"
condition: prometheus.enabled
version: "~9.3.0"
repository: "https://kubernetes-charts.storage.googleapis.com/"
version: "~11.16.0"
repository: "https://prometheus-community.github.io/helm-charts"
- name: "filebeat"
condition: filebeat.enabled
version: "~7.8.0"
Expand Down