From 1b8676181470050a5baa686e288afc3d699db3b3 Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:14:23 -0800 Subject: [PATCH 1/7] Update values.yaml --- charts/actions-runner-controller/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/actions-runner-controller/values.yaml b/charts/actions-runner-controller/values.yaml index 25da1515..52451518 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 From ec207edf1fdbb790e329dc6f63ebd1e571c333b2 Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:16:43 -0800 Subject: [PATCH 2/7] Update README.md --- charts/actions-runner-controller/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/actions-runner-controller/README.md b/charts/actions-runner-controller/README.md index e552d8be..8fc31a7d 100644 --- a/charts/actions-runner-controller/README.md +++ b/charts/actions-runner-controller/README.md @@ -161,4 +161,5 @@ All additional docs are kept in the `docs/` folder, this README is solely for do | `actionsMetrics.proxy.enabled` | Deploy kube-rbac-proxy container in controller 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 | | From 9a3fae02a47ebe0c459561a16cad33052450434b Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:17:29 -0800 Subject: [PATCH 3/7] Update README.md --- charts/actions-runner-controller/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/actions-runner-controller/README.md b/charts/actions-runner-controller/README.md index 8fc31a7d..1ea9f667 100644 --- a/charts/actions-runner-controller/README.md +++ b/charts/actions-runner-controller/README.md @@ -161,5 +161,5 @@ All additional docs are kept in the `docs/` folder, this README is solely for do | `actionsMetrics.proxy.enabled` | Deploy kube-rbac-proxy container in controller 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.proxy.resources` | Set the kube-rbac-proxy container resources | | | `actionsMetrics.serviceMonitorLabels` | Set labels to apply to ServiceMonitor resources | | From 1bcb1a01c25b46274c5b5abe6dc22f75664ff8dc Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:18:35 -0800 Subject: [PATCH 4/7] Update deployment.yaml --- charts/actions-runner-controller/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/actions-runner-controller/templates/deployment.yaml b/charts/actions-runner-controller/templates/deployment.yaml index 3490f989..f7978ab9 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 }} From d3ca4c662c6723f62d6139618334e3df9b5996d6 Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:21:30 -0800 Subject: [PATCH 5/7] Update actionsmetrics.deployment.yaml --- .../templates/actionsmetrics.deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml b/charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml index 676e2472..aa7d82d7 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 }} From 42a29a8777216ff6d9525e2e566c7b93227abdc2 Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:22:31 -0800 Subject: [PATCH 6/7] Update values.yaml --- charts/actions-runner-controller/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/actions-runner-controller/values.yaml b/charts/actions-runner-controller/values.yaml index 52451518..59e29dcb 100644 --- a/charts/actions-runner-controller/values.yaml +++ b/charts/actions-runner-controller/values.yaml @@ -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" From 1fae66ea22906a6310cea8809af41819c7cab12f Mon Sep 17 00:00:00 2001 From: Chotiwat Chawannakul Date: Thu, 7 Mar 2024 17:27:25 -0800 Subject: [PATCH 7/7] Update README.md --- charts/actions-runner-controller/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/actions-runner-controller/README.md b/charts/actions-runner-controller/README.md index 1ea9f667..c63ed917 100644 --- a/charts/actions-runner-controller/README.md +++ b/charts/actions-runner-controller/README.md @@ -158,7 +158,7 @@ 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 | |