From 829bf20449f9c2cb6aa7ca374d81851e630d35a5 Mon Sep 17 00:00:00 2001
From: Hidetake Iwata <int128@gmail.com>
Date: Thu, 18 Feb 2021 14:00:57 +0900
Subject: [PATCH 1/3] Fix length of github-webhook-server port name

---
 charts/actions-runner-controller/Chart.yaml                     | 2 +-
 .../templates/githubwebhook.deployment.yaml                     | 2 +-
 charts/actions-runner-controller/values.yaml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/actions-runner-controller/Chart.yaml b/charts/actions-runner-controller/Chart.yaml
index fe58d4d1..bfc7ded3 100644
--- a/charts/actions-runner-controller/Chart.yaml
+++ b/charts/actions-runner-controller/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.1
+version: 0.5.2
 
 home: https://github.com/summerwind/actions-runner-controller
 
diff --git a/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml b/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
index 886a07b6..e00a96d6 100644
--- a/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
+++ b/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
@@ -52,7 +52,7 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 8000
-          name: github-webhook-server
+          name: http
           protocol: TCP
         resources:
           {{- toYaml .Values.githubWebhookServer.resources | nindent 12 }}
diff --git a/charts/actions-runner-controller/values.yaml b/charts/actions-runner-controller/values.yaml
index 5419762f..12fc6965 100644
--- a/charts/actions-runner-controller/values.yaml
+++ b/charts/actions-runner-controller/values.yaml
@@ -147,7 +147,7 @@ githubWebhookServer:
     type: NodePort
     ports:
     - port: 80
-      targetPort: 8000
+      targetPort: http
       protocol: TCP
       name: http
       #nodePort: someFixedPortForUseWithTerraformCdkCfnEtc

From 2c4a6ca90b95ee2bcc0c308ae10805c90d5826a5 Mon Sep 17 00:00:00 2001
From: Hidetake Iwata <int128@gmail.com>
Date: Thu, 18 Feb 2021 16:49:24 +0900
Subject: [PATCH 2/3] Add cluster role binding for github-webhook-server

---
 .../templates/githubwebhook.role_binding.yaml      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 charts/actions-runner-controller/templates/githubwebhook.role_binding.yaml

diff --git a/charts/actions-runner-controller/templates/githubwebhook.role_binding.yaml b/charts/actions-runner-controller/templates/githubwebhook.role_binding.yaml
new file mode 100644
index 00000000..24a69456
--- /dev/null
+++ b/charts/actions-runner-controller/templates/githubwebhook.role_binding.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.githubWebhookServer.enabled }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ include "actions-runner-controller-github-webhook-server.roleName" . }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ include "actions-runner-controller-github-webhook-server.roleName" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "actions-runner-controller-github-webhook-server.serviceAccountName" . }}
+    namespace: {{ .Release.Namespace }}
+{{- end }}

From 2db608879a8836b73a7810b29b1b43df475dac56 Mon Sep 17 00:00:00 2001
From: Hidetake Iwata <int128@gmail.com>
Date: Thu, 18 Feb 2021 16:51:47 +0900
Subject: [PATCH 3/3] Remove --enable-leader-election from
 github-webhook-server

---
 .../templates/githubwebhook.deployment.yaml                      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml b/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
index e00a96d6..5f437f1f 100644
--- a/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
+++ b/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
@@ -32,7 +32,6 @@ spec:
       containers:
       - args:
         - "--metrics-addr=127.0.0.1:8080"
-        - "--enable-leader-election"
         - "--sync-period={{ .Values.githubWebhookServer.syncPeriod }}"
         command:
         - "/github-webhook-server"