WIP: temporarily commit

Author: pollenjp

k8s1/apps/grafana-loki/manifests.jsonnet

@@ -108,7 +108,7 @@ local helm_app = {
       // https://artifacthub.io/packages/helm/grafana/loki
       repoURL: 'https://grafana.github.io/helm-charts',
       chart: 'loki',
-      targetRevision: '6.30.1',
+      targetRevision: '6.39.0',
       helm: {
         releaseName: name,
         valuesObject: {
@@ -119,6 +119,8 @@ local helm_app = {
               // https://github.com/grafana/loki/blob/755e9fc14fd3a1a609e897515d9f04553a6407a5/production/helm/loki/templates/_helpers.tpl#L147-L156^C
               name: service_account_name,
             },
+            // https://github.com/grafana/loki/blob/755e9fc14fd3a1a609e897515d9f04553a6407a5/production/helm/loki/values.yaml#L358-L359
+            // > -- In case of using thanos storage, enable use_thanos_objstore and the configuration should be done inside the object_store section.
             storage: {
               type: 's3',
               bucketNames: {
@@ -128,17 +130,20 @@ local helm_app = {
                 ruler: 'loki-ruler',
                 admin: 'loki-admin',
               },
-              s3: {
-                type: 's3',
-                endpoint: 'http://minio.' + minio_tenant.namespace + '.svc.cluster.local:80',
-                insecure: true,
-                http_config: {
-                  insecure_skip_verify: true,
+              use_thanos_objstore: true,
+              object_store: {
+                s3: {
+                  type: 's3',
+                  endpoint: 'http://minio.' + minio_tenant.namespace + '.svc.cluster.local:80',
+                  insecure: true,
+                  http_config: {
+                    insecure_skip_verify: true,
+                  },
+                  // https://github.com/minio/operator/blob/e054c34ee36535b1323337816450dd7b3fcac482/pkg/controller/sts.go#L269-L271
+                  sts_endpoint: 'https://sts.' + minio_operator.namespace + '.svc.cluster.local:4223/sts/' + minio_tenant.namespace,
+                  // https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#path-style-access
+                  bucket_lookup_type: 'path',
                 },
-                // https://github.com/minio/operator/blob/e054c34ee36535b1323337816450dd7b3fcac482/pkg/controller/sts.go#L269-L271
-                sts_endpoint: 'https://sts.' + minio_operator.namespace + '.svc.cluster.local:4223/sts/' + minio_tenant.namespace,
-                // https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#path-style-access
-                bucket_lookup_type: 'path',
               },
             },
             schemaConfig: {
@@ -208,7 +213,10 @@ local helm_app = {
                 // https://github.com/grafana/loki/blob/755e9fc14fd3a1a609e897515d9f04553a6407a5/vendor/github.com/aws/aws-sdk-go-v2/config/resolve_credentials.go#L480-L482
                 name: 'AWS_ROLE_ARN',
                 // https://github.com/minio/minio/blob/f0b91e5504663c4672da451877857b57c3345295/internal/arn/arn.go#L27-L40
-                value: 'arn:minio:iam::dummy:role/test', // dummy role arn
+                // arn:partition:service:region:account-id:resource-type/resource-id
+                // - empty region
+                // - empty account-id
+                value: 'arn:minio:iam:::role/loki-sa', // MinIO STS role ARN
               },
             ],
             extraVolumes: [