From 1c3f5d09856627fd3dedbeb1904e3331f8845811 Mon Sep 17 00:00:00 2001
From: Karsten Jeschkies <k@jeschkies.xyz>
Date: Wed, 31 Aug 2022 00:26:18 +0200
Subject: [PATCH] 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`
---
 production/helm/loki/Chart.yaml             | 4 ++--
 production/helm/loki/templates/NOTES.txt    | 3 +++
 production/helm/loki/templates/_helpers.tpl | 4 ++--
 production/helm/loki/values.yaml            | 2 +-
 tools/dev/k3d/Makefile                      | 4 ++--
 tools/dev/k3d/README.md                     | 1 +
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml
index b89229ef29..f0f587ca2e 100644
--- a/production/helm/loki/Chart.yaml
+++ b/production/helm/loki/Chart.yaml
@@ -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
diff --git a/production/helm/loki/templates/NOTES.txt b/production/helm/loki/templates/NOTES.txt
index bdb4dbba94..21d2342774 100644
--- a/production/helm/loki/templates/NOTES.txt
+++ b/production/helm/loki/templates/NOTES.txt
@@ -11,6 +11,9 @@ Installed components:
 {{- if .Values.gateway.enabled }}
 * gateway
 {{- end }}
+{{- if .Values.minio.enabled }}
+* minio 
+{{- end }}
 * read
 * write
 {{- end }}
diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl
index dca043c1d3..9235390aad 100644
--- a/production/helm/loki/templates/_helpers.tpl
+++ b/production/helm/loki/templates/_helpers.tpl
@@ -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" -}}
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 28ae7989db..b5b66c1751 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -1059,7 +1059,7 @@ tracing:
 # Configuration for `minio` child chart
 # -------------------------------------
 minio:
-  enabled: false
+  enabled: false 
   accessKey: enterprise-logs
   secretKey: supersecret
   buckets:
diff --git a/tools/dev/k3d/Makefile b/tools/dev/k3d/Makefile
index 6f575bf398..aa27e9694a 100644
--- a/tools/dev/k3d/Makefile
+++ b/tools/dev/k3d/Makefile
@@ -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
diff --git a/tools/dev/k3d/README.md b/tools/dev/k3d/README.md
index 04ddcbbf13..1df4caca4c 100644
--- a/tools/dev/k3d/README.md
+++ b/tools/dev/k3d/README.md
@@ -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:
 ```