feat: remove deprecated storage option for loki and GCS (#1556)

Co-authored-by: Matthias Erll <matthias.erll@redkubes.com>
linode · Mar 25, 2024 · d0738e6 · d0738e6
1 parent c8b5c36
commit d0738e6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/values-changes.yaml b/values-changes.yaml
@@ -124,3 +124,8 @@ changes:
       - 'apps.argocd.enabled'
   - version: 20
     networkPoliciesMigration: true
+    additions:
+      - 'apps.loki.storage.gcs.serviceAccount'
+    deletions:
+      - 'apps.loki.storage.gcs.project'
+      - 'apps.loki.storage.gcs.instance'
diff --git a/values-schema.yaml b/values-schema.yaml
@@ -2552,6 +2552,7 @@ properties:
             required:
               - duration
           storage:
+            description: 'Chunk storage'
             properties:
               azure:
                 properties:
@@ -2582,9 +2583,7 @@ properties:
                 properties:
                   bucket:
                     $ref: '#/definitions/wordCharacterPattern'
-                  project:
-                    $ref: '#/definitions/wordCharacterPattern'
-                  instance:
+                  serviceAccount:
                     $ref: '#/definitions/wordCharacterPattern'
               type:
                 type: string

diff --git a/values/loki/loki.gotmpl b/values/loki/loki.gotmpl
@@ -106,11 +106,7 @@ loki:
     schema_config:
       configs:
       - from: {{ $l | get "v11StartDate" "2023-01-01" }}
-        {{- if eq $st.type "gcs" }}
-        store: bigtable
-        {{- else }}
         store: boltdb-shipper
-        {{- end }}
         {{- if eq $st.type "minioLocal" }}
         object_store: s3
         {{- end }}
@@ -128,7 +124,6 @@ loki:
           prefix: index_
           period: 24h
     storage_config:
-      {{- if ne $st.type "gcs" }}
       boltdb_shipper:
         {{- if eq $st.type "minioLocal" }}
         shared_store: s3
@@ -139,16 +134,16 @@ loki:
         {{- if eq $st.type "azure" }}
         shared_store: azure
         {{- end }}
+        {{- if eq $st.type "gcs" }}
+        shared_store: gcs
+        {{- end }}
         {{- if eq $st.type "filesystem" }}
         shared_store: filesystem
         {{- end }}
         active_index_directory: /var/loki/index
         cache_location: /var/loki/cache
         cache_ttl: 168h
-      {{- else }}
-      bigtable:
-        instance: {{ $st.gcs.instance }}
-        project: {{ $st.gcs.project }}
+      {{- if eq $st.type "gcs" }}
       gcs:
         bucket_name: {{ $st.gcs.bucket }}   
       {{- end }}
@@ -182,6 +177,12 @@ loki:
         container_name: {{ $st.azure.containerName }}
       {{- end }}
 
+{{- if and (eq $st.type "gcs") $st.gcs.serviceAccount }}
+serviceAccount:
+  annotations:
+    iam.gke.io/gcp-service-account: {{ $st.gcs.serviceAccount }}
+{{- end }}
+
 ingester:
   resources: {{- $l.resources.ingester | toYaml | nindent 4 }}
   podAnnotations: