Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helm: Fix chart mTLS implementation #12025

Merged
merged 17 commits into from
Feb 22, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix http port name.
- Components were expecting the port name to be `http` instead of `http-metrics`.
DylanGuedes committed Jan 31, 2024
commit 470709b1d225c3721b5203990e24e545c2431184
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ metadata:
spec:
type: ClusterIP
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
Original file line number Diff line number Diff line change
@@ -87,7 +87,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ metadata:
spec:
type: ClusterIP
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
protocol: TCP
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ spec:
image: {{ include "loki.gatewayImage" . }}
imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
ports:
- name: http
- name: http-metrics
containerPort: 8080
protocol: TCP
{{- with .Values.gateway.extraEnv }}
4 changes: 2 additions & 2 deletions production/helm/loki/templates/gateway/service-gateway.yaml
Original file line number Diff line number Diff line change
@@ -28,9 +28,9 @@ spec:
loadBalancerIP: {{ .Values.gateway.service.loadBalancerIP }}
{{- end }}
ports:
- name: http
- name: http-metrics
port: {{ .Values.gateway.service.port }}
targetPort: http
targetPort: http-metrics
{{- if and (eq "NodePort" .Values.gateway.service.type) .Values.gateway.service.nodePort }}
nodePort: {{ .Values.gateway.service.nodePort }}
{{- end }}
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ spec:
type: ClusterIP
clusterIP: None
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@ metadata:
spec:
type: ClusterIP
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@ spec:
type: ClusterIP
clusterIP: None
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
4 changes: 2 additions & 2 deletions production/helm/loki/templates/ingester/service-ingester.yaml
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@ metadata:
spec:
type: ClusterIP
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -12,9 +12,9 @@ spec:
type: ClusterIP
clusterIP: None
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
4 changes: 2 additions & 2 deletions production/helm/loki/templates/querier/service-querier.yaml
Original file line number Diff line number Diff line change
@@ -17,9 +17,9 @@ metadata:
spec:
type: ClusterIP
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
@@ -92,8 +92,6 @@ spec:
{{- toYaml .Values.loki.containerSecurityContext | nindent 12 }}
readinessProbe:
{{- toYaml .Values.loki.readinessProbe | nindent 12 }}
livenessProbe:
{{- toYaml .Values.loki.livenessProbe | nindent 12 }}
volumeMounts:
- name: config
mountPath: /etc/loki/config
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ spec:
type: ClusterIP
publishNotReadyAddresses: true
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
protocol: TCP
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ spec:
type: ClusterIP
publishNotReadyAddresses: true
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
targetPort: http-metrics
protocol: TCP
- name: grpc
port: 9095
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ spec:
clusterIP: None
publishNotReadyAddresses: true
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
protocol: TCP
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ruler/deployment-ruler.yaml
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc
2 changes: 1 addition & 1 deletion production/helm/loki/templates/ruler/service-ruler.yaml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ spec:
type: ClusterIP
clusterIP: None
ports:
- name: http
- name: http-metrics
port: 3100
targetPort: http
protocol: TCP
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ spec:
{{- toYaml . | nindent 12 }}
{{- end }}
ports:
- name: http
- name: http-metrics
containerPort: 3100
protocol: TCP
- name: grpc