Combine dependency updates

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>

.github/workflows/check-for-dependency-updates.yaml

@@ -16,7 +16,7 @@ env:
     UPDATECLI_GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
 jobs:
-    updateLoki:
+    updateVersions:
         name: Update the Loki subchart
         runs-on: "ubuntu-latest"
         steps:
@@ -26,7 +26,7 @@ jobs:
             - name: Install Updatecli
               uses: updatecli/updatecli-action@v2
 
-            - name: Run Updatecli
+            - name: Run Updatecli for Loki
               id: update-loki
               run: |
                 updatecli apply --config ${UPDATECLI_CONFIG_DIR}/loki.yaml
@@ -34,31 +34,7 @@ jobs:
                   echo "changed=true" >> "${GITHUB_OUTPUT}"
                 fi
 
-            - name: Create pull request
-              if: steps.update-loki.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Loki subchart"
-                body: "Updates the Loki subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update loki
-                labels: dependencies
-                branch: chore/update-loki
-                delete-branch: true
-
-    updateGrafanaAlloy:
-        name: Update the Grafana Alloy subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
+            - name: Run Updatecli for Alloy
               id: update-grafana-alloy
               run: |
                 updatecli apply --config ${UPDATECLI_CONFIG_DIR}/alloy.yaml
@@ -66,112 +42,40 @@ jobs:
                   echo "changed=true" >> "${GITHUB_OUTPUT}"
                 fi
 
-            - name: Create pull request
-              if: steps.update-grafana-alloy.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Grafana Alloy subchart"
-                body: "Updates the Grafana Alloy subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Grafana Alloy
-                labels: dependencies
-                branch: chore/update-grafana-alloy
-                delete-branch: true
-
-    updateMimirDistributed:
-        name: Update the Mimir Distributed subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
+            - name: Run Updatecli for Mimir
               id: update-mimir-distributed
               run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/mimir-distributed.yaml
-                if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
+                  updatecli apply --config ${UPDATECLI_CONFIG_DIR}/mimir-distributed.yaml
+                  if ! git diff --exit-code > /dev/null; then
+                    echo "changed=true" >> "${GITHUB_OUTPUT}"
+                  fi
 
-            - name: Create pull request
-              if: steps.update-mimir-distributed.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Mimir Distributed subchart"
-                body: "Updates the Mimir Distributed subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Mimir Distributed
-                labels: dependencies
-                branch: chore/update-mimir-distributed
-                delete-branch: true
-
-    updateTempoDistributed:
-        name: Update the Tempo Distributed subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
+            - name: Run Updatecli for Tempo
               id: update-tempo-distributed
               run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/tempo-distributed.yaml
-                if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
+                    updatecli apply --config ${UPDATECLI_CONFIG_DIR}/tempo-distributed.yaml
+                    if ! git diff --exit-code > /dev/null; then
+                      echo "changed=true" >> "${GITHUB_OUTPUT}"
+                    fi
 
-            - name: Create pull request
-              if: steps.update-tempo-distributed.outputs.changed == 'true'
-              uses: peter-evans/create-pull-request@v5
-              with:
-                title: "[dependency] Update the Tempo Distributed subchart"
-                body: "Updates the tempo Distributed subchart"
-                base: main
-                author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
-                committer: "GitHub <noreply@github.com>"
-                commit-message: Update Tempo Distributed
-                labels: dependencies
-                branch: chore/update-tempo-distributed
-                delete-branch: true
-
-    updateMinio:
-        name: Update the Minio subchart
-        runs-on: "ubuntu-latest"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v2
-
-            - name: Install Updatecli
-              uses: updatecli/updatecli-action@v2
-
-            - name: Run Updatecli
+            - name: Run Updatecli for Minio
               id: update-minio
               run: |
-                updatecli apply --config ${UPDATECLI_CONFIG_DIR}/minio.yaml
-                if ! git diff --exit-code > /dev/null; then
-                  echo "changed=true" >> "${GITHUB_OUTPUT}"
-                fi
+                      updatecli apply --config ${UPDATECLI_CONFIG_DIR}/minio.yaml
+                      if ! git diff --exit-code > /dev/null; then
+                        echo "changed=true" >> "${GITHUB_OUTPUT}"
+                      fi
 
             - name: Create pull request
-              if: steps.update-minio.outputs.changed == 'true'
+              if: steps.update-loki.outputs.changed == 'true' || steps.update-grafana-alloy.outputs.changed == 'true' || steps.update-mimir-distributed.outputs.changed == 'true' || steps.update-tempo-distributed.outputs.changed == 'true' || steps.update-minio.outputs.changed == 'true'
               uses: peter-evans/create-pull-request@v5
               with:
-                title: "[dependency] Update the Minio subchart"
-                body: "Updates the Minio subchart"
+                title: "[dependency] Update the subcharts"
+                body: "Updates the subcharts"
                 base: main
                 author: "${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>"
                 committer: "GitHub <noreply@github.com>"
-                commit-message: Update minio
+                commit-message: Update dependencies
                 labels: dependencies
-                branch: chore/update-minio
+                branch: chore/update-dependencies
                 delete-branch: true

charts/meta-monitoring/templates/ruler/ruler.yaml

@@ -49,9 +49,6 @@ spec:
             - containerPort: 7946
               name: memberlist
               protocol: TCP
-          envFrom:
-          - secretRef:
-             name: minio
           readinessProbe:
             failureThreshold: 3
             httpGet:

charts/meta-monitoring/values.yaml

@@ -180,7 +180,7 @@ metrics:
   # Additional metrics to retain
   extraMetrics: []
 
-# Set enabled = true to add the default logs dashboards to the local Grafana
+# Set enabled = true to add the default logs/metrics/traces dashboards to the local Grafana
 dashboards:
   logs:
     enabled: true
@@ -189,6 +189,11 @@ dashboards:
   traces:
     enabled: true
 
+global:
+  minio:
+    rootUser: "rootuser"
+    rootPassword: "rootpassword"
+
 kubeStateMetrics:
   # Scrape https://github.com/kubernetes/kube-state-metrics by default
   enabled: true
@@ -224,9 +229,9 @@ loki:
       common:
         storage:
           s3:
-            access_key_id: "${rootUser}"
+            access_key_id: "{{ .Values.global.minio.rootUser }}"
             endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-            secret_access_key: "${rootPassword}"
+            secret_access_key: "{{ .Values.global.minio.rootPassword }}"
       compactor:
         retention_enabled: true
         delete_request_store: s3
@@ -249,24 +254,8 @@ loki:
         installOperator: false
     lokiCanary:
       enabled: false
-  write:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
-  read:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
-  backend:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
+  test:
+    enabled: false
 
 alloy:
   alloy:
@@ -303,31 +292,30 @@ alloy:
 mimir-distributed:
   minio:
     enabled: false
-  global:
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
   mimir:
     structuredConfig:
       alertmanager_storage:
         s3:
           bucket_name: mimir-ruler
+          access_key_id: "{{ .Values.global.minio.rootUser }}"
+          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+          secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+          insecure: true
       blocks_storage:
         backend: s3
         s3:
           bucket_name: mimir-tsdb
+          access_key_id: "{{ .Values.global.minio.rootUser }}"
+          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+          secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+          insecure: true
       ruler_storage:
         s3:
           bucket_name: mimir-ruler
-      common:
-        storage:
-          backend: s3
-          s3:
-            bucket_name: mimir-ruler
-            access_key_id: "${rootUser}"
-            endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-            secret_access_key: "${rootPassword}"
-            insecure: true
+          access_key_id: "{{ .Values.global.minio.rootUser }}"
+          endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
+          secret_access_key: "{{ .Values.global.minio.rootPassword }}"
+          insecure: true
       limits:
         compactor_blocks_retention_period: 30d
 
@@ -340,39 +328,12 @@ tempo-distributed:
           s3:
             bucket: tempo
             endpoint: "{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc:9000"
-            access_key: "${rootUser}"
-            secret_key: "${rootPassword}"
+            access_key: "{{ .Values.global.minio.rootUser }}"
+            secret_key: "{{ .Values.global.minio.rootPassword }}"
             insecure: true
-  distributor:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
-  ingester:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
-  compactor:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
-  querier:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
-  queryFrontend:
-    extraArgs:
-    - "-config.expand-env=true"
-    extraEnvFrom:
-    - secretRef:
-        name: "minio"
+      compactor:
+        compaction:
+          block_retention: 30d
   traces:
     otlp:
       http:
@@ -381,7 +342,8 @@ tempo-distributed:
         enabled: true
 
 minio:
-  existingSecret: "minio"
+  rootUser: rootuser
+  rootPassword: rootpassword
   buckets:
     - name: loki-chunks
       policy: none

docs/installation.md

@@ -25,17 +25,17 @@
    ```
    kubectl create secret generic logs -n meta \
     --from-literal=username=<logs username> \
-    --from-literal=password=<token> \
+    --from-literal=password=<token>
     --from-literal=endpoint='https://logs-prod-us-central1.grafana.net/loki/api/v1/push'
 
    kubectl create secret generic metrics -n meta \
     --from-literal=username=<metrics username> \
-    --from-literal=password=<token> \
+    --from-literal=password=<token>
     --from-literal=endpoint='https://prometheus-us-central1.grafana.net/api/prom/push'
 
    kubectl create secret generic traces -n meta \
     --from-literal=username=<OTLP instance ID> \
-    --from-literal=password=<token> \
+    --from-literal=password=<token>
     --from-literal=endpoint='https://otlp-gateway-prod-us-east-0.grafana.net/otlp'
    ```
 
@@ -67,14 +67,6 @@
    kubectl create namespace meta
    ```
 
-1. Create a secret named `minio` with the user and password for the local Minio:
-
-   ```
-   kubectl create secret generic minio -n meta \
-    --from-literal=rootPassword=<password> \
-    --from-literal=rootUser=<user>
-   ```
-
 1. Create a values.yaml file based on the [default one](../charts/meta-monitoring/values.yaml). An example minimal values.yaml looks like this:
 
    ```