From 86411496cafd5d49a442eb436523380b31aca635 Mon Sep 17 00:00:00 2001 From: Steven Sheehy <17552371+steven-sheehy@users.noreply.github.com> Date: Mon, 12 Oct 2020 05:32:25 -0500 Subject: [PATCH] Fix linting errors and use of deprecated repositories (#2742) * Bump Helm chart dependencies to fix linting Signed-off-by: Steven Sheehy * Fix ct config Signed-off-by: Steven Sheehy * Add new repos to Makefile Signed-off-by: Steven Sheehy --- .circleci/config.yml | 5 ++--- Makefile | 2 ++ production/helm/ct.yaml | 6 ++++++ production/helm/loki-stack/Chart.yaml | 2 +- production/helm/loki-stack/requirements.yaml | 14 +++++++------- 5 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 production/helm/ct.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 0792f4d2d728a..f013869ebb86d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 diff --git a/Makefile b/Makefile index 276334bb7f08a..d08d37e2d7705 100644 --- a/Makefile +++ b/Makefile @@ -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; \ diff --git a/production/helm/ct.yaml b/production/helm/ct.yaml new file mode 100644 index 0000000000000..c4f6ed3a50474 --- /dev/null +++ b/production/helm/ct.yaml @@ -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 diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml index d040c731fb85c..188e23e234c06 100644 --- a/production/helm/loki-stack/Chart.yaml +++ b/production/helm/loki-stack/Chart.yaml @@ -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." diff --git a/production/helm/loki-stack/requirements.yaml b/production/helm/loki-stack/requirements.yaml index a580a00b93147..8f9c9ef3d7f41 100644 --- a/production/helm/loki-stack/requirements.yaml +++ b/production/helm/loki-stack/requirements.yaml @@ -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"