diff --git a/charts/actions-runner-controller/README.md b/charts/actions-runner-controller/README.md index 9387464b..05006b2e 100644 --- a/charts/actions-runner-controller/README.md +++ b/charts/actions-runner-controller/README.md @@ -158,7 +158,8 @@ All additional docs are kept in the `docs/` folder, this README is solely for do | `actionsMetrics.serviceMonitor.timeout` | Configure the timeout the timeout of Prometheus scrapping. | 30s | | `actionsMetrics.serviceAnnotations` | Set annotations for the provisioned actions metrics service resource | | | `actionsMetrics.port` | Set port of actions metrics service | 8443 | -| `actionsMetrics.proxy.enabled` | Deploy kube-rbac-proxy container in controller pod | true | +| `actionsMetrics.proxy.enabled` | Deploy kube-rbac-proxy container in the actions-metrics-server pod | true | | `actionsMetrics.proxy.image.repository` | The "repository/image" of the kube-proxy container | quay.io/brancz/kube-rbac-proxy | | `actionsMetrics.proxy.image.tag` | The tag of the kube-proxy image to use when pulling the container | v0.13.1 | +| `actionsMetrics.proxy.resources` | Set the kube-rbac-proxy container resources | | | `actionsMetrics.serviceMonitorLabels` | Set labels to apply to ServiceMonitor resources | | diff --git a/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml b/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml index 045acc0a..8cd0ca2d 100644 --- a/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml +++ b/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml @@ -148,7 +148,7 @@ spec: - containerPort: {{ .Values.actionsMetrics.port }} name: metrics-port resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.actionsMetrics.proxy.resources | nindent 12 }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} {{- end }} diff --git a/charts/actions-runner-controller/templates/deployment.yaml b/charts/actions-runner-controller/templates/deployment.yaml index 4e17a854..d6e2f43b 100644 --- a/charts/actions-runner-controller/templates/deployment.yaml +++ b/charts/actions-runner-controller/templates/deployment.yaml @@ -175,7 +175,7 @@ spec: - containerPort: {{ .Values.metrics.port }} name: metrics-port resources: - {{- toYaml .Values.resources | nindent 12 }} + {{- toYaml .Values.metrics.proxy.resources | nindent 12 }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} {{- end }} diff --git a/charts/actions-runner-controller/values.yaml b/charts/actions-runner-controller/values.yaml index fff18cc0..241b031a 100644 --- a/charts/actions-runner-controller/values.yaml +++ b/charts/actions-runner-controller/values.yaml @@ -121,9 +121,9 @@ metrics: image: repository: quay.io/brancz/kube-rbac-proxy tag: v0.13.1 + resources: {} -resources: - {} +resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following @@ -323,6 +323,7 @@ actionsMetrics: image: repository: quay.io/brancz/kube-rbac-proxy tag: v0.13.1 + resources: {} # specify additional environment variables for the webhook server pod. # It's possible to specify either key vale pairs e.g.: # my_env_var: "some value"