public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix deployment & service values in actionsMetrics (#2683)

This commit is contained in:
marcin-motyl 2023-07-25 02:56:20 +02:00 committed by GitHub
parent d90ce2bed5
commit fddc5bf1c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml
View File

@ -36,8 +36,8 @@ spec:
{{- end }} {{- end }}
containers: containers:
- args: - args:
{{- $metricsHost := .Values.metrics.proxy.enabled | ternary "127.0.0.1" "0.0.0.0" }} {{- $metricsHost := .Values.actionsMetrics.proxy.enabled | ternary "127.0.0.1" "0.0.0.0" }}
{{- $metricsPort := .Values.metrics.proxy.enabled | ternary "8080" .Values.metrics.port }} {{- $metricsPort := .Values.actionsMetrics.proxy.enabled | ternary "8080" .Values.actionsMetrics.port }}
- "--metrics-addr={{ $metricsHost }}:{{ $metricsPort }}" - "--metrics-addr={{ $metricsHost }}:{{ $metricsPort }}"
{{- if .Values.actionsMetricsServer.logLevel }} {{- if .Values.actionsMetricsServer.logLevel }}
- "--log-level={{ .Values.actionsMetricsServer.logLevel }}" - "--log-level={{ .Values.actionsMetricsServer.logLevel }}"
@ -122,8 +122,8 @@ spec:
- containerPort: 8000 - containerPort: 8000
name: http name: http
protocol: TCP protocol: TCP
{{- if not .Values.metrics.proxy.enabled }} {{- if not .Values.actionsMetrics.proxy.enabled }}
- containerPort: {{ .Values.metrics.port }} - containerPort: {{ .Values.actionsMetrics.port }}
name: metrics-port name: metrics-port
protocol: TCP protocol: TCP
{{- end }} {{- end }}
@ -131,17 +131,17 @@ spec:
{{- toYaml .Values.actionsMetricsServer.resources | nindent 12 }} {{- toYaml .Values.actionsMetricsServer.resources | nindent 12 }}
securityContext: securityContext:
{{- toYaml .Values.actionsMetricsServer.securityContext | nindent 12 }} {{- toYaml .Values.actionsMetricsServer.securityContext | nindent 12 }}
{{- if .Values.metrics.proxy.enabled }} {{- if .Values.actionsMetrics.proxy.enabled }}
- args: - args:
- "--secure-listen-address=0.0.0.0:{{ .Values.metrics.port }}" - "--secure-listen-address=0.0.0.0:{{ .Values.actionsMetrics.port }}"
- "--upstream=http://127.0.0.1:8080/" - "--upstream=http://127.0.0.1:8080/"
- "--logtostderr=true" - "--logtostderr=true"
- "--v=10" - "--v=10"
image: "{{ .Values.metrics.proxy.image.repository }}:{{ .Values.metrics.proxy.image.tag }}" image: "{{ .Values.actionsMetrics.proxy.image.repository }}:{{ .Values.actionsMetrics.proxy.image.tag }}"
name: kube-rbac-proxy name: kube-rbac-proxy
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- containerPort: {{ .Values.metrics.port }} - containerPort: {{ .Values.actionsMetrics.port }}
name: metrics-port name: metrics-port
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}

4
charts/actions-runner-controller/templates/actionsmetrics.service.yaml
View File

@ -16,9 +16,9 @@ spec:
{{ range $_, $port := .Values.actionsMetricsServer.service.ports -}} {{ range $_, $port := .Values.actionsMetricsServer.service.ports -}}
- {{ $port | toYaml | nindent 6 }} - {{ $port | toYaml | nindent 6 }}
{{- end }} {{- end }}
{{- if .Values.metrics.serviceMonitor }} {{- if .Values.actionsMetrics.serviceMonitor }}
- name: metrics-port - name: metrics-port
port: {{ .Values.metrics.port }} port: {{ .Values.actionsMetrics.port }}
targetPort: metrics-port targetPort: metrics-port
{{- end }} {{- end }}
selector: selector: