Merge pull request #2516 from randori-jgross/loki-distributed-compact…

…or-grpc [loki-distributed] Add grpc port to compactor service
grafana · Jul 31, 2023 · 3f98206 · 3f98206
2 parents 0a6cc46 + 5d16c07
commit 3f98206
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 3 deletions.
diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml
@@ -3,7 +3,7 @@ name: loki-distributed
 description: Helm chart for Grafana Loki in microservices mode
 type: application
 appVersion: 2.8.3
-version: 0.71.0
+version: 0.71.1
 home: https://grafana.github.io/helm-charts
 sources:
   - https://github.com/grafana/loki

diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md
@@ -1,6 +1,6 @@
 # loki-distributed
 
-![Version: 0.71.0](https://img.shields.io/badge/Version-0.71.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.3](https://img.shields.io/badge/AppVersion-2.8.3-informational?style=flat-square)
+![Version: 0.71.1](https://img.shields.io/badge/Version-0.71.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.8.3](https://img.shields.io/badge/AppVersion-2.8.3-informational?style=flat-square)
 
 Helm chart for Grafana Loki in microservices mode
 
@@ -77,6 +77,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | compactor.affinity | string | Hard node and soft zone anti-affinity | Affinity for compactor pods. Passed through `tpl` and, thus, to be configured as string |
+| compactor.appProtocol | object | `{"grpc":""}` | Set the optional grpc service protocol. Ex: "grpc", "http2" or "https" |
 | compactor.command | string | `nil` | Command to execute instead of defined in Docker image |
 | compactor.enabled | bool | `false` | Specifies whether compactor should be enabled |
 | compactor.extraArgs | list | `[]` | Additional CLI args for the compactor |

diff --git a/charts/loki-distributed/templates/compactor/deployment-compactor.yaml b/charts/loki-distributed/templates/compactor/deployment-compactor.yaml
@@ -60,7 +60,7 @@ spec:
           image: {{ include "loki.compactorImage" . }}
           imagePullPolicy: {{ .Values.loki.image.pullPolicy }}
           {{- if or .Values.loki.command .Values.compactor.command }}
-          command: 
+          command:
             - {{ coalesce .Values.compactor.command .Values.loki.command | quote }}
           {{- end }}
           args:
@@ -74,6 +74,9 @@ spec:
             - name: http
               containerPort: 3100
               protocol: TCP
+            - name: grpc
+              containerPort: 9095
+              protocol: TCP
             - name: http-memberlist
               containerPort: 7946
               protocol: TCP

diff --git a/charts/loki-distributed/templates/compactor/service-compactor.yaml b/charts/loki-distributed/templates/compactor/service-compactor.yaml
@@ -21,6 +21,13 @@ spec:
       port: 3100
       targetPort: http
       protocol: TCP
+    - name: grpc
+      port: 9095
+      targetPort: grpc
+      protocol: TCP
+      {{- if .Values.compactor.appProtocol.grpc }}
+      appProtocol: {{ .Values.compactor.appProtocol.grpc }}
+      {{- end }}
   selector:
     {{- include "loki.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: compactor

diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml
@@ -1320,6 +1320,9 @@ compactor:
   nodeSelector: {}
   # -- Tolerations for compactor pods
   tolerations: []
+  # -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
+  appProtocol:
+    grpc: ""
   persistence:
     # -- Enable creating PVCs for the compactor
     enabled: false