Helm: Upgrade Minio chart dependency to 4.0.12. (#6974)

**What this PR does / why we need it**:
Changes to a supported Minio chart. Minio is also enabled by default.

**Which issue(s) this PR fixes**:
Fixes #6973

**Checklist**
- [x] Documentation added
- [ ] Tests updated
- [ ] Is this an important fix or new feature? Add an entry in the `CHANGELOG.md`.
- [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md`
pull/7005/head
Karsten Jeschkies 3 years ago committed by GitHub
parent 562ccd6932
commit 1c3f5d0985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      production/helm/loki/Chart.yaml
  2. 3
      production/helm/loki/templates/NOTES.txt
  3. 4
      production/helm/loki/templates/_helpers.tpl
  4. 2
      production/helm/loki/values.yaml
  5. 4
      tools/dev/k3d/Makefile
  6. 1
      tools/dev/k3d/README.md

@ -13,8 +13,8 @@ icon: https://grafana.com/docs/loki/latest/logo_and_name.png
dependencies:
- name: minio
alias: minio
version: 8.0.9
repository: https://helm.min.io/
version: 4.0.12
repository: https://charts.min.io/
condition: minio.enabled
- name: grafana-agent-operator
alias: grafana-agent-operator

@ -11,6 +11,9 @@ Installed components:
{{- if .Values.gateway.enabled }}
* gateway
{{- end }}
{{- if .Values.minio.enabled }}
* minio
{{- end }}
* read
* write
{{- end }}

@ -146,8 +146,8 @@ Generated storage config for loki common config
s3:
endpoint: {{ include "loki.minio" $ }}
bucketnames: {{ $.Values.loki.storage.bucketNames.chunks }}
secret_access_key: supersecret
access_key_id: enterprise-logs
secret_access_key: {{ $.Values.minio.secretKey }}
access_key_id: {{ $.Values.minio.accessKey }}
s3forcepathstyle: true
insecure: true
{{- else if eq .Values.loki.storage.type "s3" -}}

@ -1059,7 +1059,7 @@ tracing:
# Configuration for `minio` child chart
# -------------------------------------
minio:
enabled: false
enabled: false
accessKey: enterprise-logs
secretKey: supersecret
buckets:

@ -44,5 +44,5 @@ prepare: create-registry create-cluster update-repos build-latest-image
build-latest-image:
make -C $(CURDIR)/../../.. loki-image
docker tag grafana/loki:$(IMAGE_TAG) k3d-grafana:$(REGISTRY_PORT)/loki:latest
docker push k3d-grafana:$(REGISTRY_PORT)/loki:latest
docker tag grafana/loki:$(IMAGE_TAG) grafana.k3d.localhost:$(REGISTRY_PORT)/loki:latest
docker push grafana.k3d.localhost:$(REGISTRY_PORT)/loki:latest

@ -8,6 +8,7 @@ In order to use the make targets in this directory, make sure you have the follo
* [tanka](https://github.com/grafana/tanka)
* [jsonnet](https://jsonnet.org/)
* [jq](https://stedolan.github.io/jq/)
* [helm](https://helm.sh/docs/intro/install/) >= 3.9
**Note**: in case docker is unable to resolve the local k3d registry hostname, add the following entry to the `/etc/hosts` file:
```

Loading…
Cancel
Save