Fix excessive runnerreplicaset update issue since 0.25.0 (#1651)

Fixes #1643

.gitattributes

@@ -1 +0,0 @@
-*.png filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,18 +1,8 @@
-name: Bug Report (actions.summerwind.net API group)
-description: File a bug report for actions.summerwind.net API group
-title: "<Please write what didn't work for you here>"
-labels: ["bug", "needs triage", "community"]
+name: Bug Report
+description: File a bug report
+title: "Bug"
+labels: ["bug"]
 body:
-- type: checkboxes
-  id: read-troubleshooting-guide
-  attributes:
-    label: Checks
-    description: Please check all the boxes below before submitting
-    options:
-    - label: I've already read https://github.com/actions/actions-runner-controller/blob/master/TROUBLESHOOTING.md and I'm sure my issue is not covered in the troubleshooting guide.
-      required: true
-    - label: I'm not using a custom entrypoint in my runner image
-      required: true
 - type: input
   id: controller-version
   attributes:
@@ -51,7 +41,7 @@ body:
     label: cert-manager installation
     description: Confirm that you've installed cert-manager correctly by answering a few questions
     placeholder: |
-      - Did you follow https://github.com/actions/actions-runner-controller#installation? If not, describe the installation process so that we can reproduce your environment.
+      - Did you follow https://github.com/actions-runner-controller/actions-runner-controller#installation? If not, describe the installation process so that we can reproduce your environment.
       - Are you sure you've installed cert-manager from an official source?
       (Note that we won't provide user support for cert-manager itself. Make sure cert-manager is fully working before testing ARC or reporting a bug
   validations:
@@ -60,18 +50,16 @@ body:
   id: checks
   attributes:
     label: Checks
-    description: Please check all the boxes below before submitting
+    description: Please check the boxes below before submitting
     options:
-    - label: This isn't a question or user support case (For Q&A and community support, go to [Discussions](https://github.com/actions/actions-runner-controller/discussions). It might also be a good idea to contract with any of contributors and maintainers if your business is so critical and therefore you need priority support
+    - label: This isn't a question or user support case (For Q&A and community support, go to [Discussions](https://github.com/actions-runner-controller/actions-runner-controller/discussions). It might also be a good idea to contract with any of contributors and maintainers if your business is so critical and therefore you need priority support
       required: true
-    - label: I've read [releasenotes](https://github.com/actions/actions-runner-controller/tree/master/docs/releasenotes) before submitting this issue and I'm sure it's not due to any recently-introduced backward-incompatible changes
+    - label: I've read [releasenotes](https://github.com/actions-runner-controller/actions-runner-controller/tree/master/docs/releasenotes) before submitting this issue and I'm sure it's not due to any recently-introduced backward-incompatible changes
       required: true
     - label: My actions-runner-controller version (v0.x.y) does support the feature
       required: true
     - label: I've already upgraded ARC (including the CRDs, see charts/actions-runner-controller/docs/UPGRADING.md for details) to the latest and it didn't fix the issue
       required: true
-    - label: I've migrated to the workflow job webhook event (if you using webhook driven scaling)
-      required: true
 - type: textarea
   id: resource-definitions
   attributes:
@@ -141,8 +129,8 @@ body:
 - type: textarea
   id: controller-logs
   attributes:
-    label: Whole Controller Logs
-    description: "NEVER EVER OMIT THIS! Include logs from `actions-runner-controller`'s controller-manager pod. Don't omit the parts you think irrelevant!"
+    label: Controller Logs
+    description: "NEVER EVER OMIT THIS! Include logs from `actions-runner-controller`'s controller-manager pod"
     render: shell
     placeholder: |
       PROVIDE THE LOGS VIA A GIST LINK (https://gist.github.com/), NOT DIRECTLY IN THIS TEXT AREA
@@ -161,11 +149,11 @@ body:
 - type: textarea
   id: runner-pod-logs
   attributes:
-    label: Whole Runner Pod Logs
-    description: "Include logs from runner pod(s). Please don't omit the parts you think irrelevant!"
+    label: Runner Pod Logs
+    description: "Include logs from runner pod(s)"
     render: shell
     placeholder: |
-      PROVIDE THE WHOLE LOGS VIA A GIST LINK (https://gist.github.com/), NOT DIRECTLY IN THIS TEXT AREA
+      PROVIDE THE LOGS VIA A GIST LINK (https://gist.github.com/), NOT DIRECTLY IN THIS TEXT AREA
       
       To grab the runner pod logs:
 
@@ -177,8 +165,6 @@ body:
 
       kubectl -n $NS logs $POD_NAME -c runner > runnerpod_runner.log
       kubectl -n $NS logs $POD_NAME -c docker > runnerpod_docker.log
-
-      If any of the containers are getting terminated immediately, try adding `--previous` to the kubectl-logs command to obtain logs emitted before the termination.
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +1,15 @@
-blank_issues_enabled: false
+# Blank issues are mainly for maintainers who are known to write complete issue descriptions without need to following a form
+blank_issues_enabled: true
 contact_links:
-- name: Feature requests for the gha-runner-scale-set (actions.github.com API group)
-  about: Feature requests associated with the actions.github.com group should be posted on the GitHub Community Support Forum
-  url: https://github.com/orgs/community/discussions/categories/actions
 - name: Sponsor ARC Maintainers
   about: If your business relies on the continued maintainance of actions-runner-controller, please consider sponsoring the project and the maintainers.
-  url: https://github.com/actions/actions-runner-controller/tree/master/CODEOWNERS
+  url: https://github.com/actions-runner-controller/actions-runner-controller/tree/master/CODEOWNERS
 - name: Ideas and Feature Requests
   about: Wanna request a feature? Create a discussion and collect :+1:s first.
-  url: https://github.com/actions/actions-runner-controller/discussions/new?category=ideas
+  url: https://github.com/actions-runner-controller/actions-runner-controller/discussions/new?category=ideas
 - name: Questions and User Support
   about: Need support using ARC? We use Discussions as the place to provide community support.
-  url: https://github.com/actions/actions-runner-controller/discussions/new?category=questions
+  url: https://github.com/actions-runner-controller/actions-runner-controller/discussions/new?category=questions
 - name: Need Paid Support?
   about: Consider contracting with any of the actions-runner-controller maintainers and contributors.
-  url: https://github.com/actions/actions-runner-controller/tree/master/CODEOWNERS
+  url: https://github.com/actions-runner-controller/actions-runner-controller/tree/master/CODEOWNERS

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/github_bug_report.yaml

@@ -1,113 +0,0 @@
-name: Bug Report (actions.github.com API group)
-description: File a bug report for actions.github.com API group
-title: "<Please write what didn't work for you here>"
-labels: ["bug", "needs triage", "gha-runner-scale-set"]
-body:
-- type: checkboxes
-  id: read-troubleshooting-guide
-  attributes:
-    label: Checks
-    description: Please check all the boxes below before submitting
-    options:
-    - label: I've already read https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/troubleshooting-actions-runner-controller-errors and I'm sure my issue is not covered in the troubleshooting guide.
-      required: true
-
-    - label: I am using charts that are officially provided
-- type: input
-  id: controller-version
-  attributes:
-    label: Controller Version
-    description: Refers to semver-like release tags for controller versions. Any release tags prefixed with `gha-runner-scale-set-` are releases associated with this API group
-    placeholder: ex. 0.6.1
-  validations:
-    required: true
-- type: dropdown
-  id: deployment-method
-  attributes:
-    label: Deployment Method
-    description: Which deployment method did you use to install ARC?
-    options:
-      - Helm
-      - Kustomize
-      - ArgoCD
-      - Other
-  validations:
-    required: true
-- type: checkboxes
-  id: checks
-  attributes:
-    label: Checks
-    description: Please check all the boxes below before submitting
-    options:
-    - label: This isn't a question or user support case (For Q&A and community support, go to [Discussions](https://github.com/actions/actions-runner-controller/discussions)).
-      required: true
-    - label: I've read the [Changelog](https://github.com/actions/actions-runner-controller/blob/master/docs/gha-runner-scale-set-controller/README.md#changelog) before submitting this issue and I'm sure it's not due to any recently-introduced backward-incompatible changes
-      required: true
-- type: textarea
-  id: reproduction-steps
-  attributes:
-    label: To Reproduce
-    description: "Steps to reproduce the behavior"
-    render: markdown
-    placeholder: |
-      1. Go to '...'
-      2. Click on '....'
-      3. Scroll down to '....'
-      4. See error
-  validations:
-    required: true
-- type: textarea
-  id: actual-behavior
-  attributes:
-    label: Describe the bug
-    description: Also tell us, what did happen?
-    placeholder: A clear and concise description of what happened.
-  validations:
-    required: true
-
-- type: textarea
-  id: expected-behavior
-  attributes:
-    label: Describe the expected behavior
-    description: Also tell us, what did you expect to happen?
-    placeholder: A clear and concise description of what the expected behavior is.
-  validations:
-    required: true
-
-- type: textarea
-  id: additional-context
-  attributes:
-    label: Additional Context
-    render: yaml
-    description: |
-      Provide `values.yaml` files that are relevant for this issue. PLEASE REDACT ANY INFORMATION THAT SHOULD NOT BE PUBLICALY AVAILABLE, LIKE GITHUB TOKEN FOR EXAMPLE.
-    placeholder: |
-      PLEASE REDACT ANY INFORMATION THAT SHOULD NOT BE PUBLICALY AVAILABLE, LIKE GITHUB TOKEN FOR EXAMPLE.
-  validations:
-    required: true
-
-- type: textarea
-  id: controller-logs
-  attributes:
-    label: Controller Logs
-    description: "NEVER EVER OMIT THIS! Include complete logs from `actions-runner-controller`'s controller-manager pod."
-    render: shell
-    placeholder: |
-      PROVIDE THE LOGS VIA A GIST LINK (https://gist.github.com/), NOT DIRECTLY IN THIS TEXT AREA
-
-      To grab controller logs:
-
-      kubectl logs -n $NAMESPACE deployments/$CONTROLLER_DEPLOYMENT
-  validations:
-    required: true
-- type: textarea
-  id: runner-pod-logs
-  attributes:
-    label: Runner Pod Logs
-    description: "Include logs and kubectl describe output from runner pod(s)."
-    render: shell
-    placeholder: |
-      PROVIDE THE WHOLE LOGS VIA A GIST LINK (https://gist.github.com/), NOT DIRECTLY IN THIS TEXT AREA
-  validations:
-    required: true
-

.github/ISSUE_TEMPLATE/summerwind_feature_request.md

@@ -1,21 +0,0 @@
----
-name: Feature request (actions.summerwind.net API group)
-about: Suggest an idea for this project
-labels: ["enhancement", "needs triage", "community"]
-title: ''
-assignees: ''
----
-
-### What would you like added?
-
-*A clear and concise description of what you want to happen.*
-
-Note: Feature requests to integrate vendor specific cloud tools (e.g. `awscli`, `gcloud-sdk`, `azure-cli`) will likely be rejected as the Runner image aims to be vendor agnostic.
-
-### Why is this needed?
-
-*A clear and concise description of any alternative solutions or features you've considered.*
-
-### Additional context
-
-*Add any other context or screenshots about the feature request here.*

.github/actions/execute-assert-arc-e2e/action.yaml

@@ -1,202 +0,0 @@
-name: 'Execute and Assert ARC E2E Test Action'
-description: 'Queue E2E test workflow and assert workflow run result to be succeed'
-
-inputs:
-  auth-token:
-    description: 'GitHub access token to queue workflow run'
-    required: true
-  repo-owner:
-    description: "The repository owner name that has the test workflow file, ex: actions"
-    required: true
-  repo-name:
-    description: "The repository name that has the test workflow file, ex: test"
-    required: true
-  workflow-file:
-    description: 'The file name of the workflow yaml, ex: test.yml'
-    required: true
-  arc-name:
-    description: 'The name of the configured gha-runner-scale-set'
-    required: true
-  arc-namespace:
-    description: 'The namespace of the configured gha-runner-scale-set'
-    required: true
-  arc-controller-namespace:
-    description: 'The namespace of the configured gha-runner-scale-set-controller'
-    required: true
-  wait-to-finish:
-    description: 'Wait for the workflow run to finish'
-    required: true
-    default: "true"
-  wait-to-running:
-    description: 'Wait for the workflow run to start running'
-    required: true
-    default: "false"
-
-runs:
-  using: "composite"
-  steps:
-    - name: Queue test workflow
-      shell: bash
-      id: queue_workflow
-      run: |
-        queue_time=`date +%FT%TZ`
-        echo "queue_time=$queue_time" >> $GITHUB_OUTPUT
-        curl -X POST https://api.github.com/repos/${{inputs.repo-owner}}/${{inputs.repo-name}}/actions/workflows/${{inputs.workflow-file}}/dispatches \
-        -H "Accept: application/vnd.github.v3+json" \
-        -H "Authorization: token ${{inputs.auth-token}}" \
-        -d '{"ref": "main", "inputs": { "arc_name": "${{inputs.arc-name}}" } }'
-
-    - name: Fetch workflow run & job ids
-      uses: actions/github-script@v6
-      id: query_workflow
-      with:
-        script: |
-          // Try to find the workflow run triggered by the previous step using the workflow_dispatch event.
-          // - Find recently create workflow runs in the test repository
-          // - For each workflow run, list its workflow job and see if the job's labels contain `inputs.arc-name`
-          // - Since the inputs.arc-name should be unique per e2e workflow run, once we find the job with the label, we find the workflow that we just triggered.
-          function sleep(ms) {
-            return new Promise(resolve => setTimeout(resolve, ms))
-          }
-          const owner = '${{inputs.repo-owner}}'
-          const repo = '${{inputs.repo-name}}'
-          const workflow_id = '${{inputs.workflow-file}}'
-          let workflow_run_id = 0
-          let workflow_job_id = 0
-          let workflow_run_html_url = ""
-          let count = 0
-          while (count++<12) {
-            await sleep(10 * 1000);
-            let listRunResponse = await github.rest.actions.listWorkflowRuns({
-              owner: owner,
-              repo: repo,
-              workflow_id: workflow_id,
-              created: '>${{steps.queue_workflow.outputs.queue_time}}'
-            })
-            if (listRunResponse.data.total_count > 0) {
-              console.log(`Found some new workflow runs for ${workflow_id}`)
-              for (let i = 0; i<listRunResponse.data.total_count; i++) {
-                let workflowRun = listRunResponse.data.workflow_runs[i]
-                console.log(`Check if workflow run ${workflowRun.id} is triggered by us.`)
-                let listJobResponse = await github.rest.actions.listJobsForWorkflowRun({
-                  owner: owner,
-                  repo: repo,
-                  run_id: workflowRun.id
-                })
-                console.log(`Workflow run ${workflowRun.id} has ${listJobResponse.data.total_count} jobs.`)
-                if (listJobResponse.data.total_count > 0) {
-                  for (let j = 0; j<listJobResponse.data.total_count; j++) {
-                    let workflowJob = listJobResponse.data.jobs[j]
-                    console.log(`Check if workflow job ${workflowJob.id} is triggered by us.`)
-                    console.log(JSON.stringify(workflowJob.labels));
-                    if (workflowJob.labels.includes('${{inputs.arc-name}}')) {
-                      console.log(`Workflow job ${workflowJob.id} (Run id: ${workflowJob.run_id}) is triggered by us.`)
-                      workflow_run_id = workflowJob.run_id
-                      workflow_job_id = workflowJob.id
-                      workflow_run_html_url = workflowRun.html_url
-                      break
-                    }
-                  }
-                }
-
-                if (workflow_job_id > 0) {
-                  break;
-                }
-              }
-            }
-
-            if (workflow_job_id > 0) {
-              break;
-            }
-          }
-          if (workflow_job_id == 0) {
-            core.setFailed(`Can't find workflow run and workflow job triggered to 'runs-on ${{inputs.arc-name}}'`)
-          } else {
-            core.setOutput('workflow_run', workflow_run_id);
-            core.setOutput('workflow_job', workflow_job_id);
-            core.setOutput('workflow_run_url', workflow_run_html_url);
-          }
-
-    - name: Generate summary about the triggered workflow run
-      shell: bash
-      run: |
-        cat <<-EOF > $GITHUB_STEP_SUMMARY
-        | **Triggered workflow run** |
-        |:--------------------------:|
-        | ${{steps.query_workflow.outputs.workflow_run_url}} |
-        EOF
-
-    - name: Wait for workflow to start running
-      if: inputs.wait-to-running == 'true' && inputs.wait-to-finish == 'false'
-      uses: actions/github-script@v6
-      with:
-        script: |
-          function sleep(ms) {
-            return new Promise(resolve => setTimeout(resolve, ms))
-          }
-          const owner = '${{inputs.repo-owner}}'
-          const repo = '${{inputs.repo-name}}'
-          const workflow_run_id = ${{steps.query_workflow.outputs.workflow_run}}
-          const workflow_job_id = ${{steps.query_workflow.outputs.workflow_job}}
-          let count = 0
-          while (count++<10) {
-            await sleep(30 * 1000);
-            let getRunResponse = await github.rest.actions.getWorkflowRun({
-              owner: owner,
-              repo: repo,
-              run_id: workflow_run_id
-            })
-            console.log(`${getRunResponse.data.html_url}: ${getRunResponse.data.status} (${getRunResponse.data.conclusion})`);
-            if (getRunResponse.data.status == 'in_progress') {
-              console.log(`Workflow run is in progress.`)
-              return
-            }
-          }
-          core.setFailed(`The triggered workflow run didn't start properly using ${{inputs.arc-name}}`)
-
-    - name: Wait for workflow to finish successfully
-      if: inputs.wait-to-finish == 'true'
-      uses: actions/github-script@v6
-      with:
-        script: |
-          // Wait 5 minutes and make sure the workflow run we triggered completed with result 'success'
-          function sleep(ms) {
-            return new Promise(resolve => setTimeout(resolve, ms))
-          }
-          const owner = '${{inputs.repo-owner}}'
-          const repo = '${{inputs.repo-name}}'
-          const workflow_run_id = ${{steps.query_workflow.outputs.workflow_run}}
-          const workflow_job_id = ${{steps.query_workflow.outputs.workflow_job}}
-          let count = 0
-          while (count++<10) {
-            await sleep(30 * 1000);
-            let getRunResponse = await github.rest.actions.getWorkflowRun({
-              owner: owner,
-              repo: repo,
-              run_id: workflow_run_id
-            })
-            console.log(`${getRunResponse.data.html_url}: ${getRunResponse.data.status} (${getRunResponse.data.conclusion})`);
-            if (getRunResponse.data.status == 'completed') {
-              if ( getRunResponse.data.conclusion == 'success') {
-                console.log(`Workflow run finished properly.`)
-                return
-              } else {
-                core.setFailed(`The triggered workflow run finish with result ${getRunResponse.data.conclusion}`)
-                return
-              }
-            }
-          }
-          core.setFailed(`The triggered workflow run didn't finish properly using ${{inputs.arc-name}}`)
-
-    - name: cleanup
-      if: inputs.wait-to-finish == 'true'
-      shell: bash
-      run: |
-        helm uninstall ${{ inputs.arc-name }} --namespace ${{inputs.arc-namespace}} --debug
-        kubectl wait --timeout=10s --for=delete AutoScalingRunnerSet -n ${{inputs.arc-name}} -l app.kubernetes.io/instance=${{ inputs.arc-name }}
-
-    - name: Gather logs and cleanup
-      shell: bash
-      if: always()
-      run: |
-        kubectl logs deployment/arc-gha-rs-controller -n ${{inputs.arc-controller-namespace}}

.github/actions/setup-arc-e2e/action.yaml

@@ -1,63 +0,0 @@
-name: 'Setup ARC E2E Test Action'
-description: 'Build controller image, create kind cluster, load the image, and exchange ARC configure token.'
-
-inputs:
-  app-id:
-    description: 'GitHub App Id for exchange access token'
-    required: true
-  app-pk:
-    description: "GitHub App private key for exchange access token"
-    required: true
-  image-name:
-    description: "Local docker image name for building"
-    required: true
-  image-tag:
-    description: "Tag of ARC Docker image for building"
-    required: true
-  target-org:
-    description: "The test organization for ARC e2e test"
-    required: true
-
-outputs:
-  token:
-    description: 'Token to use for configure ARC'
-    value: ${{steps.config-token.outputs.token}}
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-      with:
-          # Pinning v0.9.1 for Buildx and BuildKit v0.10.6
-          # BuildKit v0.11 which has a bug causing intermittent 
-          # failures pushing images to GHCR
-          version: v0.9.1
-          driver-opts: image=moby/buildkit:v0.10.6
-
-    - name: Build controller image
-      uses: docker/build-push-action@v3
-      with:
-        file: Dockerfile
-        platforms: linux/amd64
-        load: true
-        build-args: |
-          DOCKER_IMAGE_NAME=${{inputs.image-name}}
-          VERSION=${{inputs.image-tag}} 
-        tags: |
-          ${{inputs.image-name}}:${{inputs.image-tag}}
-        no-cache: true
-
-    - name: Create minikube cluster and load image
-      shell: bash
-      run: |
-        minikube start
-        minikube image load ${{inputs.image-name}}:${{inputs.image-tag}}
-
-    - name: Get configure token
-      id: config-token
-      uses: peter-murray/workflow-application-token-action@8e1ba3bf1619726336414f1014e37f17fbadf1db
-      with:
-        application_id: ${{ inputs.app-id }}
-        application_private_key: ${{ inputs.app-pk }}
-        organization: ${{ inputs.target-org}}

.github/actions/setup-docker-environment/action.yaml

@@ -14,13 +14,18 @@ inputs:
     description: "GHCR password. Usually set from the secrets.GITHUB_TOKEN variable"
     required: true
 
+outputs:
+  sha_short:
+    description: "The short SHA used for image builds"
+    value: ${{ steps.vars.outputs.sha_short }}
+
 runs:
   using: "composite"
   steps:
     - name: Get Short SHA
       id: vars
       run: |
-        echo "sha_short=${GITHUB_SHA::7}" >> $GITHUB_ENV
+        echo ::set-output name=sha_short::${GITHUB_SHA::7}
       shell: bash
 
     - name: Set up QEMU
@@ -32,14 +37,14 @@ runs:
         version: latest
 
     - name: Login to DockerHub
-      if: ${{ github.event_name == 'release' || github.event_name == 'push' && github.ref == 'refs/heads/master' && inputs.password != ''  }}
+      if: ${{ github.event_name == 'release' || github.event_name == 'push' && github.ref == 'refs/heads/master' }}
       uses: docker/login-action@v2
       with:
         username: ${{ inputs.username }}
         password: ${{ inputs.password }}
 
     - name: Login to GitHub Container Registry
-      if: ${{ github.event_name == 'release' || github.event_name == 'push' && github.ref == 'refs/heads/master' && inputs.ghcr_password != ''  }}
+      if: ${{ github.event_name == 'release' || github.event_name == 'push' && github.ref == 'refs/heads/master' }}
       uses: docker/login-action@v2
       with:
         registry: ghcr.io

.github/dependabot.yml

@@ -1,11 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "gomod" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "weekly"

.github/renovate.json5

@@ -0,0 +1,41 @@
+{
+  "extends": ["config:base"],
+  "labels": ["dependencies"],
+  "packageRules": [
+    {
+      // automatically merge an update of runner
+      "matchPackageNames": ["actions/runner"],
+      "extractVersion": "^v(?<version>.*)$",
+      "automerge": true
+    }
+  ],
+  "regexManagers": [
+    {
+      // use https://github.com/actions/runner/releases
+      "fileMatch": [
+        ".github/workflows/runners.yaml"
+      ],
+      "matchStrings": ["RUNNER_VERSION: +(?<currentValue>.*?)\\n"],
+      "depNameTemplate": "actions/runner",
+      "datasourceTemplate": "github-releases"
+    },
+    {
+      "fileMatch": [
+        "runner/Makefile",
+        "Makefile"
+      ],
+      "matchStrings": ["RUNNER_VERSION \\?= +(?<currentValue>.*?)\\n"],
+      "depNameTemplate": "actions/runner",
+      "datasourceTemplate": "github-releases"
+    },
+    {
+      "fileMatch": [
+        "runner/actions-runner.dockerfile",
+        "runner/actions-runner-dind.dockerfile"
+      ],
+      "matchStrings": ["RUNNER_VERSION=+(?<currentValue>.*?)\\n"],
+      "depNameTemplate": "actions/runner",
+      "datasourceTemplate": "github-releases"
+    }
+  ]
+}

.github/workflows/arc-publish-chart.yaml

@@ -1,212 +0,0 @@
-name: Publish ARC Helm Charts
-
-# Revert to https://github.com/actions-runner-controller/releases#releases
-# for details on why we use this approach
-on:
-  push:
-    branches:
-    - master
-    paths:
-    - 'charts/**'
-    - '.github/workflows/arc-publish-chart.yaml'
-    - '!charts/actions-runner-controller/docs/**'
-    - '!charts/gha-runner-scale-set-controller/**'
-    - '!charts/gha-runner-scale-set/**'
-    - '!**.md'
-  workflow_dispatch:
-    inputs:
-      force:
-        description: 'Force publish even if the chart version is not bumped'
-        type: boolean
-        required: true
-        default: false
-
-env:
-  KUBE_SCORE_VERSION: 1.10.0
-  HELM_VERSION: v3.8.0
-
-permissions:
-  contents: write
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  lint-chart:
-    name: Lint Chart
-    runs-on: ubuntu-latest
-    outputs:
-      publish-chart: ${{ steps.publish-chart-step.outputs.publish }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Set up Helm
-      uses: azure/setup-helm@v3.4
-      with:
-        version: ${{ env.HELM_VERSION }}
-
-    - name: Set up kube-score
-      run: |
-        wget https://github.com/zegl/kube-score/releases/download/v${{ env.KUBE_SCORE_VERSION }}/kube-score_${{ env.KUBE_SCORE_VERSION }}_linux_amd64 -O kube-score
-        chmod 755 kube-score
-
-    - name: Kube-score generated manifests
-      run: helm template  --values charts/.ci/values-kube-score.yaml charts/* | ./kube-score score - --ignore-test pod-networkpolicy --ignore-test deployment-has-poddisruptionbudget --ignore-test deployment-has-host-podantiaffinity --ignore-test container-security-context --ignore-test pod-probes --ignore-test container-image-tag --enable-optional-test container-security-context-privileged --enable-optional-test container-security-context-readonlyrootfilesystem
-
-    # python is a requirement for the chart-testing action below (supports yamllint among other tests)
-    - uses: actions/setup-python@v4
-      with:
-        python-version: '3.11'
-
-    - name: Set up chart-testing
-      uses: helm/chart-testing-action@v2.6.0
-
-    - name: Run chart-testing (list-changed)
-      id: list-changed
-      run: |
-        changed=$(ct list-changed --config charts/.ci/ct-config.yaml)
-        if [[ -n "$changed" ]]; then
-          echo "changed=true" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Run chart-testing (lint)
-      run: |
-        ct lint --config charts/.ci/ct-config.yaml
-
-    - name: Create kind cluster
-      if: steps.list-changed.outputs.changed == 'true'
-      uses: helm/kind-action@v1.4.0
-
-    # We need cert-manager already installed in the cluster because we assume the CRDs exist
-    - name: Install cert-manager
-      if: steps.list-changed.outputs.changed == 'true'
-      run: |
-        helm repo add jetstack https://charts.jetstack.io --force-update
-        helm install cert-manager jetstack/cert-manager --set installCRDs=true --wait
-
-    - name: Run chart-testing (install)
-      if: steps.list-changed.outputs.changed == 'true'
-      run: ct install --config charts/.ci/ct-config.yaml
-
-    # WARNING: This relies on the latest release being at the top of the JSON from GitHub and a clean chart.yaml
-    - name: Check if Chart Publish is Needed
-      id: publish-chart-step
-      run: |
-        CHART_TEXT=$(curl -fs https://raw.githubusercontent.com/${{ github.repository }}/master/charts/actions-runner-controller/Chart.yaml)
-        NEW_CHART_VERSION=$(echo "$CHART_TEXT" | grep version: | cut -d ' ' -f 2)
-        RELEASE_LIST=$(curl -fs https://api.github.com/repos/${{ github.repository }}/releases  | jq .[].tag_name | grep actions-runner-controller | cut -d '"' -f 2 | cut -d '-' -f 4)
-        LATEST_RELEASED_CHART_VERSION=$(echo $RELEASE_LIST | cut -d ' ' -f 1)
-
-        echo "CHART_VERSION_IN_MASTER=$NEW_CHART_VERSION" >> $GITHUB_ENV
-        echo "LATEST_CHART_VERSION=$LATEST_RELEASED_CHART_VERSION" >> $GITHUB_ENV
-
-        # Always publish if force is true
-        if [[ $NEW_CHART_VERSION != $LATEST_RELEASED_CHART_VERSION || "${{ inputs.force }}" == "true" ]]; then
-          echo "publish=true" >> $GITHUB_OUTPUT
-        else
-          echo "publish=false" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Job summary
-      run: |
-        echo "Chart linting has been completed." >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-        echo "- chart version in master: ${{ env.CHART_VERSION_IN_MASTER }}" >> $GITHUB_STEP_SUMMARY
-        echo "- latest chart version: ${{ env.LATEST_CHART_VERSION }}" >> $GITHUB_STEP_SUMMARY
-        echo "- publish new chart: ${{ steps.publish-chart-step.outputs.publish }}" >> $GITHUB_STEP_SUMMARY
-
-  publish-chart:
-    if: needs.lint-chart.outputs.publish-chart == 'true'
-    needs: lint-chart
-    name: Publish Chart
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write # for helm/chart-releaser-action to push chart release and create a release
-    env:
-      CHART_TARGET_ORG: actions-runner-controller
-      CHART_TARGET_REPO: actions-runner-controller.github.io
-      CHART_TARGET_BRANCH: master
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    - name: Configure Git
-      run: |
-        git config user.name "$GITHUB_ACTOR"
-        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-    - name: Get Token
-      id: get_workflow_token
-      uses: peter-murray/workflow-application-token-action@8e1ba3bf1619726336414f1014e37f17fbadf1db
-      with:
-        application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
-        application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
-        organization: ${{ env.CHART_TARGET_ORG }}
-
-    - name: Install chart-releaser
-      uses: helm/chart-releaser-action@v1.4.1
-      with:
-        install_only: true
-        install_dir: ${{ github.workspace }}/bin
-
-    - name: Package and upload release assets
-      run: |
-        cr package \
-          ${{ github.workspace }}/charts/actions-runner-controller/ \
-          --package-path .cr-release-packages
-
-        cr upload \
-          --owner "$(echo ${{ github.repository }} | cut -d '/' -f 1)" \
-          --git-repo "$(echo ${{ github.repository }} | cut -d '/' -f 2)" \
-          --package-path .cr-release-packages \
-          --token ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Generate updated index.yaml
-      run: |
-        cr index \
-          --owner "$(echo ${{ github.repository }} | cut -d '/' -f 1)" \
-          --git-repo "$(echo ${{ github.repository }} | cut -d '/' -f 2)" \
-          --index-path ${{ github.workspace }}/index.yaml \
-          --token ${{ secrets.GITHUB_TOKEN }} \
-          --push \
-          --pages-branch 'gh-pages' \
-          --pages-index-path 'index.yaml'
-
-    # Chart Release was never intended to publish to a different repo
-    # this workaround is intended to move the index.yaml to the target repo
-    # where the github pages are hosted
-    - name: Checkout target repository
-      uses: actions/checkout@v3
-      with:
-        repository: ${{ env.CHART_TARGET_ORG }}/${{ env.CHART_TARGET_REPO }}
-        path: ${{ env.CHART_TARGET_REPO }}
-        ref: ${{ env.CHART_TARGET_BRANCH }}
-        token: ${{ steps.get_workflow_token.outputs.token }}
-
-    - name: Copy index.yaml
-      run: |
-        cp ${{ github.workspace }}/index.yaml ${{ env.CHART_TARGET_REPO }}/actions-runner-controller/index.yaml
-
-    - name: Commit and push to target repository
-      run: |
-        git config user.name "$GITHUB_ACTOR"
-        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-        git add .
-        git commit -m "Update index.yaml"
-        git push
-      working-directory: ${{ github.workspace }}/${{ env.CHART_TARGET_REPO }}
-
-    - name: Job summary
-      run: |
-        echo "New helm chart has been published" >> $GITHUB_STEP_SUMMARY
-        echo "" >> $GITHUB_STEP_SUMMARY
-        echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-        echo "- New [index.yaml](https://github.com/${{ env.CHART_TARGET_ORG }}/${{ env.CHART_TARGET_REPO }}/tree/master/actions-runner-controller) pushed" >> $GITHUB_STEP_SUMMARY

.github/workflows/arc-publish.yaml

@@ -1,109 +0,0 @@
-name: Publish ARC Image
-
-# Revert to https://github.com/actions-runner-controller/releases#releases
-# for details on why we use this approach
-on:
-  release:
-    types:
-      - published
-  workflow_dispatch:
-    inputs:
-      release_tag_name:
-        description: 'Tag name of the release to publish'
-        required: true
-      push_to_registries:
-        description: 'Push images to registries'
-        required: true
-        type: boolean
-        default: false
-
-permissions:
- contents: write
- packages: write
-
-env:
-  TARGET_ORG: actions-runner-controller
-  TARGET_REPO: actions-runner-controller
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  release-controller:
-    name: Release
-    runs-on: ubuntu-latest
-    # gha-runner-scale-set has its own release workflow.
-    # We don't want to publish a new actions-runner-controller image
-    # we release gha-runner-scale-set.
-    if: ${{ !startsWith(github.event.inputs.release_tag_name, 'gha-runner-scale-set-') }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: 'go.mod'
-
-      - name: Install tools
-        run: |
-          curl -L -O https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.2.0/kubebuilder_2.2.0_linux_amd64.tar.gz
-          tar zxvf kubebuilder_2.2.0_linux_amd64.tar.gz
-          sudo mv kubebuilder_2.2.0_linux_amd64 /usr/local/kubebuilder
-          curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash
-          sudo mv kustomize /usr/local/bin
-          curl -L -O https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz
-          tar zxvf ghr_v0.13.0_linux_amd64.tar.gz
-          sudo mv ghr_v0.13.0_linux_amd64/ghr /usr/local/bin
-
-      - name: Set version env variable
-        run: |
-          # Define the release tag name based on the event type
-          if [[ "${{ github.event_name }}" == "release" ]]; then
-            echo "VERSION=$(cat ${GITHUB_EVENT_PATH} | jq -r '.release.tag_name')" >> $GITHUB_ENV
-          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "VERSION=${{ inputs.release_tag_name }}" >> $GITHUB_ENV
-          fi
-
-      - name: Upload artifacts
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          make github-release
-
-      - name: Get Token
-        id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@8e1ba3bf1619726336414f1014e37f17fbadf1db
-        with:
-          application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
-          application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
-          organization: ${{ env.TARGET_ORG }}
-
-      - name: Resolve push to registries
-        run: |
-          # Define the push to registries based on the event type
-          if [[ "${{ github.event_name }}" == "release" ]]; then
-            echo "PUSH_TO_REGISTRIES=true" >> $GITHUB_ENV
-          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            echo "PUSH_TO_REGISTRIES=${{ inputs.push_to_registries }}" >> $GITHUB_ENV
-          fi
-
-      - name: Trigger Build And Push Images To Registries
-        run: |
-          # Authenticate
-          gh auth login --with-token <<< ${{ steps.get_workflow_token.outputs.token }}
-
-          # Trigger the workflow run
-          jq -n '{"event_type": "arc", "client_payload": {"release_tag_name": "${{ env.VERSION }}", "push_to_registries": "${{ env.PUSH_TO_REGISTRIES }}" }}' \
-            | gh api -X POST /repos/actions-runner-controller/releases/dispatches --input -
-
-      - name: Job summary
-        run: |
-          echo "The [publish-arc](https://github.com/actions-runner-controller/releases/blob/main/.github/workflows/publish-arc.yaml) workflow has been triggered!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Release tag: ${{ env.VERSION }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Push to registries: ${{ env.PUSH_TO_REGISTRIES }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-          echo "[https://github.com/actions-runner-controller/releases/actions/workflows/publish-arc.yaml](https://github.com/actions-runner-controller/releases/actions/workflows/publish-arc.yaml)" >> $GITHUB_STEP_SUMMARY

.github/workflows/arc-release-runners.yaml

@@ -1,79 +0,0 @@
-name: Release ARC Runner Images
-
-# Revert to https://github.com/actions-runner-controller/releases#releases
-# for details on why we use this approach
-on:
-  # We must do a trigger on a push: instead of a types: closed so GitHub Secrets
-  # are available to the workflow run
-  push:
-    branches:
-      - 'master'
-    paths:
-      - 'runner/VERSION'
-      - '.github/workflows/arc-release-runners.yaml'
-
-env:
-  # Safeguard to prevent pushing images to registeries after build
-  PUSH_TO_REGISTRIES: true
-  TARGET_ORG: actions-runner-controller
-  TARGET_WORKFLOW: release-runners.yaml
-  DOCKER_VERSION: 20.10.23
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  build-runners:
-    name: Trigger Build and Push of Runner Images
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Get runner version
-        id: versions
-        run: |
-          runner_current_version="$(echo -n $(cat runner/VERSION | grep 'RUNNER_VERSION=' | cut -d '=' -f2))"
-          container_hooks_current_version="$(echo -n $(cat runner/VERSION | grep 'RUNNER_CONTAINER_HOOKS_VERSION=' | cut -d '=' -f2))"
-          echo runner_version=$runner_current_version >> $GITHUB_OUTPUT
-          echo container_hooks_version=$container_hooks_current_version >> $GITHUB_OUTPUT
-
-      - name: Get Token
-        id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@8e1ba3bf1619726336414f1014e37f17fbadf1db
-        with:
-          application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
-          application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
-          organization: ${{ env.TARGET_ORG }}
-
-      - name: Trigger Build And Push Runner Images To Registries
-        env:
-          RUNNER_VERSION: ${{ steps.versions.outputs.runner_version }}
-          CONTAINER_HOOKS_VERSION: ${{ steps.versions.outputs.container_hooks_version }}
-        run: |
-          # Authenticate
-          gh auth login --with-token <<< ${{ steps.get_workflow_token.outputs.token }}
-
-          # Trigger the workflow run
-          gh workflow run ${{ env.TARGET_WORKFLOW }} -R ${{ env.TARGET_ORG }}/releases \
-            -f runner_version=${{ env.RUNNER_VERSION }} \
-            -f docker_version=${{ env.DOCKER_VERSION }} \
-            -f runner_container_hooks_version=${{ env.CONTAINER_HOOKS_VERSION }} \
-            -f sha='${{ github.sha }}' \
-            -f push_to_registries=${{ env.PUSH_TO_REGISTRIES }}
-
-      - name: Job summary
-        env:
-          RUNNER_VERSION: ${{ steps.versions.outputs.runner_version }}
-          CONTAINER_HOOKS_VERSION: ${{ steps.versions.outputs.container_hooks_version }}
-        run: |
-          echo "The [release-runners.yaml](https://github.com/actions-runner-controller/releases/blob/main/.github/workflows/release-runners.yaml) workflow has been triggered!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- runner_version: ${{ env.RUNNER_VERSION }}" >> $GITHUB_STEP_SUMMARY
-          echo "- docker_version: ${{ env.DOCKER_VERSION }}" >> $GITHUB_STEP_SUMMARY
-          echo "- runner_container_hooks_version: ${{ env.CONTAINER_HOOKS_VERSION }}" >> $GITHUB_STEP_SUMMARY
-          echo "- sha: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- push_to_registries: ${{ env.PUSH_TO_REGISTRIES }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-          echo "[https://github.com/actions-runner-controller/releases/actions/workflows/release-runners.yaml](https://github.com/actions-runner-controller/releases/actions/workflows/release-runners.yaml)" >> $GITHUB_STEP_SUMMARY

.github/workflows/arc-update-runners-scheduled.yaml

@@ -1,149 +0,0 @@
-# This workflows polls releases from actions/runner and in case of a new one it
-# updates files containing runner version and opens a pull request.
-name: Runner Updates Check (Scheduled Job)
-
-on:
-  schedule:
-    # run daily
-    - cron: "0 9 * * *"
-  workflow_dispatch:
-
-jobs:
-  # check_versions compares our current version and the latest available runner
-  # version and sets them as outputs.
-  check_versions:
-    runs-on: ubuntu-latest
-    env:
-      GH_TOKEN: ${{ github.token }}
-    outputs:
-      runner_current_version: ${{ steps.runner_versions.outputs.runner_current_version }}
-      runner_latest_version: ${{ steps.runner_versions.outputs.runner_latest_version }}
-      container_hooks_current_version: ${{ steps.container_hooks_versions.outputs.container_hooks_current_version }}
-      container_hooks_latest_version: ${{ steps.container_hooks_versions.outputs.container_hooks_latest_version }}
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get runner current and latest versions
-        id: runner_versions
-        run: |
-          CURRENT_VERSION="$(echo -n $(cat runner/VERSION | grep 'RUNNER_VERSION=' | cut -d '=' -f2))"
-          echo "Current version: $CURRENT_VERSION"
-          echo runner_current_version=$CURRENT_VERSION >> $GITHUB_OUTPUT
-
-          LATEST_VERSION=$(gh release list --exclude-drafts --exclude-pre-releases --limit 1 -R actions/runner | grep -oP '(?<=v)[0-9.]+' | head -1)
-          echo "Latest version: $LATEST_VERSION"
-          echo runner_latest_version=$LATEST_VERSION >> $GITHUB_OUTPUT
-
-      - name: Get container-hooks current and latest versions
-        id: container_hooks_versions
-        run: |
-          CURRENT_VERSION="$(echo -n $(cat runner/VERSION | grep 'RUNNER_CONTAINER_HOOKS_VERSION=' | cut -d '=' -f2))"
-          echo "Current version: $CURRENT_VERSION"
-          echo container_hooks_current_version=$CURRENT_VERSION >> $GITHUB_OUTPUT
-
-          LATEST_VERSION=$(gh release list --exclude-drafts --exclude-pre-releases --limit 1 -R actions/runner-container-hooks | grep -oP '(?<=v)[0-9.]+' | head -1)
-          echo "Latest version: $LATEST_VERSION"
-          echo container_hooks_latest_version=$LATEST_VERSION >> $GITHUB_OUTPUT
-
-  # check_pr checks if a PR for the same update already exists. It only runs if
-  # runner latest version != our current version. If no existing PR is found,
-  # it sets a PR name as output.
-  check_pr:
-    runs-on: ubuntu-latest
-    needs: check_versions
-    if: needs.check_versions.outputs.runner_current_version != needs.check_versions.outputs.runner_latest_version || needs.check_versions.outputs.container_hooks_current_version != needs.check_versions.outputs.container_hooks_latest_version
-    outputs:
-      pr_name: ${{ steps.pr_name.outputs.pr_name }}
-    env:
-      GH_TOKEN: ${{ github.token }}
-    steps:
-      - name: debug
-        run:
-          echo "RUNNER_CURRENT_VERSION=${{ needs.check_versions.outputs.runner_current_version }}"
-          echo "RUNNER_LATEST_VERSION=${{ needs.check_versions.outputs.runner_latest_version }}"
-          echo "CONTAINER_HOOKS_CURRENT_VERSION=${{ needs.check_versions.outputs.container_hooks_current_version }}"
-          echo "CONTAINER_HOOKS_LATEST_VERSION=${{ needs.check_versions.outputs.container_hooks_latest_version }}"
-
-      - uses: actions/checkout@v3
-
-      - name: PR Name
-        id: pr_name
-        env:
-          RUNNER_CURRENT_VERSION: ${{ needs.check_versions.outputs.runner_current_version }}
-          RUNNER_LATEST_VERSION: ${{ needs.check_versions.outputs.runner_latest_version }}
-          CONTAINER_HOOKS_CURRENT_VERSION: ${{ needs.check_versions.outputs.container_hooks_current_version }}
-          CONTAINER_HOOKS_LATEST_VERSION: ${{ needs.check_versions.outputs.container_hooks_latest_version }}
-        # Generate a PR name with the following title:
-        # Updates: runner to v2.304.0 and container-hooks to v0.3.1
-        run: |
-          RUNNER_MESSAGE="runner to v${RUNNER_LATEST_VERSION}"
-          CONTAINER_HOOKS_MESSAGE="container-hooks to v${CONTAINER_HOOKS_LATEST_VERSION}"
-          
-          PR_NAME="Updates:"
-          if [ "$RUNNER_CURRENT_VERSION" != "$RUNNER_LATEST_VERSION" ]
-          then
-            PR_NAME="$PR_NAME $RUNNER_MESSAGE"
-          fi
-          if [ "$CONTAINER_HOOKS_CURRENT_VERSION" != "$CONTAINER_HOOKS_LATEST_VERSION" ]
-          then
-            PR_NAME="$PR_NAME $CONTAINER_HOOKS_MESSAGE"
-          fi
-          
-          result=$(gh pr list --search "$PR_NAME" --json number --jq ".[].number" --limit 1)
-          if [ -z "$result" ]
-          then
-            echo "No existing PRs found, setting output with pr_name=$PR_NAME"
-            echo pr_name=$PR_NAME >> $GITHUB_OUTPUT
-          else
-            echo "Found a PR with title '$PR_NAME' already existing: ${{ github.server_url }}/${{ github.repository }}/pull/$result"
-          fi
-
-  # update_version updates runner version in the files listed below, commits
-  # the changes and opens a pull request as `github-actions` bot.
-  update_version:
-    runs-on: ubuntu-latest
-    needs:
-      - check_versions
-      - check_pr
-    if: needs.check_pr.outputs.pr_name
-    permissions:
-      pull-requests: write
-      contents: write
-      actions: write
-    env:
-      GH_TOKEN: ${{ github.token }}
-      RUNNER_CURRENT_VERSION: ${{ needs.check_versions.outputs.runner_current_version }}
-      RUNNER_LATEST_VERSION: ${{ needs.check_versions.outputs.runner_latest_version }}
-      CONTAINER_HOOKS_CURRENT_VERSION: ${{ needs.check_versions.outputs.container_hooks_current_version }}
-      CONTAINER_HOOKS_LATEST_VERSION: ${{ needs.check_versions.outputs.container_hooks_latest_version }}
-      PR_NAME: ${{ needs.check_pr.outputs.pr_name }}
-
-    steps:
-      - uses: actions/checkout@v3
-      
-      - name: New branch
-        run: git checkout -b update-runner-"$(date +%Y-%m-%d)"
-      
-      - name: Update files
-        run: |
-          sed -i "s/$RUNNER_CURRENT_VERSION/$RUNNER_LATEST_VERSION/g" runner/VERSION
-          sed -i "s/$RUNNER_CURRENT_VERSION/$RUNNER_LATEST_VERSION/g" runner/Makefile
-          sed -i "s/$RUNNER_CURRENT_VERSION/$RUNNER_LATEST_VERSION/g" Makefile
-          sed -i "s/$RUNNER_CURRENT_VERSION/$RUNNER_LATEST_VERSION/g" test/e2e/e2e_test.go
-          
-          sed -i "s/$CONTAINER_HOOKS_CURRENT_VERSION/$CONTAINER_HOOKS_LATEST_VERSION/g" runner/VERSION
-          sed -i "s/$CONTAINER_HOOKS_CURRENT_VERSION/$CONTAINER_HOOKS_LATEST_VERSION/g" runner/Makefile
-          sed -i "s/$CONTAINER_HOOKS_CURRENT_VERSION/$CONTAINER_HOOKS_LATEST_VERSION/g" Makefile
-          sed -i "s/$CONTAINER_HOOKS_CURRENT_VERSION/$CONTAINER_HOOKS_LATEST_VERSION/g" test/e2e/e2e_test.go
-
-      - name: Commit changes
-        run: |
-          # from https://github.com/orgs/community/discussions/26560
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git config user.name "github-actions[bot]"
-          git add .
-          git commit -m "$PR_NAME"
-          git push -u origin HEAD
-
-      - name: Create pull request
-        run: gh pr create -f -l "runners update"

.github/workflows/arc-validate-runners.yaml

@@ -1,52 +0,0 @@
-name: Validate ARC Runners
-
-on:
-  pull_request:
-    branches:
-      - '**'
-    paths:
-      - 'runner/**'
-      - 'test/startup/**'
-      - '!**.md'
-
-permissions:
-  contents: read
-
-concurrency:
-  # This will make sure we only apply the concurrency limits on pull requests 
-  # but not pushes to master branch by making the concurrency group name unique
-  # for pushes
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  shellcheck:
-    name: runner / shellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: shellcheck
-        uses: reviewdog/action-shellcheck@v1
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          path: "./runner"
-          pattern: |
-            *.sh
-            *.bash
-            update-status
-          # Make this consistent with `make shellsheck`
-          shellcheck_flags: "--shell bash --source-path runner"
-          exclude: "./.git/*"
-          check_all_files_with_shebangs: "false"
-          # Set this to "true" once we addressed all the shellcheck findings
-          fail_on_error: "false"
-  test-runner-entrypoint:
-    name: Test entrypoint
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Run tests
-      run: |
-        make acceptance/runner/startup

.github/workflows/gha-e2e-tests.yaml

@@ -1,882 +0,0 @@
-name: (gha) E2E Tests
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  TARGET_ORG: actions-runner-controller
-  TARGET_REPO: arc_e2e_test_dummy
-  IMAGE_NAME: "arc-test-image"
-  IMAGE_VERSION: "0.7.0"
-
-concurrency:
-  # This will make sure we only apply the concurrency limits on pull requests
-  # but not pushes to master branch by making the concurrency group name unique
-  # for pushes
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  default-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-workflow.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  single-namespace-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-workflow.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          kubectl create namespace arc-runners
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          --set flags.watchSingleNamespace=arc-runners \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  dind-mode-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: arc-test-dind-workflow.yaml
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          --set containerMode.type="dind" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  kubernetes-mode-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-kubernetes-workflow.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          echo "Install openebs/dynamic-localpv-provisioner"
-          helm repo add openebs https://openebs.github.io/charts
-          helm repo update
-          helm install openebs openebs/openebs -n openebs --create-namespace
-
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-          kubectl wait --timeout=30s --for=condition=ready pod -n openebs -l name=openebs-localpv-provisioner
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          --set containerMode.type="kubernetes" \
-          --set containerMode.kubernetesModeWorkVolumeClaim.accessModes={"ReadWriteOnce"} \
-          --set containerMode.kubernetesModeWorkVolumeClaim.storageClassName="openebs-hostpath" \
-          --set containerMode.kubernetesModeWorkVolumeClaim.resources.requests.storage="1Gi" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  auth-proxy-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-workflow.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          docker run -d \
-            --name squid \
-            --publish 3128:3128 \
-            huangtingluo/squid-proxy:latest
-          kubectl create namespace arc-runners
-          kubectl create secret generic proxy-auth \
-            --namespace=arc-runners \
-            --from-literal=username=github \
-            --from-literal=password='actions'
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          --set proxy.https.url="http://host.minikube.internal:3128" \
-          --set proxy.https.credentialSecretRef="proxy-auth" \
-          --set "proxy.noProxy[0]=10.96.0.1:443" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  anonymous-proxy-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-workflow.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          docker run -d \
-            --name squid \
-            --publish 3128:3128 \
-            ubuntu/squid:latest
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          --set proxy.https.url="http://host.minikube.internal:3128" \
-          --set "proxy.noProxy[0]=10.96.0.1:443" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  self-signed-ca-setup:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-workflow.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          docker run -d \
-            --rm \
-            --name mitmproxy \
-            --publish 8080:8080 \
-            -v ${{ github.workspace }}/mitmproxy:/home/mitmproxy/.mitmproxy \
-            mitmproxy/mitmproxy:latest \
-            mitmdump
-          count=0
-          while true; do
-            if [ -f "${{ github.workspace }}/mitmproxy/mitmproxy-ca-cert.pem" ]; then
-              echo "CA cert generated"
-              cat ${{ github.workspace }}/mitmproxy/mitmproxy-ca-cert.pem
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for mitmproxy generate its CA cert"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          sudo cp ${{ github.workspace }}/mitmproxy/mitmproxy-ca-cert.pem ${{ github.workspace }}/mitmproxy/mitmproxy-ca-cert.crt
-          sudo chown runner ${{ github.workspace }}/mitmproxy/mitmproxy-ca-cert.crt
-          kubectl create namespace arc-runners
-          kubectl -n arc-runners create configmap ca-cert --from-file="${{ github.workspace }}/mitmproxy/mitmproxy-ca-cert.crt"
-          kubectl -n arc-runners get configmap ca-cert -o yaml
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          --set proxy.https.url="http://host.minikube.internal:8080" \
-          --set "proxy.noProxy[0]=10.96.0.1:443" \
-          --set "githubServerTLS.certificateFrom.configMapKeyRef.name=ca-cert" \
-          --set "githubServerTLS.certificateFrom.configMapKeyRef.key=mitmproxy-ca-cert.crt" \
-          --set "githubServerTLS.runnerMountPath=/usr/local/share/ca-certificates/" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Test ARC E2E
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-
-  update-strategy-tests:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.id == github.repository_id
-    env:
-      WORKFLOW_FILE: "arc-test-sleepy-matrix.yaml"
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{github.head_ref}}
-
-      - uses: ./.github/actions/setup-arc-e2e
-        id: setup
-        with:
-          app-id: ${{secrets.E2E_TESTS_ACCESS_APP_ID}}
-          app-pk: ${{secrets.E2E_TESTS_ACCESS_PK}}
-          image-name: ${{env.IMAGE_NAME}}
-          image-tag: ${{env.IMAGE_VERSION}}
-          target-org: ${{env.TARGET_ORG}}
-
-      - name: Install gha-runner-scale-set-controller
-        id: install_arc_controller
-        run: |
-          helm install arc \
-          --namespace "arc-systems" \
-          --create-namespace \
-          --set image.repository=${{ env.IMAGE_NAME }} \
-          --set image.tag=${{ env.IMAGE_VERSION }} \
-          --set flags.updateStrategy="eventual" \
-          ./charts/gha-runner-scale-set-controller \
-          --debug
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l app.kubernetes.io/name=gha-rs-controller -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for controller pod with label app.kubernetes.io/name=gha-rs-controller"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l app.kubernetes.io/name=gha-rs-controller
-          kubectl get pod -n arc-systems
-          kubectl describe deployment arc-gha-rs-controller -n arc-systems
-
-      - name: Install gha-runner-scale-set
-        id: install_arc
-        run: |
-          ARC_NAME=${{github.job}}-$(date +'%M%S')$((($RANDOM + 100) % 100 + 1))
-          helm install "$ARC_NAME" \
-          --namespace "arc-runners" \
-          --create-namespace \
-          --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{env.TARGET_REPO}}" \
-          --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-          ./charts/gha-runner-scale-set \
-          --debug
-          echo "ARC_NAME=$ARC_NAME" >> $GITHUB_OUTPUT
-          count=0
-          while true; do
-            POD_NAME=$(kubectl get pods -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME -o name)
-            if [ -n "$POD_NAME" ]; then
-              echo "Pod found: $POD_NAME"
-              break
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener pod with label actions.github.com/scale-set-name=$ARC_NAME"
-              exit 1
-            fi
-            sleep 1
-            count=$((count+1))
-          done
-          kubectl wait --timeout=30s --for=condition=ready pod -n arc-systems -l actions.github.com/scale-set-name=$ARC_NAME
-          kubectl get pod -n arc-systems
-
-      - name: Trigger long running jobs and wait for runners to pick them up
-        uses: ./.github/actions/execute-assert-arc-e2e
-        timeout-minutes: 10
-        with:
-          auth-token: ${{ steps.setup.outputs.token }}
-          repo-owner: ${{ env.TARGET_ORG }}
-          repo-name: ${{env.TARGET_REPO}}
-          workflow-file: ${{env.WORKFLOW_FILE}}
-          arc-name: ${{steps.install_arc.outputs.ARC_NAME}}
-          arc-namespace: "arc-runners"
-          arc-controller-namespace: "arc-systems"
-          wait-to-running: "true"
-          wait-to-finish: "false"
-
-      - name: Upgrade the gha-runner-scale-set
-        shell: bash
-        run: |
-          helm upgrade --install "${{ steps.install_arc.outputs.ARC_NAME }}" \
-            --namespace "arc-runners" \
-            --create-namespace \
-            --set githubConfigUrl="https://github.com/${{ env.TARGET_ORG }}/${{ env.TARGET_REPO }}" \
-            --set githubConfigSecret.github_token="${{ steps.setup.outputs.token }}" \
-            --set template.spec.containers[0].name="runner" \
-            --set template.spec.containers[0].image="ghcr.io/actions/actions-runner:latest" \
-            --set template.spec.containers[0].command={"/home/runner/run.sh"} \
-            --set template.spec.containers[0].env[0].name="TEST" \
-            --set template.spec.containers[0].env[0].value="E2E TESTS" \
-            ./charts/gha-runner-scale-set \
-            --debug
-
-      - name: Assert that the listener is deleted while jobs are running
-        shell: bash
-        run: |
-          count=0
-          while true; do
-            LISTENER_COUNT="$(kubectl get pods -l actions.github.com/scale-set-name=${{ steps.install_arc.outputs.ARC_NAME }} -n arc-systems --field-selector=status.phase=Running -o=jsonpath='{.items}' | jq 'length')"
-            RUNNERS_COUNT="$(kubectl get pods -l app.kubernetes.io/component=runner -n arc-runners --field-selector=status.phase=Running -o=jsonpath='{.items}' | jq 'length')"
-            RESOURCES="$(kubectl get pods -A)"
-
-            if [ "$LISTENER_COUNT" -eq 0 ]; then
-              echo "Listener has been deleted"
-              echo "$RESOURCES"
-              exit 0
-            fi
-            if [ "$count" -ge 60 ]; then
-              echo "Timeout waiting for listener to be deleted"
-              echo "$RESOURCES"
-              exit 1
-            fi
-
-            echo "Waiting for listener to be deleted"
-            echo "Listener count: $LISTENER_COUNT target: 0 | Runners count: $RUNNERS_COUNT target: 3"
-
-            sleep 1
-            count=$((count+1))
-          done
-
-      - name: Assert that the listener goes back up after the jobs are done
-        shell: bash
-        run: |
-          count=0
-          while true; do
-            LISTENER_COUNT="$(kubectl get pods -l actions.github.com/scale-set-name=${{ steps.install_arc.outputs.ARC_NAME }} -n arc-systems --field-selector=status.phase=Running -o=jsonpath='{.items}' | jq 'length')"
-            RUNNERS_COUNT="$(kubectl get pods -l app.kubernetes.io/component=runner -n arc-runners --field-selector=status.phase=Running -o=jsonpath='{.items}' | jq 'length')"
-            RESOURCES="$(kubectl get pods -A)"
-
-            if [ "$LISTENER_COUNT" -eq 1 ]; then
-              echo "Listener is up!"
-              echo "$RESOURCES"
-              exit 0
-            fi
-            if [ "$count" -ge 120 ]; then
-              echo "Timeout waiting for listener to be recreated"
-              echo "$RESOURCES"
-              exit 1
-            fi
-
-            echo "Waiting for listener to be recreated"
-            echo "Listener count: $LISTENER_COUNT target: 1 | Runners count: $RUNNERS_COUNT target: 0"
-
-            sleep 1
-            count=$((count+1))
-          done
-
-      - name: Gather logs and cleanup
-        shell: bash
-        if: always()
-        run: |
-          helm uninstall "${{ steps.install_arc.outputs.ARC_NAME }}" --namespace "arc-runners" --debug
-          kubectl wait --timeout=10s --for=delete AutoScalingRunnerSet -n "${{ steps.install_arc.outputs.ARC_NAME }}" -l app.kubernetes.io/instance="${{ steps.install_arc.outputs.ARC_NAME }}"
-          kubectl logs deployment/arc-gha-rs-controller -n "arc-systems"

.github/workflows/gha-publish-chart.yaml

@@ -1,212 +0,0 @@
-name: (gha) Publish Helm Charts
-
-on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'The branch, tag or SHA to cut a release from'
-        required: false
-        type: string
-        default: ''
-      release_tag_name:
-        description: 'The name to tag the controller image with'
-        required: true
-        type: string
-        default: 'canary'
-      push_to_registries:
-        description: 'Push images to registries'
-        required: true
-        type: boolean
-        default: false
-      publish_gha_runner_scale_set_controller_chart:
-        description: 'Publish new helm chart for gha-runner-scale-set-controller'
-        required: true
-        type: boolean
-        default: false
-      publish_gha_runner_scale_set_chart:
-        description: 'Publish new helm chart for gha-runner-scale-set'
-        required: true
-        type: boolean
-        default: false
-
-env:
-  HELM_VERSION: v3.8.0
-
-permissions:
-  packages: write
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  build-push-image:
-    name: Build and push controller image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          # If inputs.ref is empty, it'll resolve to the default branch
-          ref: ${{ inputs.ref }}
-
-      - name: Check chart versions
-        # Binary version and chart versions need to match.
-        # In case of an upgrade, the controller will try to clean up
-        # resources with older versions that should have been cleaned up
-        # during the upgrade process
-        run: ./hack/check-gh-chart-versions.sh ${{ inputs.release_tag_name }}
-
-      - name: Resolve parameters
-        id: resolve_parameters
-        run: |
-          resolvedRef="${{ inputs.ref }}"
-          if [ -z "$resolvedRef" ]
-          then
-            resolvedRef="${{ github.ref }}"
-          fi
-          echo "resolved_ref=$resolvedRef" >> $GITHUB_OUTPUT
-          echo "INFO: Resolving short SHA for $resolvedRef"
-          echo "short_sha=$(git rev-parse --short $resolvedRef)" >> $GITHUB_OUTPUT
-          echo "INFO: Normalizing repository name (lowercase)"
-          echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          # Pinning v0.9.1 for Buildx and BuildKit v0.10.6
-          # BuildKit v0.11 which has a bug causing intermittent
-          # failures pushing images to GHCR
-          version: v0.9.1
-          driver-opts: image=moby/buildkit:v0.10.6
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build & push controller image
-        uses: docker/build-push-action@v3
-        with:
-          file: Dockerfile
-          platforms: linux/amd64,linux/arm64
-          build-args: VERSION=${{ inputs.release_tag_name }}
-          push: ${{ inputs.push_to_registries }}
-          tags: |
-            ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/gha-runner-scale-set-controller:${{ inputs.release_tag_name }}
-            ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/gha-runner-scale-set-controller:${{ inputs.release_tag_name }}-${{ steps.resolve_parameters.outputs.short_sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Job summary
-        run: |
-          echo "The [gha-publish-chart.yaml](https://github.com/actions/actions-runner-controller/blob/main/.github/workflows/gha-publish-chart.yaml) workflow run was completed successfully!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Ref: ${{ steps.resolve_parameters.outputs.resolvedRef }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Release tag: ${{ inputs.release_tag_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Push to registries: ${{ inputs.push_to_registries }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-
-  publish-helm-chart-gha-runner-scale-set-controller:
-    if: ${{ inputs.publish_gha_runner_scale_set_controller_chart == true }}
-    needs: build-push-image
-    name: Publish Helm chart for gha-runner-scale-set-controller
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          # If inputs.ref is empty, it'll resolve to the default branch
-          ref: ${{ inputs.ref }}
-
-      - name: Resolve parameters
-        id: resolve_parameters
-        run: |
-          resolvedRef="${{ inputs.ref }}"
-          if [ -z "$resolvedRef" ]
-          then
-            resolvedRef="${{ github.ref }}"
-          fi
-          echo "INFO: Resolving short SHA for $resolvedRef"
-          echo "short_sha=$(git rev-parse --short $resolvedRef)" >> $GITHUB_OUTPUT
-          echo "INFO: Normalizing repository name (lowercase)"
-          echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up Helm
-        # Using https://github.com/Azure/setup-helm/releases/tag/v3.5
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
-        with:
-          version: ${{ env.HELM_VERSION }}
-
-      - name: Publish new helm chart for gha-runner-scale-set-controller
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | helm registry login ghcr.io --username ${{ github.actor }} --password-stdin
-          GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG=$(cat charts/gha-runner-scale-set-controller/Chart.yaml | grep version: | cut -d " " -f 2)
-          echo "GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG=${GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG}" >> $GITHUB_ENV
-          helm package charts/gha-runner-scale-set-controller/ --version="${GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG}"
-          helm push gha-runner-scale-set-controller-"${GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG}".tgz oci://ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/actions-runner-controller-charts
-
-      - name: Job summary
-        run: |
-          echo "New helm chart for gha-runner-scale-set-controller published successfully!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Ref: ${{ steps.resolve_parameters.outputs.resolvedRef }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- gha-runner-scale-set-controller Chart version: ${{ env.GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG }}" >> $GITHUB_STEP_SUMMARY
-
-  publish-helm-chart-gha-runner-scale-set:
-    if: ${{ inputs.publish_gha_runner_scale_set_chart == true }}
-    needs: build-push-image
-    name: Publish Helm chart for gha-runner-scale-set
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          # If inputs.ref is empty, it'll resolve to the default branch
-          ref: ${{ inputs.ref }}
-
-      - name: Resolve parameters
-        id: resolve_parameters
-        run: |
-          resolvedRef="${{ inputs.ref }}"
-          if [ -z "$resolvedRef" ]
-          then
-            resolvedRef="${{ github.ref }}"
-          fi
-          echo "INFO: Resolving short SHA for $resolvedRef"
-          echo "short_sha=$(git rev-parse --short $resolvedRef)" >> $GITHUB_OUTPUT
-          echo "INFO: Normalizing repository name (lowercase)"
-          echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up Helm
-        # Using https://github.com/Azure/setup-helm/releases/tag/v3.5
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
-        with:
-          version: ${{ env.HELM_VERSION }}
-
-      - name: Publish new helm chart for gha-runner-scale-set
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | helm registry login ghcr.io --username ${{ github.actor }} --password-stdin
-
-          GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG=$(cat charts/gha-runner-scale-set/Chart.yaml | grep version: | cut -d " " -f 2)
-          echo "GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG=${GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG}" >> $GITHUB_ENV
-          helm package charts/gha-runner-scale-set/ --version="${GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG}"
-          helm push gha-runner-scale-set-"${GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG}".tgz oci://ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/actions-runner-controller-charts
-
-      - name: Job summary
-        run: |
-          echo "New helm chart for gha-runner-scale-set published successfully!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Ref: ${{ steps.resolve_parameters.outputs.resolvedRef }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- gha-runner-scale-set Chart version: ${{ env.GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/gha-validate-chart.yaml

@@ -1,125 +0,0 @@
-name: (gha) Validate Helm Charts
-
-on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - 'charts/**'
-      - '.github/workflows/gha-validate-chart.yaml'
-      - '!charts/actions-runner-controller/**'
-      - '!**.md'
-  push:
-    paths:
-      - 'charts/**'
-      - '.github/workflows/gha-validate-chart.yaml'
-      - '!charts/actions-runner-controller/**'
-      - '!**.md'
-  workflow_dispatch:
-env:
-  KUBE_SCORE_VERSION: 1.16.1
-  HELM_VERSION: v3.8.0
-
-permissions:
-  contents: read
-
-concurrency:
-  # This will make sure we only apply the concurrency limits on pull requests
-  # but not pushes to master branch by making the concurrency group name unique
-  # for pushes
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  validate-chart:
-    name: Lint Chart
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Helm
-        # Using https://github.com/Azure/setup-helm/releases/tag/v3.5
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
-        with:
-          version: ${{ env.HELM_VERSION }}
-
-      - name: Set up kube-score
-        run: |
-          wget https://github.com/zegl/kube-score/releases/download/v${{ env.KUBE_SCORE_VERSION }}/kube-score_${{ env.KUBE_SCORE_VERSION }}_linux_amd64 -O kube-score
-          chmod 755 kube-score
-
-      - name: Kube-score generated manifests
-        run: helm template  --values charts/.ci/values-kube-score.yaml charts/* | ./kube-score score -
-              --ignore-test pod-networkpolicy
-              --ignore-test deployment-has-poddisruptionbudget
-              --ignore-test deployment-has-host-podantiaffinity
-              --ignore-test container-security-context
-              --ignore-test pod-probes
-              --ignore-test container-image-tag
-              --enable-optional-test container-security-context-privileged
-              --enable-optional-test container-security-context-readonlyrootfilesystem
-
-      # python is a requirement for the chart-testing action below (supports yamllint among other tests)
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-
-      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.0
-
-      - name: Run chart-testing (list-changed)
-        id: list-changed
-        run: |
-          ct version
-          changed=$(ct list-changed --config charts/.ci/ct-config-gha.yaml)
-          if [[ -n "$changed" ]]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Run chart-testing (lint)
-        run: |
-          ct lint --config charts/.ci/ct-config-gha.yaml
-
-      - name: Set up docker buildx
-        uses: docker/setup-buildx-action@v2
-        if: steps.list-changed.outputs.changed == 'true'
-        with:
-          version: latest
-
-      - name: Build controller image
-        uses: docker/build-push-action@v3
-        if: steps.list-changed.outputs.changed == 'true'
-        with:
-          file: Dockerfile
-          platforms: linux/amd64
-          load: true
-          build-args: |
-            DOCKER_IMAGE_NAME=test-arc
-            VERSION=dev
-          tags: |
-            test-arc:dev
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.4.0
-        if: steps.list-changed.outputs.changed == 'true'
-        with:
-          cluster_name: chart-testing
-
-      - name: Load image into cluster
-        if: steps.list-changed.outputs.changed == 'true'
-        run: |
-            export DOCKER_IMAGE_NAME=test-arc
-            export VERSION=dev
-            export IMG_RESULT=load
-            make docker-buildx
-            kind load docker-image test-arc:dev --name chart-testing
-
-      - name: Run chart-testing (install)
-        if: steps.list-changed.outputs.changed == 'true'
-        run: |
-          ct install --config charts/.ci/ct-config-gha.yaml

.github/workflows/global-publish-canary.yaml

@@ -1,133 +0,0 @@
-name: Publish Canary Images
-
-# Revert to https://github.com/actions-runner-controller/releases#releases
-# for details on why we use this approach
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**.md'
-      - '.github/actions/**'
-      - '.github/ISSUE_TEMPLATE/**'
-      - '.github/workflows/e2e-test-dispatch-workflow.yaml'
-      - '.github/workflows/gha-e2e-tests.yaml'
-      - '.github/workflows/arc-publish.yaml'
-      - '.github/workflows/arc-publish-chart.yaml'
-      - '.github/workflows/gha-publish-chart.yaml'
-      - '.github/workflows/arc-release-runners.yaml'
-      - '.github/workflows/global-run-codeql.yaml'
-      - '.github/workflows/global-run-first-interaction.yaml'
-      - '.github/workflows/global-run-stale.yaml'
-      - '.github/workflows/arc-update-runners-scheduled.yaml'
-      - '.github/workflows/validate-arc.yaml'
-      - '.github/workflows/arc-validate-chart.yaml'
-      - '.github/workflows/gha-validate-chart.yaml'
-      - '.github/workflows/arc-validate-runners.yaml'
-      - '.github/dependabot.yml'
-      - '.github/RELEASE_NOTE_TEMPLATE.md'
-      - 'runner/**'
-      - '.gitignore'
-      - 'PROJECT'
-      - 'LICENSE'
-      - 'Makefile'
-
-# https://docs.github.com/en/rest/overview/permissions-required-for-github-apps
-permissions:
-  contents: read
-  packages: write
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
-env:
-  # Safeguard to prevent pushing images to registeries after build
-  PUSH_TO_REGISTRIES: true
-
-jobs:
-  legacy-canary-build:
-    name: Build and Publish Legacy Canary Image
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      TARGET_ORG: actions-runner-controller
-      TARGET_REPO: actions-runner-controller
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Get Token
-        id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@8e1ba3bf1619726336414f1014e37f17fbadf1db
-        with:
-          application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
-          application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
-          organization: ${{ env.TARGET_ORG }}
-
-      - name: Trigger Build And Push Images To Registries
-        run: |
-          # Authenticate
-          gh auth login --with-token <<< ${{ steps.get_workflow_token.outputs.token }}
-
-          # Trigger the workflow run
-          jq -n '{"event_type": "canary", "client_payload": {"sha": "${{ github.sha }}", "push_to_registries": ${{ env.PUSH_TO_REGISTRIES }}}}' \
-            | gh api -X POST /repos/actions-runner-controller/releases/dispatches --input -
-
-      - name: Job summary
-        run: |
-          echo "The [publish-canary](https://github.com/actions-runner-controller/releases/blob/main/.github/workflows/publish-canary.yaml) workflow has been triggered!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- sha: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Push to registries: ${{ env.PUSH_TO_REGISTRIES }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-          echo "[https://github.com/actions-runner-controller/releases/actions/workflows/publish-canary.yaml](https://github.com/actions-runner-controller/releases/actions/workflows/publish-canary.yaml)" >> $GITHUB_STEP_SUMMARY
-
-  canary-build:
-    name: Build and Publish gha-runner-scale-set-controller Canary Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Normalization is needed because upper case characters are not allowed in the repository name
-      # and the short sha is needed for image tagging
-      - name: Resolve parameters
-        id: resolve_parameters
-        run: |
-          echo "INFO: Resolving short sha"
-          echo "short_sha=$(git rev-parse --short ${{ github.ref }})" >> $GITHUB_OUTPUT
-          echo "INFO: Normalizing repository name (lowercase)"
-          echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-
-      # Unstable builds - run at your own risk
-      - name: Build and Push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          build-args: VERSION=canary-${{ steps.resolve_parameters.outputs.short_sha }}
-          push: ${{ env.PUSH_TO_REGISTRIES }}
-          tags: |
-            ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/gha-runner-scale-set-controller:canary
-            ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/gha-runner-scale-set-controller:canary-${{ steps.resolve_parameters.outputs.short_sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/global-run-first-interaction.yaml

@@ -1,29 +0,0 @@
-name: First Interaction
-
-on:
-  issues:
-    types: [opened]
-  pull_request:
-    branches: [master]
-    types: [opened]
-
-jobs:
-  check_for_first_interaction:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/first-interaction@main
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-message: |
-            Hello! Thank you for filing an issue.
-
-            The maintainers will triage your issue shortly.
-
-            In the meantime, please take a look at the [troubleshooting guide](https://github.com/actions/actions-runner-controller/blob/master/TROUBLESHOOTING.md) for bug reports.
-            
-            If this is a feature request, please review our [contribution guidelines](https://github.com/actions/actions-runner-controller/blob/master/CONTRIBUTING.md).
-          pr-message: |
-            Hello! Thank you for your contribution.
-
-            Please review our [contribution guidelines](https://github.com/actions/actions-runner-controller/blob/master/CONTRIBUTING.md) to understand the project's testing and code conventions.

.github/workflows/go.yaml

@@ -1,88 +0,0 @@
-name: Go
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.github/workflows/go.yaml'
-      - '**.go'
-      - 'go.mod'
-      - 'go.sum'
-  pull_request:
-    paths:
-      - '.github/workflows/go.yaml'
-      - '**.go'
-      - 'go.mod'
-      - 'go.sum'
-
-permissions:
-  contents: read
-
-concurrency:
-  # This will make sure we only apply the concurrency limits on pull requests
-  # but not pushes to master branch by making the concurrency group name unique
-  # for pushes
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: 'go.mod'
-          cache: false
-      - name: fmt
-        run: go fmt ./...
-      - name: Check diff
-        run: git diff --exit-code
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: 'go.mod'
-          cache: false
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          only-new-issues: true
-          version: v1.55.2
-
-  generate:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: 'go.mod'
-          cache: false
-      - name: Generate
-        run: make generate
-      - name: Check diff
-        run: git diff --exit-code
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: 'go.mod'
-      - run: make manifests
-      - name: Check diff
-        run: git diff --exit-code
-      - name: Install kubebuilder
-        run: |
-          curl -D headers.txt -fsL "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-1.26.1-linux-amd64.tar.gz" -o kubebuilder-tools
-          echo "$(grep -i etag headers.txt -m 1 | cut -d'"' -f2) kubebuilder-tools" > sum
-          md5sum -c sum
-          tar -zvxf kubebuilder-tools
-          sudo mv kubebuilder /usr/local/
-      - name: Run go tests
-        run: |
-          go test -short `go list ./... | grep -v ./test_e2e_arc`

.github/workflows/publish-arc.yaml

@@ -0,0 +1,70 @@
+name: Publish ARC
+
+on:
+  release:
+    types:
+      - published
+
+# https://docs.github.com/en/rest/overview/permissions-required-for-github-apps
+permissions:
+ contents: write 
+ packages: write
+
+jobs:
+  release-controller:
+    name: Release
+    runs-on: ubuntu-latest
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USER }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.18.2'
+
+      - name: Install tools
+        run: |
+          curl -L -O https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.2.0/kubebuilder_2.2.0_linux_amd64.tar.gz
+          tar zxvf kubebuilder_2.2.0_linux_amd64.tar.gz
+          sudo mv kubebuilder_2.2.0_linux_amd64 /usr/local/kubebuilder
+          curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash
+          sudo mv kustomize /usr/local/bin
+          curl -L -O https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz
+          tar zxvf ghr_v0.13.0_linux_amd64.tar.gz
+          sudo mv ghr_v0.13.0_linux_amd64/ghr /usr/local/bin
+
+      - name: Set version
+        run: echo "VERSION=$(cat ${GITHUB_EVENT_PATH} | jq -r '.release.tag_name')" >> $GITHUB_ENV
+
+      - name: Upload artifacts
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          make github-release
+
+      - name: Setup Docker Environment
+        id: vars
+        uses: ./.github/actions/setup-docker-environment
+        with:
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+          ghcr_username: ${{ github.actor }}
+          ghcr_password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and Push
+        uses: docker/build-push-action@v3
+        with:
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ env.DOCKERHUB_USERNAME }}/actions-runner-controller:latest
+            ${{ env.DOCKERHUB_USERNAME }}/actions-runner-controller:${{ env.VERSION }}
+            ${{ env.DOCKERHUB_USERNAME }}/actions-runner-controller:${{ env.VERSION }}-${{ steps.vars.outputs.sha_short }}
+            ghcr.io/actions-runner-controller/actions-runner-controller:latest
+            ghcr.io/actions-runner-controller/actions-runner-controller:${{ env.VERSION }}
+            ghcr.io/actions-runner-controller/actions-runner-controller:${{ env.VERSION }}-${{ steps.vars.outputs.sha_short }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/publish-canary.yaml

@@ -0,0 +1,58 @@
+name: Publish Canary Image
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/workflows/validate-chart.yaml'
+      - '.github/workflows/publish-chart.yaml'
+      - '.github/workflows/publish-arc.yaml'
+      - '.github/workflows/runners.yaml'
+      - '.github/workflows/validate-entrypoint.yaml'
+      - '.github/renovate.*'
+      - 'runner/**'
+      - '.gitignore'
+      - 'PROJECT'
+      - 'LICENSE'
+      - 'Makefile'
+
+# https://docs.github.com/en/rest/overview/permissions-required-for-github-apps
+permissions:
+  contents: read
+  packages: write  
+
+jobs:
+  canary-build:
+    name: Build and Publish Canary Image  
+    runs-on: ubuntu-latest
+    env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USER }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Docker Environment
+        id: vars
+        uses: ./.github/actions/setup-docker-environment
+        with:
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+          ghcr_username: ${{ github.actor }}
+          ghcr_password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Considered unstable builds
+      # See Issue #285, PR #286, and PR #323 for more information
+      - name: Build and Push
+        uses: docker/build-push-action@v3
+        with:
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ env.DOCKERHUB_USERNAME }}/actions-runner-controller:canary
+            ghcr.io/actions-runner-controller/actions-runner-controller:canary
+          cache-from: type=gha,scope=arc-canary
+          cache-to: type=gha,mode=max,scope=arc-canary

.github/workflows/publish-chart.yaml

@@ -0,0 +1,127 @@
+name: Publish Helm Chart
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'charts/**'
+      - '.github/workflows/publish-chart.yaml'
+      - '!charts/actions-runner-controller/docs/**'
+      - '!**.md'
+  workflow_dispatch:
+
+env:
+  KUBE_SCORE_VERSION: 1.10.0
+  HELM_VERSION: v3.8.0
+
+permissions:
+  contents: read
+
+jobs:
+  lint-chart:
+    name: Lint Chart
+    runs-on: ubuntu-latest
+    outputs:
+      publish-chart: ${{ steps.publish-chart-step.outputs.publish }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v3.0
+        with:
+          version: ${{ env.HELM_VERSION }}
+
+      - name: Set up kube-score
+        run: |
+          wget https://github.com/zegl/kube-score/releases/download/v${{ env.KUBE_SCORE_VERSION }}/kube-score_${{ env.KUBE_SCORE_VERSION }}_linux_amd64 -O kube-score
+          chmod 755 kube-score
+
+      - name: Kube-score generated manifests
+        run: helm template  --values charts/.ci/values-kube-score.yaml charts/* | ./kube-score score -
+              --ignore-test pod-networkpolicy
+              --ignore-test deployment-has-poddisruptionbudget
+              --ignore-test deployment-has-host-podantiaffinity
+              --ignore-test container-security-context
+              --ignore-test pod-probes
+              --ignore-test container-image-tag
+              --enable-optional-test container-security-context-privileged
+              --enable-optional-test container-security-context-readonlyrootfilesystem
+
+      # python is a requirement for the chart-testing action below (supports yamllint among other tests)
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.7'
+
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.2.1
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --config charts/.ci/ct-config.yaml)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi
+
+      - name: Run chart-testing (lint)
+        run: |
+          ct lint --config charts/.ci/ct-config.yaml
+
+      - name: Create kind cluster
+        if: steps.list-changed.outputs.changed == 'true'
+        uses: helm/kind-action@v1.3.0
+
+      # We need cert-manager already installed in the cluster because we assume the CRDs exist
+      - name: Install cert-manager
+        if: steps.list-changed.outputs.changed == 'true'      
+        run: |
+          helm repo add jetstack https://charts.jetstack.io --force-update
+          helm install cert-manager jetstack/cert-manager --set installCRDs=true --wait
+
+      - name: Run chart-testing (install)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install --config charts/.ci/ct-config.yaml
+
+      # WARNING: This relies on the latest release being inat the top of the JSON from GitHub and a clean chart.yaml
+      - name: Check if Chart Publish is Needed
+        id: publish-chart-step
+        run: |
+          CHART_TEXT=$(curl -fs https://raw.githubusercontent.com/actions-runner-controller/actions-runner-controller/master/charts/actions-runner-controller/Chart.yaml)
+          NEW_CHART_VERSION=$(echo "$CHART_TEXT" | grep version: | cut -d ' ' -f 2)
+          RELEASE_LIST=$(curl -fs https://api.github.com/repos/actions-runner-controller/actions-runner-controller/releases  | jq .[].tag_name | grep actions-runner-controller | cut -d '"' -f 2 | cut -d '-' -f 4)
+          LATEST_RELEASED_CHART_VERSION=$(echo $RELEASE_LIST | cut -d ' ' -f 1)
+          echo "Chart version in master : $NEW_CHART_VERSION"
+          echo "Latest release chart version : $LATEST_RELEASED_CHART_VERSION"
+          if [[ $NEW_CHART_VERSION != $LATEST_RELEASED_CHART_VERSION ]]; then
+            echo "::set-output name=publish::true"
+          fi
+
+  publish-chart:
+    if: needs.lint-chart.outputs.publish-chart == 'true'
+    needs: lint-chart
+    name: Publish Chart
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write  # for helm/chart-releaser-action to push chart release and create a release
+    
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.4.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+

.github/workflows/run-codeql.yaml

@@ -10,13 +10,6 @@ on:
   schedule:
     - cron: '30 1 * * 0'
 
-concurrency:
-  # This will make sure we only apply the concurrency limits on pull requests
-  # but not pushes to master branch by making the concurrency group name unique
-  # for pushes
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   analyze:
     name: Analyze
@@ -27,11 +20,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:

.github/workflows/run-stale.yaml

@@ -14,7 +14,7 @@ jobs:
       issues: write         # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v5
         with:
           stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
           # turn off stale for both issues and PRs

.github/workflows/runners.yaml

@@ -0,0 +1,83 @@
+name: Runners
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    branches:
+      - 'master'
+    paths:
+      - 'runner/**'
+      - '!runner/Makefile'
+      - '.github/workflows/runners.yaml'
+      - '!**.md'
+  # We must do a trigger on a push: instead of a types: closed so GitHub Secrets 
+  # are available to the workflow run
+  push:
+    branches:
+      - 'master'
+    paths:
+      - 'runner/**'
+      - '!runner/Makefile'
+      - '.github/workflows/runners.yaml'
+      - '!**.md'
+
+env:
+  RUNNER_VERSION: 2.294.0
+  DOCKER_VERSION: 20.10.12
+  RUNNER_CONTAINER_HOOKS_VERSION: 0.1.2
+  DOCKERHUB_USERNAME: summerwind
+
+jobs:
+  build-runners:
+    name: Build ${{ matrix.name }}-${{ matrix.os-name }}-${{ matrix.os-version }}
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: actions-runner
+            os-name: ubuntu
+            os-version: 20.04
+          - name: actions-runner-dind
+            os-name: ubuntu
+            os-version: 20.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Docker Environment
+        id: vars
+        uses: ./.github/actions/setup-docker-environment
+        with:
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+          ghcr_username: ${{ github.actor }}
+          ghcr_password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and Push Versioned Tags
+        uses: docker/build-push-action@v3
+        with:
+          context: ./runner
+          file: ./runner/${{ matrix.name }}.dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+          build-args: |
+            RUNNER_VERSION=${{ env.RUNNER_VERSION }}
+            DOCKER_VERSION=${{ env.DOCKER_VERSION }}
+            RUNNER_CONTAINER_HOOKS_VERSION=${{ env.RUNNER_CONTAINER_HOOKS_VERSION }}
+          tags: |
+            ${{ env.DOCKERHUB_USERNAME }}/${{ matrix.name }}:v${{ env.RUNNER_VERSION }}-${{ matrix.os-name }}-${{ matrix.os-version }}
+            ${{ env.DOCKERHUB_USERNAME }}/${{ matrix.name }}:v${{ env.RUNNER_VERSION }}-${{ matrix.os-name }}-${{ matrix.os-version }}-${{ steps.vars.outputs.sha_short }}
+            ${{ env.DOCKERHUB_USERNAME }}/${{ matrix.name }}:latest
+            ghcr.io/${{ github.repository }}/${{ matrix.name }}:latest
+            ghcr.io/${{ github.repository }}/${{ matrix.name }}:v${{ env.RUNNER_VERSION }}-${{ matrix.os-name }}-${{ matrix.os-version }}
+            ghcr.io/${{ github.repository }}/${{ matrix.name }}:v${{ env.RUNNER_VERSION }}-${{ matrix.os-name }}-${{ matrix.os-version }}-${{ steps.vars.outputs.sha_short }}
+          cache-from: type=gha,scope=build-${{ matrix.name }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.name }}

.github/workflows/validate-arc.yaml

@@ -0,0 +1,60 @@
+name: Validate ARC
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/workflows/publish-canary.yaml'
+      - '.github/workflows/validate-chart.yaml'
+      - '.github/workflows/publish-chart.yaml'
+      - '.github/workflows/runners.yaml'
+      - '.github/workflows/publish-arc.yaml'
+      - '.github/workflows/validate-entrypoint.yaml'
+      - '.github/renovate.*'
+      - 'runner/**'
+      - '.gitignore'
+      - 'PROJECT'
+      - 'LICENSE'
+      - 'Makefile'
+
+permissions:
+  contents: read
+
+jobs:
+  test-controller:
+    name: Test ARC
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set-up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.18.2'
+        check-latest: false
+    
+    - uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+
+    - name: Install kubebuilder
+      run: |
+        curl -L -O https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.2/kubebuilder_2.3.2_linux_amd64.tar.gz
+        tar zxvf kubebuilder_2.3.2_linux_amd64.tar.gz
+        sudo mv kubebuilder_2.3.2_linux_amd64 /usr/local/kubebuilder
+
+    - name: Run tests
+      run: |
+        make test
+
+    - name: Verify manifests are up-to-date
+      run: |
+        make manifests
+        git diff --exit-code

.github/workflows/validate-chart.yaml

@@ -1,24 +1,12 @@
 name: Validate Helm Chart
 
 on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - 'charts/**'
-      - '.github/workflows/arc-validate-chart.yaml'
-      - '!charts/actions-runner-controller/docs/**'
-      - '!**.md'
-      - '!charts/gha-runner-scale-set-controller/**'
-      - '!charts/gha-runner-scale-set/**'
   push:
     paths:
       - 'charts/**'
-      - '.github/workflows/arc-validate-chart.yaml'
+      - '.github/workflows/validate-chart.yaml'
       - '!charts/actions-runner-controller/docs/**'
       - '!**.md'
-      - '!charts/gha-runner-scale-set-controller/**'
-      - '!charts/gha-runner-scale-set/**'
   workflow_dispatch:
 env:
   KUBE_SCORE_VERSION: 1.10.0
@@ -27,13 +15,6 @@ env:
 permissions:
   contents: read
 
-concurrency:
-  # This will make sure we only apply the concurrency limits on pull requests
-  # but not pushes to master branch by making the concurrency group name unique
-  # for pushes
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   validate-chart:
     name: Lint Chart
@@ -45,8 +26,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Helm
-        # Using https://github.com/Azure/setup-helm/releases/tag/v3.5
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
+        uses: azure/setup-helm@v3.0
         with:
           version: ${{ env.HELM_VERSION }}
 
@@ -69,17 +49,17 @@ jobs:
       # python is a requirement for the chart-testing action below (supports yamllint among other tests)
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.7'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.0
+        uses: helm/chart-testing-action@v2.2.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
           changed=$(ct list-changed --config charts/.ci/ct-config.yaml)
           if [[ -n "$changed" ]]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "::set-output name=changed::true"
           fi
 
       - name: Run chart-testing (lint)
@@ -87,7 +67,7 @@ jobs:
           ct lint --config charts/.ci/ct-config.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.4.0
+        uses: helm/kind-action@v1.3.0
         if: steps.list-changed.outputs.changed == 'true'
 
       # We need cert-manager already installed in the cluster because we assume the CRDs exist
@@ -98,6 +78,5 @@ jobs:
           helm install cert-manager jetstack/cert-manager --set installCRDs=true --wait
 
       - name: Run chart-testing (install)
-        if: steps.list-changed.outputs.changed == 'true'
         run: |
           ct install --config charts/.ci/ct-config.yaml

.github/workflows/validate-runners.yaml

@@ -0,0 +1,25 @@
+name: Validate Runners
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    paths:
+      - 'runner/**'
+      - 'test/entrypoint/**'
+      - '!**.md'
+
+permissions:
+  contents: read
+
+jobs:
+  test-runner-entrypoint:
+    name: Test entrypoint
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Run tests
+      run: |
+        make acceptance/runner/entrypoint

.gitignore

@@ -29,10 +29,8 @@ bin
 .env
 .test.env
 *.pem
-!github/actions/testdata/*.pem
 
 # OS
 .DS_STORE
 
 /test-assets
-/.tools

.golangci.yaml

@@ -1,17 +0,0 @@
-run:
-  timeout: 3m
-output:
-  format: github-actions
-linters-settings:
-  errcheck:
-    exclude-functions:
-      - (net/http.ResponseWriter).Write
-      - (*net/http.Server).Shutdown
-      - (*github.com/actions/actions-runner-controller/simulator.VisibleRunnerGroups).Add
-      - (*github.com/actions/actions-runner-controller/testing.Kind).Stop
-issues:
-  exclude-rules:
-    - path: controllers/suite_test.go
-      linters:
-        - staticcheck
-      text: "SA1019"

CODEOWNERS

@@ -1,2 +1,2 @@
 # actions-runner-controller maintainers
-* @mumoshu @toast-gear @actions/actions-launch @nikola-jokic
+* @mumoshu @toast-gear

CODE_OF_CONDUCT.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at opensource@github.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -1,60 +1,85 @@
-# Contribution Guide
+## Contributing
 
-- [Contribution Guide](#contribution-guide)
-  - [Welcome](#welcome)
-  - [Before contributing code](#before-contributing-code)
-  - [How to Contribute a Patch](#how-to-contribute-a-patch)
-    - [Developing the Controller](#developing-the-controller)
-    - [Developing the Runners](#developing-the-runners)
-      - [Tests](#tests)
-      - [Running Ginkgo Tests](#running-ginkgo-tests)
-    - [Running End to End Tests](#running-end-to-end-tests)
-      - [Rerunning a failed test](#rerunning-a-failed-test)
-      - [Testing in a non-kind cluster](#testing-in-a-non-kind-cluster)
-    - [Code conventions](#code-conventions)
-    - [Opening the Pull Request](#opening-the-pull-request)
-  - [Helm Version Changes](#helm-version-changes)
-  - [Testing Controller Built from a Pull Request](#testing-controller-built-from-a-pull-request)
-  - [Release process](#release-process)
-    - [Workflow structure](#workflow-structure)
-      - [Releasing legacy actions-runner-controller image and helm charts](#releasing-legacy-actions-runner-controller-image-and-helm-charts)
-      - [Release actions-runner-controller runner images](#release-actions-runner-controller-runner-images)
-      - [Release gha-runner-scale-set-controller image and helm charts](#release-gha-runner-scale-set-controller-image-and-helm-charts)
-      - [Release actions/runner image](#release-actionsrunner-image)
-      - [Canary releases](#canary-releases)
+### Testing Controller Built from a Pull Request
 
-## Welcome
+We always appreciate your help in testing open pull requests by deploying custom builds of actions-runner-controller onto your own environment, so that we are extra sure we didn't break anything.
 
-This document is the single source of truth for how to contribute to the code base.
-Feel free to browse the [open issues](https://github.com/actions/actions-runner-controller/issues) or file a new one, all feedback is welcome!
-By reading this guide, we hope to give you all of the information you need to be able to pick up issues, contribute new features, and get your work
-reviewed and merged.
+It is especially true when the pull request is about GitHub Enterprise, both GHEC and GHES, as [maintainers don't have GitHub Enterprise environments for testing](/README.md#github-enterprise-support).
 
-## Before contributing code
+The process would look like the below:
 
-We welcome code patches, but to make sure things are well coordinated you should discuss any significant change before starting the work. The maintainers ask that you signal your intention to contribute to the project using the issue tracker. If there is an existing issue that you want to work on, please let us know so we can get it assigned to you. If you noticed a bug or want to add a new feature, there are issue templates you can fill out.
+- Clone this repository locally
+- Checkout the branch. If you use the `gh` command, run `gh pr checkout $PR_NUMBER`
+- Run `NAME=$DOCKER_USER/actions-runner-controller VERSION=canary make docker-build docker-push` for a custom container image build
+- Update your actions-runner-controller's controller-manager deployment to use the new image, `$DOCKER_USER/actions-runner-controller:canary`
 
-When filing a feature request, the maintainers will review the change and give you a decision on whether we are willing to accept the feature into the project.
+Please also note that you need to replace `$DOCKER_USER` with your own DockerHub account name.
 
-For significantly large and/or complex features, we may request that you write up an architectural decision record ([ADR](https://github.blog/2020-08-13-why-write-adrs/)) detailing the change.
+### How to Contribute a Patch
 
-Please use the [template](/docs/adrs/yyyy-mm-dd-TEMPLATE) as guidance.
+Depending on what you are patching depends on how you should go about it. Below are some guides on how to test patches locally as well as develop the controller and runners.
 
-<!-- 
-  TODO: Add a pre-requisite section describing what developers should
-  install in order get started on ARC.
--->
+When submitting a PR for a change please provide evidence that your change works as we still need to work on improving the CI of the project. Some resources are provided for helping achieve this, see this guide for details.
 
-## How to Contribute a Patch
+#### Running an End to End Test
 
-Depending on what you are patching depends on how you should go about it.
-Below are some guides on how to test patches locally as well as develop the controller and runners.
+> **Notes for Ubuntu 20.04+ users**
+>
+> If you're using Ubuntu 20.04 or greater, you might have installed `docker` with `snap`.
+>
+> If you want to stick with `snap`-provided `docker`, do not forget to set `TMPDIR` to
+> somewhere under `$HOME`.
+> Otherwise `kind load docker-image` fail while running `docker save`.
+> See https://kind.sigs.k8s.io/docs/user/known-issues/#docker-installed-with-snap for more information.
 
-When submitting a PR for a change please provide evidence that your change works as we still need to work on improving the CI of the project.
+To test your local changes against both PAT and App based authentication please run the `acceptance` make target with the authentication configuration details provided:
 
-Some resources are provided for helping achieve this, see this guide for details.
+```shell
+# This sets `VERSION` envvar to some appropriate value
+. hack/make-env.sh
 
-### Developing the Controller
+DOCKER_USER=*** \
+  GITHUB_TOKEN=*** \
+  APP_ID=*** \
+  PRIVATE_KEY_FILE_PATH=path/to/pem/file \
+  INSTALLATION_ID=*** \
+  make acceptance
+```
+
+**Rerunning a failed test**
+
+When one of tests run by `make acceptance` failed, you'd probably like to rerun only the failed one.
+
+It can be done by `make acceptance/run` and by setting the combination of `ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm|kubectl` and `ACCEPTANCE_TEST_SECRET_TYPE=token|app` values that failed (note, you just need to set the corresponding authentication configuration in this circumstance)
+
+In the example below, we rerun the test for the combination `ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm ACCEPTANCE_TEST_SECRET_TYPE=token` only:
+
+```shell
+DOCKER_USER=*** \
+  GITHUB_TOKEN=*** \
+  ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm
+  ACCEPTANCE_TEST_SECRET_TYPE=token \
+  make acceptance/run
+```
+
+**Testing in a non-kind cluster**
+
+If you prefer to test in a non-kind cluster, you can instead run:
+
+```shell
+KUBECONFIG=path/to/kubeconfig \
+  DOCKER_USER=*** \
+  GITHUB_TOKEN=*** \
+  APP_ID=*** \
+  PRIVATE_KEY_FILE_PATH=path/to/pem/file \
+  INSTALLATION_ID=*** \
+  ACCEPTANCE_TEST_SECRET_TYPE=token \
+  make docker-build acceptance/setup \
+       acceptance/deploy \
+       acceptance/tests
+```
+
+#### Developing the Controller
 
 Rerunning the whole acceptance test suite from scratch on every little change to the controller, the runner, and the chart would be counter-productive.
 
@@ -94,14 +119,13 @@ NAME=$DOCKER_USER/actions-runner make \
   (kubectl get po -ojsonpath={.items[*].metadata.name} | xargs -n1 kubectl delete po)
 ```
 
-### Developing the Runners
+#### Developing the Runners
 
-#### Tests
+**Tests**
 
-A set of example pipelines (./acceptance/pipelines) are provided in this repository which you can use to validate your runners are working as expected.
-When raising a PR please run the relevant suites to prove your change hasn't broken anything.
+A set of example pipelines (./acceptance/pipelines) are provided in this repository which you can use to validate your runners are working as expected. When raising a PR please run the relevant suites to prove your change hasn't broken anything.
 
-#### Running Ginkgo Tests
+**Running Ginkgo Tests**
 
 You can run the integration test suite that is written in Ginkgo with:
 
@@ -111,14 +135,13 @@ make test-with-deps
 
 This will firstly install a few binaries required to setup the integration test environment and then runs `go test` to start the Ginkgo test.
 
-If you don't want to use `make`, like when you're running tests from your IDE, install required binaries to `/usr/local/kubebuilder/bin`.
-That's the directory in which controller-runtime's `envtest` framework locates the binaries.
+If you don't want to use `make`, like when you're running tests from your IDE, install required binaries to `/usr/local/kubebuilder/bin`. That's the directory in which controller-runtime's `envtest` framework locates the binaries.
 
 ```shell
 sudo mkdir -p /usr/local/kubebuilder/bin
 make kube-apiserver etcd
 sudo mv test-assets/{etcd,kube-apiserver} /usr/local/kubebuilder/bin/
-go test -v -run TestAPIs github.com/actions/actions-runner-controller/controllers/actions.summerwind.net
+go test -v -run TestAPIs github.com/actions-runner-controller/actions-runner-controller/controllers
 ```
 
 To run Ginkgo tests selectively, set the pattern of target test names to `GINKGO_FOCUS`.
@@ -126,244 +149,9 @@ All the Ginkgo test that matches `GINKGO_FOCUS` will be run.
 
 ```shell
 GINKGO_FOCUS='[It] should create a new Runner resource from the specified template, add a another Runner on replicas increased, and removes all the replicas when set to 0' \
-  go test -v -run TestAPIs github.com/actions/actions-runner-controller/controllers/actions.summerwind.net
+  go test -v -run TestAPIs github.com/actions-runner-controller/actions-runner-controller/controllers
 ```
 
-### Running End to End Tests
+#### Helm Version Bumps
 
-> **Notes for Ubuntu 20.04+ users**
->
-> If you're using Ubuntu 20.04 or greater, you might have installed `docker` with `snap`.
->
-> If you want to stick with `snap`-provided `docker`, do not forget to set `TMPDIR` to somewhere under `$HOME`.
-> Otherwise `kind load docker-image` fail while running `docker save`.
-> See <https://kind.sigs.k8s.io/docs/user/known-issues/#docker-installed-with-snap> for more information.
-
-To test your local changes against both PAT and App based authentication please run the `acceptance` make target with the authentication configuration details provided:
-
-```shell
-# This sets `VERSION` envvar to some appropriate value
-. hack/make-env.sh
-
-DOCKER_USER=*** \
-  GITHUB_TOKEN=*** \
-  APP_ID=*** \
-  PRIVATE_KEY_FILE_PATH=path/to/pem/file \
-  INSTALLATION_ID=*** \
-  make acceptance
-```
-
-#### Rerunning a failed test
-
-When one of tests run by `make acceptance` failed, you'd probably like to rerun only the failed one.
-
-It can be done by `make acceptance/run` and by setting the combination of `ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm|kubectl` and `ACCEPTANCE_TEST_SECRET_TYPE=token|app` values that failed (note, you just need to set the corresponding authentication configuration in this circumstance)
-
-In the example below, we rerun the test for the combination `ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm ACCEPTANCE_TEST_SECRET_TYPE=token` only:
-
-```shell
-DOCKER_USER=*** \
-  GITHUB_TOKEN=*** \
-  ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm \
-  ACCEPTANCE_TEST_SECRET_TYPE=token \
-  make acceptance/run
-```
-
-#### Testing in a non-kind cluster
-
-If you prefer to test in a non-kind cluster, you can instead run:
-
-```shell
-KUBECONFIG=path/to/kubeconfig \
-  DOCKER_USER=*** \
-  GITHUB_TOKEN=*** \
-  APP_ID=*** \
-  PRIVATE_KEY_FILE_PATH=path/to/pem/file \
-  INSTALLATION_ID=*** \
-  ACCEPTANCE_TEST_SECRET_TYPE=token \
-  make docker-build acceptance/setup \
-       acceptance/deploy \
-       acceptance/tests
-```
-
-### Code conventions
-
-Before shipping your PR, please check the following items to make sure CI passes.
-
-- Run `go mod tidy` if you made changes to dependencies.
-- Format the code using `gofmt`
-- Run the `golangci-lint` tool locally.
-  - We recommend you use `make lint` to run the tool using a Docker container matching the CI version.
-
-### Opening the Pull Request
-
-Send PR, add issue number to description
-
-## Helm Version Changes
-
-In general we ask you not to bump the version in your PR.
-The maintainers will manage releases and publishing new charts.
-
-## Testing Controller Built from a Pull Request
-
-We always appreciate your help in testing open pull requests by deploying custom builds of actions-runner-controller onto your own environment, so that we are extra sure we didn't break anything.
-
-It is especially true when the pull request is about GitHub Enterprise, both GHEC and GHES, as [maintainers don't have GitHub Enterprise environments for testing](docs/about-arc.md#github-enterprise-support).
-
-The process would look like the below:
-
-- Clone this repository locally
-- Checkout the branch. If you use the `gh` command, run `gh pr checkout $PR_NUMBER`
-- Run `NAME=$DOCKER_USER/actions-runner-controller VERSION=canary make docker-build docker-push` for a custom container image build
-- Update your actions-runner-controller's controller-manager deployment to use the new image, `$DOCKER_USER/actions-runner-controller:canary`
-
-Please also note that you need to replace `$DOCKER_USER` with your own DockerHub account name.
-
-## Release process
-
-Only the maintainers can release a new version of actions-runner-controller, publish a new version of the helm charts, and runner images.
-
-All release workflows have been moved to [actions-runner-controller/releases](https://github.com/actions-runner-controller/releases) since the packages are owned by the former organization.
-
-### Workflow structure
-
-Following the migration of actions-runner-controller into GitHub actions, all the workflows had to be modified to accommodate the move to a new organization. The following table describes the workflows, their purpose and dependencies.
-
-| Filename                          | Workflow name                        | Purpose                                                                                                                                                                                                                                                         |
-|-----------------------------------|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| gha-e2e-tests.yaml                | (gha) E2E Tests                      | Tests the Autoscaling Runner Set mode end to end. Coverage is restricted to this mode. Legacy modes are not tested.                                                                                                                                          |
-| go.yaml                           | Format, Lint, Unit Tests             | Formats, lints and runs unit tests for the entire codebase.                                                                                                                                                                                                     |
-| arc-publish.yaml                  | Publish ARC Image                    | Uploads release/actions-runner-controller.yaml as an artifact to the newly created release and triggers the [build and publication of the controller image](https://github.com/actions-runner-controller/releases/blob/main/.github/workflows/publish-arc.yaml) |
-| global-publish-canary.yaml        | Publish Canary Images                | Builds and publishes canary controller container images for both new and legacy modes.                                                                                                                                                                          |
-| arc-publish-chart.yaml            | Publish ARC Helm Charts              | Packages and publishes charts/actions-runner-controller (via GitHub Pages)                                                                                                                                                                                      |
-| gha-publish-chart.yaml            | (gha) Publish Helm Charts            | Packages and publishes charts/gha-runner-scale-set-controller and charts/gha-runner-scale-set charts (OCI to GHCR)                                                                                                                                              |
-| arc-release-runners.yaml          | Release ARC Runner Images            | Triggers [release-runners.yaml](https://github.com/actions-runner-controller/releases/blob/main/.github/workflows/release-runners.yaml) which will build and push new runner images used with the legacy ARC modes.                                             |
-| global-run-codeql.yaml            | Run CodeQL                           | Run CodeQL on all the codebase                                                                                                                                                                                                                                  |
-| global-run-first-interaction.yaml | First Interaction                    | Informs first time contributors what to expect when they open a new issue / PR                                                                                                                                                                                  |
-| global-run-stale.yaml             | Run Stale Bot                        | Closes issues / PRs without activity                                                                                                                                                                                                                            |
-| arc-update-runners-scheduled.yaml | Runner Updates Check (Scheduled Job) | Polls [actions/runner](https://github.com/actions/runner) and [actions/runner-container-hooks](https://github.com/actions/runner-container-hooks) for new releases. If found, a PR is created to publish new runner images                                      |
-| arc-validate-chart.yaml           | Validate Helm Chart                  | Run helm chart validators for charts/actions-runner-controller                                                                                                                                                                                                  |
-| gha-validate-chart.yaml           | (gha) Validate Helm Charts           | Run helm chart validators for charts/gha-runner-scale-set-controller and charts/gha-runner-scale-set charts                                                                                                                                                     |
-| arc-validate-runners.yaml         | Validate ARC Runners                 | Run validators for runners                                                                                                                                                                                                                                      |
-
-There are 7 components that we release regularly:
-
-1. legacy [actions-runner-controller controller image](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller)
-2. legacy [actions-runner-controller helm charts](https://actions-runner-controller.github.io/actions-runner-controller/)
-3. legacy actions-runner-controller runner images
-   1. [ubuntu-20.04](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner)
-   2. [ubuntu-22.04](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner)
-   3. [dind-ubuntu-20.04](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner-dind)
-   4. [dind-ubuntu-22.04](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner-dind)
-   5. [dind-rootless-ubuntu-20.04](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner-dind-rootless)
-   6. [dind-rootless-ubuntu-22.04](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner-dind-rootless)
-4. [gha-runner-scale-set-controller image](https://github.com/actions/actions-runner-controller/pkgs/container/gha-runner-scale-set-controller)
-5. [gha-runner-scale-set-controller helm charts](https://github.com/actions/actions-runner-controller/pkgs/container/actions-runner-controller-charts%2Fgha-runner-scale-set-controller)
-6. [gha-runner-scale-set runner helm charts](https://github.com/actions/actions-runner-controller/pkgs/container/actions-runner-controller-charts%2Fgha-runner-scale-set)
-7. [actions/runner image](https://github.com/actions/actions-runner-controller/pkgs/container/actions-runner-controller%2Factions-runner)
-
-#### Releasing legacy actions-runner-controller image and helm charts
-
-1. Start by making sure the master branch is stable and all CI jobs are passing
-2. Create a new release in <https://github.com/actions/actions-runner-controller/releases> (Draft a new release)
-3. Bump up the `version` and `appVersion` in charts/actions-runner-controller/Chart.yaml - make sure the `version` matches the release version you just created. (Example: <https://github.com/actions/actions-runner-controller/pull/2577>)
-4. When the workflows finish execution, you will see:
-   1. A new controller image published to: <https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller>
-   2. Helm charts published to: <https://github.com/actions-runner-controller/actions-runner-controller.github.io/tree/master/actions-runner-controller> (the index.yaml file is updated)
-
-When a new release is created, the [Publish ARC Image](https://github.com/actions/actions-runner-controller/blob/master/.github/workflows/arc-publish.yaml) workflow is triggered.
-
-```mermaid
-flowchart LR
-    subgraph repository: actions/actions-runner-controller
-    event_a{{"release: published"}} -- triggers --> workflow_a["arc-publish.yaml"]
-    event_b{{"workflow_dispatch"}} -- triggers --> workflow_a["arc-publish.yaml"]
-    workflow_a["arc-publish.yaml"] -- uploads --> package["actions-runner-controller.tar.gz"]
-    end
-    subgraph repository: actions-runner-controller/releases
-    workflow_a["arc-publish.yaml"] -- triggers --> event_d{{"repository_dispatch"}} --> workflow_b["publish-arc.yaml"]
-    workflow_b["publish-arc.yaml"] -- push --> A["GHCR: \nactions-runner-controller/actions-runner-controller:*"]
-    workflow_b["publish-arc.yaml"] -- push --> B["DockerHub: \nsummerwind/actions-runner-controller:*"]
-    end
-```
-
-#### Release actions-runner-controller runner images
-
-**Manual steps:**
-
-1. Navigate to the [actions-runner-controller/releases](https://github.com/actions-runner-controller/releases) repository
-2. Trigger [the release-runners.yaml](https://github.com/actions-runner-controller/releases/actions/workflows/release-runners.yaml) workflow.
-   1. The list of input prameters for this workflow is defined in the table below (always inspect the workflow file for the latest version)
-
-<!-- Table of Paramters -->
-| Parameter                        | Description                                                                                                                                                                                                                         | Default       |
-|----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| `runner_version`                 | The version of the [actions/runner](https://github.com/actions/runner) to use                                                                                                                                                       | `2.300.2`     |
-| `docker_version`                 | The version of docker to use                                                                                                                                                                                                        | `20.10.12`    |
-| `runner_container_hooks_version` | The version of [actions/runner-container-hooks](https://github.com/actions/runner-container-hooks) to use                                                                                                                           | `0.2.0`       |
-| `sha`                            | The commit sha from [actions/actions-runner-controller](https://github.com/actions/actions-runner-controller) to be used to build the runner images. This will be provided to `actions/checkout` & used to tag the container images | Empty string. |
-| `push_to_registries`             | Whether to push the images to the registries. Use false to test the build                                                                                                                                                           | false         |
-
-**Automated steps:**
-
-```mermaid
-flowchart LR
-    workflow["release-runners.yaml"] -- workflow_dispatch* --> workflow_b["release-runners.yaml"]
-    subgraph repository: actions/actions-runner-controller
-    runner_updates_check["arc-update-runners-scheduled.yaml"] -- "polls (daily)" --> runner_releases["actions/runner/releases"]
-    runner_updates_check -- creates --> runner_update_pr["PR: update /runner/VERSION"]****
-    runner_update_pr --> runner_update_pr_merge{{"merge"}}
-    runner_update_pr_merge -- triggers --> workflow["release-runners.yaml"]
-    end
-    subgraph repository: actions-runner-controller/releases
-    workflow_b["release-runners.yaml"] -- push --> A["GHCR: \n actions-runner-controller/actions-runner:* \n actions-runner-controller/actions-runner-dind:* \n actions-runner-controller/actions-runner-dind-rootless:*"]
-    workflow_b["release-runners.yaml"] -- push --> B["DockerHub: \n summerwind/actions-runner:* \n summerwind/actions-runner-dind:* \n summerwind/actions-runner-dind-rootless:*"]
-    event_b{{"workflow_dispatch"}} -- triggers --> workflow_b["release-runners.yaml"]
-    end
-```
-
-#### Release gha-runner-scale-set-controller image and helm charts
-
-1. Make sure the master branch is stable and all CI jobs are passing
-1. Prepare a release PR (example: <https://github.com/actions/actions-runner-controller/pull/2467>)
-   1. Bump up the version of the chart in: charts/gha-runner-scale-set-controller/Chart.yaml
-   2. Bump up the version of the chart in: charts/gha-runner-scale-set/Chart.yaml
-      1. Make sure that `version`, `appVersion` of both charts are always the same. These versions cannot diverge.
-   3. Update the quickstart guide to reflect the latest versions: docs/preview/gha-runner-scale-set-controller/README.md
-   4. Add changelog to the PR as well as the quickstart guide
-1. Merge the release PR
-1. Manually trigger the [(gha) Publish Helm Charts](https://github.com/actions/actions-runner-controller/actions/workflows/gha-publish-chart.yaml) workflow
-1. Manually create a tag and release in [actions/actions-runner-controller](https://github.com/actions/actions-runner-controller/releases) with the format: `gha-runner-scale-set-x.x.x` where the version (x.x.x) matches that of the Helm chart
-
-| Parameter                                       | Description                                                                                            | Default        |
-|-------------------------------------------------|--------------------------------------------------------------------------------------------------------|----------------|
-| `ref`                                           | The branch, tag or SHA to cut a release from.                                                          | default branch |
-| `release_tag_name`                              | The tag of the controller image. This is not a git tag.                                                | canary         |
-| `push_to_registries`                            | Push images to registries. Use false to test the build process.                                        | false          |
-| `publish_gha_runner_scale_set_controller_chart` | Publish new helm chart for gha-runner-scale-set-controller. This will push the new OCI archive to GHCR | false          |
-| `publish_gha_runner_scale_set_chart`            | Publish new helm chart for gha-runner-scale-set. This will push the new OCI archive to GHCR            | false          |
-
-#### Release actions/runner image
-
-A new runner image is built and published to <https://github.com/actions/runner/pkgs/container/actions-runner> whenever a new runner binary has been released. There's nothing to do here.
-
-#### Canary releases
-
-We publish canary images for both the legacy actions-runner-controller and gha-runner-scale-set-controller images.
-
-```mermaid
-flowchart LR
-    subgraph org: actions
-    event_a{{"push: [master]"}} -- triggers --> workflow_a["publish-canary.yaml"]
-    end
-    subgraph org: actions-runner-controller
-    workflow_a["publish-canary.yaml"] -- triggers --> event_d{{"repository_dispatch"}} --> workflow_b["publish-canary.yaml"]
-    workflow_b["publish-canary.yaml"] -- push --> A["GHCR: \nactions-runner-controller/actions-runner-controller:canary"]
-    workflow_b["publish-canary.yaml"] -- push --> B["DockerHub: \nsummerwind/actions-runner-controller:canary"]
-    end
-```
-
-1. [actions-runner-controller canary image](https://github.com/actions-runner-controller/actions-runner-controller/pkgs/container/actions-runner-controller)
-2. [gha-runner-scale-set-controller image](https://github.com/actions/actions-runner-controller/pkgs/container/gha-runner-scale-set-controller)
-
-These canary images are automatically built and released on each push to the master branch.
+In general we ask you not to bump the version in your PR, the maintainers in general manage the publishing of a new chart.

Dockerfile

@@ -1,10 +1,11 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.21.3 as builder
+FROM --platform=$BUILDPLATFORM golang:1.18.3 as builder
 
 WORKDIR /workspace
 
 # Make it runnable on a distroless image/without libc
 ENV CGO_ENABLED=0
+
 # Copy the Go Modules manifests
 COPY go.mod go.sum ./
 
@@ -24,23 +25,20 @@ RUN go mod download
 # With the above commmand,
 # TARGETOS can be "linux", TARGETARCH can be "amd64", "arm64", and "arm", TARGETVARIANT can be "v7".
 
-ARG TARGETPLATFORM TARGETOS TARGETARCH TARGETVARIANT VERSION=dev COMMIT_SHA=dev
+ARG TARGETPLATFORM TARGETOS TARGETARCH TARGETVARIANT
 
 # We intentionally avoid `--mount=type=cache,mode=0777,target=/go/pkg/mod` in the `go mod download` and the `go build` runs
 # to avoid https://github.com/moby/buildkit/issues/2334
 # We can use docker layer cache so the build is fast enogh anyway
 # We also use per-platform GOCACHE for the same reason.
-ENV GOCACHE /build/${TARGETPLATFORM}/root/.cache/go-build
+env GOCACHE /build/${TARGETPLATFORM}/root/.cache/go-build
 
 # Build
 RUN --mount=target=. \
   --mount=type=cache,mode=0777,target=${GOCACHE} \
   export GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} && \
-  go build -trimpath -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=${VERSION}' -X 'github.com/actions/actions-runner-controller/build.CommitSHA=${COMMIT_SHA}'" -o /out/manager main.go && \
-  go build -trimpath -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=${VERSION}' -X 'github.com/actions/actions-runner-controller/build.CommitSHA=${COMMIT_SHA}'" -o /out/github-runnerscaleset-listener ./cmd/githubrunnerscalesetlistener && \
-  go build -trimpath -ldflags="-s -w" -o /out/github-webhook-server ./cmd/githubwebhookserver && \
-  go build -trimpath -ldflags="-s -w" -o /out/actions-metrics-server ./cmd/actionsmetricsserver && \
-  go build -trimpath -ldflags="-s -w" -o /out/sleep ./cmd/sleep
+  go build -o /out/manager main.go && \
+  go build -o /out/github-webhook-server ./cmd/githubwebhookserver
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
@@ -50,10 +48,7 @@ WORKDIR /
 
 COPY --from=builder /out/manager .
 COPY --from=builder /out/github-webhook-server .
-COPY --from=builder /out/actions-metrics-server .
-COPY --from=builder /out/github-runnerscaleset-listener .
-COPY --from=builder /out/sleep .
 
-USER 65532:65532
+USER nonroot:nonroot
 
 ENTRYPOINT ["/manager"]

Makefile

@@ -1,12 +1,11 @@
 ifdef DOCKER_USER
-	DOCKER_IMAGE_NAME ?= ${DOCKER_USER}/actions-runner-controller
+	NAME ?= ${DOCKER_USER}/actions-runner-controller
 else
-	DOCKER_IMAGE_NAME ?= summerwind/actions-runner-controller
+	NAME ?= summerwind/actions-runner-controller
 endif
-DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
-VERSION ?= dev
-COMMIT_SHA = $(shell git rev-parse HEAD)
-RUNNER_VERSION ?= 2.311.0
+DOCKER_USER ?= $(shell echo ${NAME} | cut -d / -f1)
+VERSION ?= latest
+RUNNER_VERSION ?= 2.294.0
 TARGETPLATFORM ?= $(shell arch)
 RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
 RUNNER_TAG  ?= ${VERSION}
@@ -20,7 +19,6 @@ KUBECONTEXT ?= kind-acceptance
 CLUSTER ?= acceptance
 CERT_MANAGER_VERSION ?= v1.1.1
 KUBE_RBAC_PROXY_VERSION ?= v0.11.0
-SHELLCHECK_VERSION ?= 0.8.0
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
@@ -33,20 +31,6 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 TEST_ASSETS=$(PWD)/test-assets
-TOOLS_PATH=$(PWD)/.tools
-
-OS_NAME := $(shell uname -s | tr A-Z a-z)
-
-# The etcd packages that coreos maintain use different extensions for each *nix OS on their github release page.
-# ETCD_EXTENSION: the storage format file extension listed on the release page.
-# EXTRACT_COMMAND: the  appropriate CLI command for extracting this file format.
-ifeq ($(OS_NAME), darwin)
-ETCD_EXTENSION:=zip
-EXTRACT_COMMAND:=unzip
-else
-ETCD_EXTENSION:=tar.gz
-EXTRACT_COMMAND:=tar -xzf
-endif
 
 # default list of platforms for which multiarch image is built
 ifeq (${PLATFORMS}, )
@@ -67,15 +51,12 @@ endif
 
 all: manager
 
-lint:
-	docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v1.55.2 golangci-lint run
-
 GO_TEST_ARGS ?= -short
 
 # Run tests
-test: generate fmt vet manifests shellcheck
-	go test $(GO_TEST_ARGS) `go list ./... | grep -v ./test_e2e_arc` -coverprofile cover.out
-	go test -fuzz=Fuzz -fuzztime=10s -run=Fuzz* ./controllers/actions.summerwind.net
+test: generate fmt vet manifests
+	go test $(GO_TEST_ARGS) ./... -coverprofile cover.out
+	go test -fuzz=Fuzz -fuzztime=10s -run=Fuzz* ./controllers
 
 test-with-deps: kube-apiserver etcd kubectl
 	# See https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/envtest#pkg-constants
@@ -87,21 +68,14 @@ test-with-deps: kube-apiserver etcd kubectl
 # Build manager binary
 manager: generate fmt vet
 	go build -o bin/manager main.go
-	go build -o bin/github-runnerscaleset-listener ./cmd/githubrunnerscalesetlistener
 
 # Run against the configured Kubernetes cluster in ~/.kube/config
 run: generate fmt vet manifests
 	go run ./main.go
 
-run-scaleset: generate fmt vet
-	CONTROLLER_MANAGER_POD_NAMESPACE=default \
-	CONTROLLER_MANAGER_CONTAINER_IMAGE="${DOCKER_IMAGE_NAME}:${VERSION}" \
-	go run -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=$(VERSION)'" \
-	./main.go --auto-scaling-runner-set-only
-
 # Install CRDs into a cluster
 install: manifests
-	kustomize build config/crd | kubectl apply --server-side -f -
+	kustomize build config/crd | kubectl apply -f -
 
 # Uninstall CRDs from a cluster
 uninstall: manifests
@@ -109,8 +83,8 @@ uninstall: manifests
 
 # Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 deploy: manifests
-	cd config/manager && kustomize edit set image controller=${DOCKER_IMAGE_NAME}:${VERSION}
-	kustomize build config/default | kubectl apply --server-side -f -
+	cd config/manager && kustomize edit set image controller=${NAME}:${VERSION}
+	kustomize build config/default | kubectl apply -f -
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: manifests-gen-crds chart-crds
@@ -118,77 +92,11 @@ manifests: manifests-gen-crds chart-crds
 manifests-gen-crds: controller-gen yq
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 	for YAMLFILE in config/crd/bases/actions*.yaml; do \
-		$(YQ) '.spec.preserveUnknownFields = false' --inplace "$$YAMLFILE" ; \
+		$(YQ) write --inplace "$$YAMLFILE" spec.preserveUnknownFields false; \
 	done
-	make manifests-gen-crds-fix DELETE_KEY=x-kubernetes-list-type
-	make manifests-gen-crds-fix DELETE_KEY=x-kubernetes-list-map-keys
-
-manifests-gen-crds-fix: DELETE_KEY ?=
-manifests-gen-crds-fix:
-	#runners
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.sidecarContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.dockerdContainerResources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.workVolumeClaimTemplate.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runners.yaml
-	#runnerreplicasets
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.sidecarContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.dockerdContainerResources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.workVolumeClaimTemplate.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
-	#runnerdeployments
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.sidecarContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.dockerdContainerResources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.workVolumeClaimTemplate.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
-	#runnersets
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.volumeClaimTemplates.items.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.workVolumeClaimTemplate.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.summerwind.dev_runnersets.yaml
-	#autoscalingrunnersets
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_autoscalingrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_autoscalingrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_autoscalingrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_autoscalingrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_autoscalingrunnersets.yaml
-	#ehemeralrunnersets
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.ephemeralRunnerSpec.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.ephemeralRunnerSpec.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.ephemeralRunnerSpec.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunnersets.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.ephemeralRunnerSpec.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunnersets.yaml
-	# ephemeralrunners
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.spec.properties.ephemeralContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.spec.properties.containers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.spec.properties.initContainers.items.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunners.yaml
-	$(YQ) 'del(.spec.versions[].schema.openAPIV3Schema.properties.spec.properties.spec.properties.volumes.items.properties.ephemeral.properties.volumeClaimTemplate.properties.spec.properties.resources.properties.claims.$(DELETE_KEY))' --inplace config/crd/bases/actions.github.com_ephemeralrunners.yaml
 
 chart-crds:
 	cp config/crd/bases/*.yaml charts/actions-runner-controller/crds/
-	cp config/crd/bases/actions.github.com_autoscalingrunnersets.yaml charts/gha-runner-scale-set-controller/crds/
-	cp config/crd/bases/actions.github.com_autoscalinglisteners.yaml charts/gha-runner-scale-set-controller/crds/
-	cp config/crd/bases/actions.github.com_ephemeralrunnersets.yaml charts/gha-runner-scale-set-controller/crds/
-	cp config/crd/bases/actions.github.com_ephemeralrunners.yaml charts/gha-runner-scale-set-controller/crds/
-	rm charts/actions-runner-controller/crds/actions.github.com_autoscalingrunnersets.yaml
-	rm charts/actions-runner-controller/crds/actions.github.com_autoscalinglisteners.yaml
-	rm charts/actions-runner-controller/crds/actions.github.com_ephemeralrunnersets.yaml
-	rm charts/actions-runner-controller/crds/actions.github.com_ephemeralrunners.yaml
 
 # Run go fmt against code
 fmt:
@@ -202,10 +110,6 @@ vet:
 generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
 
-# Run shellcheck on runner scripts
-shellcheck: shellcheck-install
-	$(TOOLS_PATH)/shellcheck --shell bash --source-path runner runner/*.sh hack/*.sh
-
 docker-buildx:
 	export DOCKER_CLI_EXPERIMENTAL=enabled ;\
 	export DOCKER_BUILDKIT=1
@@ -215,20 +119,18 @@ docker-buildx:
 	docker buildx build --platform ${PLATFORMS} \
 		--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
 		--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
-		--build-arg VERSION=${VERSION} \
-		--build-arg COMMIT_SHA=${COMMIT_SHA} \
-		-t "${DOCKER_IMAGE_NAME}:${VERSION}" \
+		-t "${NAME}:${VERSION}" \
 		-f Dockerfile \
 		. ${PUSH_ARG}
 
 # Push the docker image
 docker-push:
-	docker push ${DOCKER_IMAGE_NAME}:${VERSION}
+	docker push ${NAME}:${VERSION}
 	docker push ${RUNNER_NAME}:${RUNNER_TAG}
 
 # Generate the release manifest file
 release: manifests
-	cd config/manager && kustomize edit set image controller=${DOCKER_IMAGE_NAME}:${VERSION}
+	cd config/manager && kustomize edit set image controller=${NAME}:${VERSION}
 	mkdir -p release
 	kustomize build config/default > release/actions-runner-controller.yaml
 
@@ -252,7 +154,7 @@ acceptance/kind:
 # Otherwise `load docker-image` fail while running `docker save`.
 # See https://kind.sigs.k8s.io/docs/user/known-issues/#docker-installed-with-snap
 acceptance/load:
-	kind load docker-image ${DOCKER_IMAGE_NAME}:${VERSION} --name ${CLUSTER}
+	kind load docker-image ${NAME}:${VERSION} --name ${CLUSTER}
 	kind load docker-image quay.io/brancz/kube-rbac-proxy:$(KUBE_RBAC_PROXY_VERSION) --name ${CLUSTER}
 	kind load docker-image ${RUNNER_NAME}:${RUNNER_TAG} --name ${CLUSTER}
 	kind load docker-image docker:dind --name ${CLUSTER}
@@ -282,7 +184,7 @@ acceptance/teardown:
 	kind delete cluster --name ${CLUSTER}
 
 acceptance/deploy:
-	DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME} DOCKER_USER=${DOCKER_USER} VERSION=${VERSION} RUNNER_NAME=${RUNNER_NAME} RUNNER_TAG=${RUNNER_TAG} TEST_REPO=${TEST_REPO} \
+	NAME=${NAME} DOCKER_USER=${DOCKER_USER} VERSION=${VERSION} RUNNER_NAME=${RUNNER_NAME} RUNNER_TAG=${RUNNER_TAG} TEST_REPO=${TEST_REPO} \
 	TEST_ORG=${TEST_ORG} TEST_ORG_REPO=${TEST_ORG_REPO} SYNC_PERIOD=${SYNC_PERIOD} \
 	USE_RUNNERSET=${USE_RUNNERSET} \
 	TEST_EPHEMERAL=${TEST_EPHEMERAL} \
@@ -291,8 +193,8 @@ acceptance/deploy:
 acceptance/tests:
 	acceptance/checks.sh
 
-acceptance/runner/startup:
-	cd test/startup/ && bash test.sh
+acceptance/runner/entrypoint:
+	cd test/entrypoint/ && bash test.sh
 
 # We use -count=1 instead of `go clean -testcache`
 # See https://terratest.gruntwork.io/docs/testing-best-practices/avoid-test-caching/
@@ -320,7 +222,7 @@ ifeq (, $(wildcard $(GOBIN)/controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.7.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 endif
@@ -340,30 +242,13 @@ ifeq (, $(wildcard $(GOBIN)/yq))
 	YQ_TMP_DIR=$$(mktemp -d) ;\
 	cd $$YQ_TMP_DIR ;\
 	go mod init tmp ;\
-	go install github.com/mikefarah/yq/v4@v4.25.3 ;\
+	go install github.com/mikefarah/yq/v3@3.4.0 ;\
 	rm -rf $$YQ_TMP_DIR ;\
 	}
 endif
 YQ=$(GOBIN)/yq
 
-# find or download shellcheck
-# download shellcheck if necessary
-shellcheck-install:
-ifeq (, $(wildcard $(TOOLS_PATH)/shellcheck))
-	echo "Downloading shellcheck"
-	@{ \
-	set -e ;\
-	SHELLCHECK_TMP_DIR=$$(mktemp -d) ;\
-	cd $$SHELLCHECK_TMP_DIR ;\
-	curl -LO https://github.com/koalaman/shellcheck/releases/download/v$(SHELLCHECK_VERSION)/shellcheck-v$(SHELLCHECK_VERSION).$(OS_NAME).x86_64.tar.xz ;\
-	tar Jxvf shellcheck-v$(SHELLCHECK_VERSION).$(OS_NAME).x86_64.tar.xz ;\
-	cd $(CURDIR) ;\
-	mkdir -p $(TOOLS_PATH) ;\
-	mv $$SHELLCHECK_TMP_DIR/shellcheck-v$(SHELLCHECK_VERSION)/shellcheck $(TOOLS_PATH)/ ;\
-	rm -rf $$SHELLCHECK_TMP_DIR ;\
-	}
-endif
-SHELLCHECK=$(TOOLS_PATH)/shellcheck
+OS_NAME := $(shell uname -s | tr A-Z a-z)
 
 # find or download etcd
 etcd:
@@ -373,10 +258,12 @@ ifeq (, $(wildcard $(TEST_ASSETS)/etcd))
 	set -xe ;\
 	INSTALL_TMP_DIR=$$(mktemp -d) ;\
 	cd $$INSTALL_TMP_DIR ;\
-	wget https://github.com/coreos/etcd/releases/download/v3.4.22/etcd-v3.4.22-$(OS_NAME)-amd64.$(ETCD_EXTENSION);\
+	wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.2/kubebuilder_2.3.2_$(OS_NAME)_amd64.tar.gz ;\
 	mkdir -p $(TEST_ASSETS) ;\
-	$(EXTRACT_COMMAND) etcd-v3.4.22-$(OS_NAME)-amd64.$(ETCD_EXTENSION) ;\
-	mv etcd-v3.4.22-$(OS_NAME)-amd64/etcd $(TEST_ASSETS)/etcd ;\
+	tar zxvf kubebuilder_2.3.2_$(OS_NAME)_amd64.tar.gz ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/etcd $(TEST_ASSETS)/etcd ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/kube-apiserver $(TEST_ASSETS)/kube-apiserver ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/kubectl $(TEST_ASSETS)/kubectl ;\
 	rm -rf $$INSTALL_TMP_DIR ;\
 	}
 ETCD_BIN=$(TEST_ASSETS)/etcd
@@ -398,7 +285,9 @@ ifeq (, $(wildcard $(TEST_ASSETS)/kube-apiserver))
 	wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.2/kubebuilder_2.3.2_$(OS_NAME)_amd64.tar.gz ;\
 	mkdir -p $(TEST_ASSETS) ;\
 	tar zxvf kubebuilder_2.3.2_$(OS_NAME)_amd64.tar.gz ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/etcd $(TEST_ASSETS)/etcd ;\
 	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/kube-apiserver $(TEST_ASSETS)/kube-apiserver ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/kubectl $(TEST_ASSETS)/kubectl ;\
 	rm -rf $$INSTALL_TMP_DIR ;\
 	}
 KUBE_APISERVER_BIN=$(TEST_ASSETS)/kube-apiserver
@@ -420,6 +309,8 @@ ifeq (, $(wildcard $(TEST_ASSETS)/kubectl))
 	wget https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.2/kubebuilder_2.3.2_$(OS_NAME)_amd64.tar.gz ;\
 	mkdir -p $(TEST_ASSETS) ;\
 	tar zxvf kubebuilder_2.3.2_$(OS_NAME)_amd64.tar.gz ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/etcd $(TEST_ASSETS)/etcd ;\
+	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/kube-apiserver $(TEST_ASSETS)/kube-apiserver ;\
 	mv kubebuilder_2.3.2_$(OS_NAME)_amd64/bin/kubectl $(TEST_ASSETS)/kubectl ;\
 	rm -rf $$INSTALL_TMP_DIR ;\
 	}

PROJECT

@@ -1,5 +1,5 @@
 domain: summerwind.dev
-repo: github.com/actions/actions-runner-controller
+repo: github.com/actions-runner-controller/actions-runner-controller
 resources:
 - group: actions
   kind: Runner
@@ -10,16 +10,4 @@ resources:
 - group: actions
   kind: RunnerDeployment
   version: v1alpha1
-- group: actions
-  kind: AutoscalingRunnerSet
-  version: v1alpha1
-- group: actions
-  kind: EphemeralRunnerSet
-  version: v1alpha1
-- group: actions
-  kind: EphemeralRunner
-  version: v1alpha1
-- group: actions
-  kind: AutoscalingListener
-  version: v1alpha1
 version: "2"

SECURITY.md

@@ -1,31 +1,22 @@
-Thanks for helping make GitHub safe for everyone.
+# Security Policy
 
-## Security
+##  Sponsoring the project
 
-GitHub takes the security of our software products and services seriously, including all of the open source code repositories managed through our GitHub organizations, such as [GitHub](https://github.com/GitHub).
+This project is maintained by a small team of two and therefore lacks the resource to provide security fixes in a timely manner.
 
-Even though [open source repositories are outside of the scope of our bug bounty program](https://bounty.github.com/index.html#scope) and therefore not eligible for bounty rewards, we will ensure that your finding gets passed along to the appropriate maintainers for remediation. 
+If you have important business(es) that relies on this project, please consider sponsoring the project so that the maintainer(s) can commit to providing such service.
 
-## Reporting Security Issues
+Please refer to https://github.com/sponsors/actions-runner-controller for available tiers.
 
-If you believe you have found a security vulnerability in any GitHub-owned repository, please report it to us through coordinated disclosure.
+## Supported Versions
 
-**Please do not report security vulnerabilities through public GitHub issues, discussions, or pull requests.**
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.23.0  | :white_check_mark: |
+| < 0.23.0| :x:                |
 
-Instead, please send an email to opensource-security[@]github.com.
+## Reporting a Vulnerability
 
-Please include as much of the information listed below as you can to help us better understand and resolve the issue:
+To report a security issue, please email ykuoka+arcsecurity(at)gmail.com with a description of the issue, the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.
 
-  * The type of issue (e.g., buffer overflow, SQL injection, or cross-site scripting)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-## Policy
-
-See [GitHub's Safe Harbor Policy](https://docs.github.com/en/github/site-policy/github-bug-bounty-program-legal-safe-harbor#1-safe-harbor-terms)
+A maintainer will try to respond within 5 working days. If the issue is confirmed as a vulnerability, a Security Advisory will be opened. This project tries to follow a 90 day disclosure timeline.

TROUBLESHOOTING.md

@@ -11,14 +11,13 @@
   * [Runner coming up before network available](#runner-coming-up-before-network-available)
   * [Outgoing network action hangs indefinitely](#outgoing-network-action-hangs-indefinitely)
   * [Unable to scale to zero with TotalNumberOfQueuedAndInProgressWorkflowRuns](#unable-to-scale-to-zero-with-totalnumberofqueuedandinprogressworkflowruns)
-  * [Slow / failure to boot dind sidecar (default runner)](#slow--failure-to-boot-dind-sidecar-default-runner)
 
 ## Tools
 
 A list of tools which are helpful for troubleshooting
 
-* [Kubernetes resources hierarchy parsing tool `kubectl-fields`](https://github.com/rewanthtammana/kubectl-fields)
-* [Multi pod and container log tailing for Kubernetes `stern`](https://github.com/stern/stern)
+* https://github.com/rewanthtammana/kubectl-fields Kubernetes resources hierarchy parsing tool
+* https://github.com/stern/stern Multi pod and container log tailing for Kubernetes
 
 ## Installation
 
@@ -30,7 +29,7 @@ Troubeshooting runbooks that relate to ARC installation problems
 
 This issue can come up for various reasons like leftovers from previous installations or not being able to access the K8s service's clusterIP associated with the admission webhook server (of ARC).
 
-```text
+```
 Internal error occurred: failed calling webhook "mutate.runnerdeployment.actions.summerwind.dev":
 Post "https://actions-runner-controller-webhook.actions-runner-system.svc:443/mutate-actions-summerwind-dev-v1alpha1-runnerdeployment?timeout=10s": context deadline exceeded
 ```
@@ -43,19 +42,17 @@ First we will try the common solution of checking webhook leftovers from previou
     kubectl get validatingwebhookconfiguration -A
     kubectl get mutatingwebhookconfiguration -A
     ```
-
 2.  If you see any webhooks related to actions-runner-controller, delete them:
-
     ```bash
     kubectl delete mutatingwebhookconfiguration actions-runner-controller-mutating-webhook-configuration
     kubectl delete validatingwebhookconfiguration actions-runner-controller-validating-webhook-configuration
     ```
 
 If that didn't work then probably your K8s control-plane is somehow unable to access the K8s service's clusterIP associated with the admission webhook server:
-
 1. You're running apiserver as a binary and you didn't make service cluster IPs available to the host network. 
 2. You're running the apiserver in the pod but your pod network (i.e. CNI plugin installation and config) is not good so your pods(like kube-apiserver) in the K8s control-plane nodes can't access ARC's admission webhook server pod(s) in probably data-plane nodes.
 
+
 Another reason could be due to GKEs firewall settings you may run into the following errors when trying to deploy runners on a private GKE cluster: 
 
 To fix this, you may either:
@@ -65,7 +62,7 @@ To fix this, you may either:
 
    ```sh
    # With helm, you'd set `webhookPort` to the port number of your choice
-   # See https://github.com/actions/actions-runner-controller/pull/1410/files for more information
+   # See https://github.com/actions-runner-controller/actions-runner-controller/pull/1410/files for more information
    helm upgrade --install --namespace actions-runner-system --create-namespace \
                 --wait actions-runner-controller actions-runner-controller/actions-runner-controller \
                 --set webhookPort=10250
@@ -106,7 +103,6 @@ To fix this, you may either:
 **Solution**
 
 Your base64'ed PAT token has a new line at the end, it needs to be created without a `\n` added, either:
-
 * `echo -n $TOKEN | base64`
 * Create the secret as described in the docs using the shell and documented flags
 
@@ -114,7 +110,7 @@ Your base64'ed PAT token has a new line at the end, it needs to be created witho
 
 **Problem**
 
-```text
+```
 Error: UPGRADE FAILED: failed to create resource: Internal error occurred: failed calling webhook "webhook.cert-manager.io": failed to call webhook: Post "https://cert-manager-webhook.cert-manager.svc:443/mutate?timeout=10s": x509: certificate signed by unknown authority
 ```
 
@@ -122,7 +118,7 @@ Apparently, it's failing while `helm` is creating one of resources defined in th
 
 You'd try to tail logs from the `cert-manager-cainjector` and see it's failing with an error like:
 
-```text
+```
 $ kubectl -n cert-manager logs cert-manager-cainjector-7cdbb9c945-g6bt4
 I0703 03:31:55.159339       1 start.go:91] "starting" version="v1.1.1" revision="3ac7418070e22c87fae4b22603a6b952f797ae96"
 I0703 03:31:55.615061       1 leaderelection.go:243] attempting to acquire leader lease  kube-system/cert-manager-cainjector-leader-election...
@@ -140,7 +136,7 @@ Your cluster is based on a new enough Kubernetes of version 1.22 or greater whic
 
 In many cases, it's not an option to downgrade Kubernetes. So, just upgrade `cert-manager` to a more recent version that does have have the support for the specific Kubernetes version you're using.
 
-See <https://cert-manager.io/docs/installation/supported-releases/> for the list of available cert-manager versions.
+See https://cert-manager.io/docs/installation/supported-releases/ for the list of available cert-manager versions.
 
 ## Operations
 
@@ -156,7 +152,7 @@ Sometimes either the runner kind (`kubectl get runners`) or it's underlying pod
 
 Remove the finaliser from the relevent runner kind or pod
 
-```text
+```
 # Get all kind runners and remove the finalizer
 $ kubectl get runners --no-headers | awk {'print $1'} | xargs kubectl patch runner --type merge -p '{"metadata":{"finalizers":null}}'
 
@@ -171,7 +167,7 @@ are in a namespace not shared with anything else_
 
 **Problem**
 
-ARC isn't involved in jobs actually getting allocated to a runner. ARC is responsible for orchestrating runners and the runner lifecycle. Why some people see large delays in job allocation is not clear however it has been confirmed https://github.com/actions/actions-runner-controller/issues/1387#issuecomment-1122593984 that this is caused from the self-update process somehow.
+ARC isn't involved in jobs actually getting allocated to a runner. ARC is responsible for orchestrating runners and the runner lifecycle. Why some people see large delays in job allocation is not clear however it has been https://github.com/actions-runner-controller/actions-runner-controller/issues/1387#issuecomment-1122593984 that this is caused from the self-update process somehow.
 
 **Solution**
 
@@ -198,7 +194,7 @@ spec:
 If you're running your action runners on a service mesh like Istio, you might
 have problems with runner configuration accompanied by logs like:
 
-```text
+```
 ....
 runner Starting Runner listener with startup type: service
 runner Started listener process
@@ -213,11 +209,11 @@ configuration script tries to communicate with the network.
 
 More broadly, there are many other circumstances where the runner pod coming up first can cause issues.
 
-**Solution**
+**Solution**<br />
 
 > Added originally to help users with older istio instances.
 > Newer Istio instances can use Istio's `holdApplicationUntilProxyStarts` attribute ([istio/istio#11130](https://github.com/istio/istio/issues/11130)) to avoid having to delay starting up the runner.
-> Please read the discussion in [#592](https://github.com/actions/actions-runner-controller/pull/592) for more information.
+> Please read the discussion in [#592](https://github.com/actions-runner-controller/actions-runner-controller/pull/592) for more information.
 
 You can add a delay to the runner's entrypoint script by setting the `STARTUP_DELAY_IN_SECONDS` environment variable for the runner pod. This will cause the script to sleep X seconds, this works with any runner kind.
 
@@ -235,7 +231,7 @@ spec:
           value: "5"
 ```
 
-### Outgoing network action hangs indefinitely
+## Outgoing network action hangs indefinitely
 
 **Problem**
 
@@ -260,30 +256,10 @@ spec:
       env: []
 ```
 
-If the issue still persists, you can set the `ARC_DOCKER_MTU_PROPAGATION` to propagate the host MTU to networks created
-by the GitHub Runner. For instance:
+There may be more places you need to tweak for MTU.
+Please consult issues like #651 for more information.
 
-```yaml
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerDeployment
-metadata:
-  name: github-runner
-  namespace: github-system
-spec:
-  replicas: 6
-  template:
-    spec:
-      dockerMTU: 1400
-      repository: $username/$repo
-      env:
-        - name: ARC_DOCKER_MTU_PROPAGATION
-          value: "true"
-```
-
-You can read the discussion regarding this issue in
-[#1406](https://github.com/actions/actions-runner-controller/issues/1046).
-
-### Unable to scale to zero with TotalNumberOfQueuedAndInProgressWorkflowRuns
+## Unable to scale to zero with TotalNumberOfQueuedAndInProgressWorkflowRuns
 
 **Problem**
 
@@ -291,40 +267,6 @@ HRA doesn't scale the RunnerDeployment to zero, even though you did configure HR
 
 **Solution**
 
-You very likely have some dangling workflow jobs stuck in `queued` or `in_progress` as seen in [#1057](https://github.com/actions/actions-runner-controller/issues/1057#issuecomment-1133439061).
+You very likely have some dangling workflow jobs stuck in `queued` or `in_progress` as seen in [#1057](https://github.com/actions-runner-controller/actions-runner-controller/issues/1057#issuecomment-1133439061).
 
 Manually call [the "list workflow runs" API](https://docs.github.com/en/rest/actions/workflow-runs#list-workflow-runs-for-a-repository), and [remove the dangling workflow job(s)](https://docs.github.com/en/rest/actions/workflow-runs#delete-a-workflow-run).
-
-### Slow / failure to boot dind sidecar (default runner)
-
-**Problem**
-
-If you noticed that it takes several minutes for sidecar dind container to be created or it exits with with error just after being created it might indicate that you are experiencing disk performance issue. You might see message `failed to reserve container name` when scaling up multiple runners at once. When you ssh on kubernetes node that problematic pods were scheduled on you can use tools like `atop`, `htop` or `iotop` to check IO usage and cpu time percentage used on iowait. If you see that disk usage is high (80-100%) and iowaits are taking a significant chunk of you cpu time (normally it should not be higher than 10%) it means that performance is being bottlenecked by slow disk.
-
-**Solution**
-
-The solution is to switch to using faster storage, if you are experiencing this issue you are probably using HDD storage. Switching to SSD storage fixed the problem in my case. Most cloud providers have a list of storage options to use just pick something faster that your current disk, for on prem clusters you will need to invest in some SSDs.
-
-### Dockerd no space left on device
-
-**Problem**
-
-If you are running many containers on your runner you might encounter an issue where docker daemon is unable to start new containers and you see error `no space left on device`.  
-
-**Solution**
-
-Add a `dockerVarRunVolumeSizeLimit` key in your runner's spec with a higher size limit (the default is 1M) For instance:
-
-```yaml
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerDeployment
-metadata:
-  name: github-runner
-  namespace: github-system
-spec:
-  replicas: 6
-  template:
-    spec:
-      dockerVarRunVolumeSizeLimit: 50M
-      env: []
-```

acceptance/argotunnel.sh

@@ -88,9 +88,6 @@ data:
     no-autoupdate: true
     ingress:
     # The first rule proxies traffic to the httpbin sample Service defined in app.yaml
-    - hostname: ${TUNNEL_HOSTNAME}
-      service: http://actions-runner-controller-actions-metrics-server.actions-runner-system:80
-      path: /metrics$
     - hostname: ${TUNNEL_HOSTNAME}
       service: http://actions-runner-controller-github-webhook-server.actions-runner-system:80
     # This rule matches any traffic which didn't match a previous rule, and responds with HTTP 404.

acceptance/deploy.sh

@@ -35,63 +35,14 @@ else
   echo 'Skipped deploying secret "github-webhook-server". Set WEBHOOK_GITHUB_TOKEN to deploy.' 1>&2
 fi
 
-if [ -n "${WEBHOOK_GITHUB_TOKEN}" ] && [ -z "${CREATE_SECRETS_USING_HELM}" ]; then
-  kubectl -n actions-runner-system delete secret \
-      actions-metrics-server || :
-  kubectl -n actions-runner-system create secret generic \
-      actions-metrics-server \
-      --from-literal=github_token=${WEBHOOK_GITHUB_TOKEN:?WEBHOOK_GITHUB_TOKEN must not be empty}
-else
-  echo 'Skipped deploying secret "actions-metrics-server". Set WEBHOOK_GITHUB_TOKEN to deploy.' 1>&2
-fi
-
 tool=${ACCEPTANCE_TEST_DEPLOYMENT_TOOL}
 
 TEST_ID=${TEST_ID:-default}
 
 if [ "${tool}" == "helm" ]; then
   set -v
-
-  CHART=${CHART:-charts/actions-runner-controller}
-
-  flags=()
-  if [ "${IMAGE_PULL_SECRET}" != "" ]; then
-    flags+=( --set imagePullSecrets[0].name=${IMAGE_PULL_SECRET})
-    flags+=( --set image.actionsRunnerImagePullSecrets[0].name=${IMAGE_PULL_SECRET})
-    flags+=( --set githubWebhookServer.imagePullSecrets[0].name=${IMAGE_PULL_SECRET})
-    flags+=( --set actionsMetricsServer.imagePullSecrets[0].name=${IMAGE_PULL_SECRET})
-  fi
-  if [ "${WATCH_NAMESPACE}" != "" ]; then
-    flags+=( --set watchNamespace=${WATCH_NAMESPACE} --set singleNamespace=true)
-  fi
-  if [ "${CHART_VERSION}" != "" ]; then
-    flags+=( --version ${CHART_VERSION})
-  fi
-  if [ "${LOG_FORMAT}" != "" ]; then
-    flags+=( --set logFormat=${LOG_FORMAT})
-    flags+=( --set githubWebhookServer.logFormat=${LOG_FORMAT})
-    flags+=( --set actionsMetricsServer.logFormat=${LOG_FORMAT})
-  fi
-  if [ "${ADMISSION_WEBHOOKS_TIMEOUT}" != "" ]; then
-    flags+=( --set admissionWebHooks.timeoutSeconds=${ADMISSION_WEBHOOKS_TIMEOUT})
-  fi
-  if [ -n "${CREATE_SECRETS_USING_HELM}" ]; then
-    if [ -z "${WEBHOOK_GITHUB_TOKEN}" ]; then
-      echo 'Failed deploying secret "actions-metrics-server" using helm. Set WEBHOOK_GITHUB_TOKEN to deploy.' 1>&2
-      exit 1
-    fi
-    flags+=( --set actionsMetricsServer.secret.create=true)
-    flags+=( --set actionsMetricsServer.secret.github_token=${WEBHOOK_GITHUB_TOKEN})
-  fi
-  if [ -n "${GITHUB_WEBHOOK_SERVER_ENV_NAME}" ] && [ -n "${GITHUB_WEBHOOK_SERVER_ENV_VALUE}" ]; then
-    flags+=( --set githubWebhookServer.env[0].name=${GITHUB_WEBHOOK_SERVER_ENV_NAME})
-    flags+=( --set githubWebhookServer.env[0].value=${GITHUB_WEBHOOK_SERVER_ENV_VALUE})
-  fi
-
-  set -vx
-
   helm upgrade --install actions-runner-controller \
-    ${CHART} \
+    charts/actions-runner-controller \
     -n actions-runner-system \
     --create-namespace \
     --set syncPeriod=${SYNC_PERIOD} \
@@ -100,9 +51,9 @@ if [ "${tool}" == "helm" ]; then
     --set image.tag=${VERSION} \
     --set podAnnotations.test-id=${TEST_ID} \
     --set githubWebhookServer.podAnnotations.test-id=${TEST_ID} \
-    --set actionsMetricsServer.podAnnotations.test-id=${TEST_ID} \
-    ${flags[@]} --set image.imagePullPolicy=${IMAGE_PULL_POLICY} \
-    --set image.dindSidecarRepositoryAndTag=${DIND_SIDECAR_REPOSITORY_AND_TAG} \
+    --set imagePullSecrets[0].name=${IMAGE_PULL_SECRET} \
+    --set image.actionsRunnerImagePullSecrets[0].name=${IMAGE_PULL_SECRET} \
+    --set githubWebhookServer.imagePullSecrets[0].name=${IMAGE_PULL_SECRET} \
     -f ${VALUES_FILE}
   set +v
   # To prevent `CustomResourceDefinition.apiextensions.k8s.io "runners.actions.summerwind.dev" is invalid: metadata.annotations: Too long: must have at most 262144 bytes`

acceptance/deploy_runners.sh

@@ -6,12 +6,6 @@ OP=${OP:-apply}
 
 RUNNER_LABEL=${RUNNER_LABEL:-self-hosted}
 
-# See https://github.com/actions/actions-runner-controller/issues/2123
-kubectl delete secret generic docker-config || :
-kubectl create secret generic docker-config --from-file .dockerconfigjson=<(jq -M 'del(.aliases)' $HOME/.docker/config.json) --type=kubernetes.io/dockerconfigjson || :
-
-cat acceptance/testdata/kubernetes_container_mode.envsubst.yaml  | NAMESPACE=${RUNNER_NAMESPACE} envsubst  | kubectl apply -f -
-
 if [ -n "${TEST_REPO}" ]; then
   if [ "${USE_RUNNERSET}" != "false" ]; then
     cat acceptance/testdata/runnerset.envsubst.yaml | TEST_ENTERPRISE= TEST_ORG= RUNNER_MIN_REPLICAS=${REPO_RUNNER_MIN_REPLICAS} NAME=repo-runnerset envsubst | kubectl ${OP} -f -

acceptance/testdata/kubernetes_container_mode.envsubst.yaml

@@ -1,86 +0,0 @@
-# USAGE:
-#   cat acceptance/testdata/kubernetes_container_mode.envsubst.yaml  | NAMESPACE=default envsubst  | kubectl apply -f -
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: k8s-mode-runner
-rules:
-- apiGroups: [""]
-  resources: ["pods"]
-  verbs: ["get", "list", "create", "delete"]
-- apiGroups: [""]
-  resources: ["pods/exec"]
-  verbs: ["get", "create"]
-- apiGroups: [""]
-  resources: ["pods/log"]
-  verbs: ["get", "list", "watch",]
-- apiGroups: ["batch"]
-  resources: ["jobs"]
-  verbs: ["get", "list", "create", "delete"]
-- apiGroups: [""]
-  resources: ["secrets"]
-  verbs: ["get", "list", "create", "delete"]
-# Needed to report test success by crating a cm from within workflow job step
-- apiGroups: [""]
-  resources: ["configmaps"]
-  verbs: ["create", "delete"]
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: runner-status-updater
-rules:
-- apiGroups: ["actions.summerwind.dev"]
-  resources: ["runners/status"]
-  verbs: ["get", "update", "patch"]
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: ${RUNNER_SERVICE_ACCOUNT_NAME}
-  namespace: ${NAMESPACE}
----
-# To verify it's working, try:
-#   kubectl auth can-i --as system:serviceaccount:default:runner get pod
-# If incomplete, workflows and jobs would fail with an error message like:
-#   Error: Error: The Service account needs the following permissions [{"group":"","verbs":["get","list","create","delete"],"resource":"pods","subresource":""},{"group":"","verbs":["get","create"],"resource":"pods","subresource":"exec"},{"group":"","verbs":["get","list","watch"],"resource":"pods","subresource":"log"},{"group":"batch","verbs":["get","list","create","delete"],"resource":"jobs","subresource":""},{"group":"","verbs":["create","delete","get","list"],"resource":"secrets","subresource":""}] on the pod resource in the 'default' namespace. Please contact your self hosted runner administrator.
-#   Error: Process completed with exit code 1.
-apiVersion: rbac.authorization.k8s.io/v1
-# This role binding allows "jane" to read pods in the "default" namespace.
-# You need to already have a Role named "pod-reader" in that namespace.
-kind: RoleBinding
-metadata:
-  name: runner-k8s-mode-runner
-  namespace: ${NAMESPACE}
-subjects:
-- kind: ServiceAccount
-  name: ${RUNNER_SERVICE_ACCOUNT_NAME}
-  namespace: ${NAMESPACE}
-roleRef:
-  kind: ClusterRole
-  name: k8s-mode-runner
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: runner-runner-stat-supdater
-  namespace: ${NAMESPACE}
-subjects:
-- kind: ServiceAccount
-  name: ${RUNNER_SERVICE_ACCOUNT_NAME}
-  namespace: ${NAMESPACE}
-roleRef:
-  kind: ClusterRole
-  name: runner-status-updater
-  apiGroup: rbac.authorization.k8s.io
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: org-runnerdeploy-runner-work-dir
-  labels:
-    content: org-runnerdeploy-runner-work-dir
-provisioner: rancher.io/local-path
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer

acceptance/testdata/runnerdeploy.envsubst.yaml

@@ -1,23 +1,3 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: ${NAME}-runner-work-dir
-  labels:
-    content: ${NAME}-runner-work-dir
-provisioner: rancher.io/local-path
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: ${NAME}-rootless-dind-work-dir
-  labels:
-    content: ${NAME}-rootless-dind-work-dir
-provisioner: rancher.io/local-path
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
----
 apiVersion: actions.summerwind.dev/v1alpha1
 kind: RunnerDeployment
 metadata:
@@ -59,95 +39,10 @@ spec:
       labels:
       - "${RUNNER_LABEL}"
 
-      serviceAccountName: ${RUNNER_SERVICE_ACCOUNT_NAME}
-      terminationGracePeriodSeconds: ${RUNNER_TERMINATION_GRACE_PERIOD_SECONDS}
-
-      env:
-      - name: RUNNER_GRACEFUL_STOP_TIMEOUT
-        value: "${RUNNER_GRACEFUL_STOP_TIMEOUT}"
-      - name: ROLLING_UPDATE_PHASE
-        value: "${ROLLING_UPDATE_PHASE}"
-      - name: ARC_DOCKER_MTU_PROPAGATION
-        value: "true"
-      # https://github.com/docker/docs/issues/8663
-      - name: DOCKER_DEFAULT_ADDRESS_POOL_BASE
-        value: "172.17.0.0/12"
-      - name: DOCKER_DEFAULT_ADDRESS_POOL_SIZE
-        value: "24"
-      - name: WAIT_FOR_DOCKER_SECONDS
-        value: "3"
-
-      dockerMTU: 1400
-      dockerEnv:
-      - name: RUNNER_GRACEFUL_STOP_TIMEOUT
-        value: "${RUNNER_GRACEFUL_STOP_TIMEOUT}"
-
-      # Fix the following no space left errors with rootless-dind runners that can happen while running buildx build:
-      #   ------
-      #   > [4/5] RUN go mod download:
-      #   ------
-      #   ERROR: failed to solve: failed to prepare yxsw8lv9hqnuafzlfta244l0z: mkdir /home/runner/.local/share/docker/vfs/dir/yxsw8lv9hqnuafzlfta244l0z/usr/local/go/src/cmd/compile/internal/types2/testdata: no space left on device
-      #   Error: Process completed with exit code 1.
-      #
-      volumeMounts:
-      - name: rootless-dind-work-dir
-        # Omit the /share/docker part of the /home/runner/.local/share/docker as
-        # that part is created by dockerd.
-        mountPath: /home/runner/.local
-        readOnly: false
-      # See https://github.com/actions/actions-runner-controller/issues/2123
-      # Be sure to omit the "aliases" field from the config.json.
-      # Otherwise you may encounter nasty errors like:
-      #   $ docker build
-      #   docker: 'buildx' is not a docker command.
-      #   See 'docker --help'
-      # due to the incompatibility between your host docker config.json and the runner environment.
-      # That is, your host dockcer config.json might contain this:
-      #   "aliases": {
-      #     "builder": "buildx"
-      #   }
-      # And this results in the above error when the runner does not have buildx installed yet.
-      - name: docker-config
-        mountPath: /home/runner/.docker/config.json
-        subPath: config.json
-        readOnly: true
-      - name: docker-config-root
-        mountPath: /home/runner/.docker
-      volumes:
-      - name: rootless-dind-work-dir
-        ephemeral:
-          volumeClaimTemplate:
-            spec:
-              accessModes: [ "ReadWriteOnce" ]
-              storageClassName: "${NAME}-rootless-dind-work-dir"
-              resources:
-                requests:
-                  storage: 3Gi
-      - name: docker-config
-        # Refer to .dockerconfigjson/.docker/config.json
-        secret:
-          secretName: docker-config
-          items:
-          - key: .dockerconfigjson
-            path: config.json
-      - name: docker-config-root
-        emptyDir: {}
-
       #
       # Non-standard working directory
       #
       # workDir: "/"
-
-      # # Uncomment the below to enable the kubernetes container mode
-      # # See https://github.com/actions/actions-runner-controller#runner-with-k8s-jobs
-      containerMode: ${RUNNER_CONTAINER_MODE}
-      workVolumeClaimTemplate:
-        accessModes:
-        - ReadWriteOnce
-        storageClassName: "${NAME}-runner-work-dir"
-        resources:
-          requests:
-            storage: 10Gi
 ---
 apiVersion: actions.summerwind.dev/v1alpha1
 kind: HorizontalRunnerAutoscaler

acceptance/testdata/runnerset.envsubst.yaml

@@ -54,16 +54,6 @@ provisioner: rancher.io/local-path
 reclaimPolicy: Retain
 volumeBindingMode: WaitForFirstConsumer
 ---
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: ${NAME}-rootless-dind-work-dir
-  labels:
-    content: ${NAME}-rootless-dind-work-dir
-provisioner: rancher.io/local-path
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
----
 apiVersion: actions.summerwind.dev/v1alpha1
 kind: RunnerSet
 metadata:
@@ -122,27 +112,14 @@ spec:
       labels:
         app: ${NAME}
     spec:
-      serviceAccountName: ${RUNNER_SERVICE_ACCOUNT_NAME}
-      terminationGracePeriodSeconds: ${RUNNER_TERMINATION_GRACE_PERIOD_SECONDS}
       containers:
-      # # Uncomment only when non-dind-runner / you're using docker sidecar
-      # - name: docker
-      #   # Image is required for the dind sidecar definition within RunnerSet spec
-      #   image: "docker:dind"
-      #   env:
-      #   - name: RUNNER_GRACEFUL_STOP_TIMEOUT
-      #     value: "${RUNNER_GRACEFUL_STOP_TIMEOUT}"
       - name: runner
         imagePullPolicy: IfNotPresent
         env:
-        - name: RUNNER_GRACEFUL_STOP_TIMEOUT
-          value: "${RUNNER_GRACEFUL_STOP_TIMEOUT}"
         - name: RUNNER_FEATURE_FLAG_EPHEMERAL
           value: "${RUNNER_FEATURE_FLAG_EPHEMERAL}"
         - name: GOMODCACHE
           value: "/home/runner/.cache/go-mod"
-        - name: ROLLING_UPDATE_PHASE
-          value: "${ROLLING_UPDATE_PHASE}"
         # PV-backed runner work dir
         volumeMounts:
         # Comment out the ephemeral work volume if you're going to test the kubernetes container mode
@@ -175,27 +152,19 @@ spec:
           # https://github.com/actions/setup-go/blob/56a61c9834b4a4950dbbf4740af0b8a98c73b768/src/installer.ts#L144
           mountPath: "/opt/hostedtoolcache"
       # Valid only when dockerdWithinRunnerContainer=false
-      # - name: docker
-      #   # PV-backed runner work dir
-      #   volumeMounts:
-      #   - name: work
-      #     mountPath: /runner/_work
-      #   # Cache docker image layers, in case dockerdWithinRunnerContainer=false
-      #   - name: var-lib-docker
-      #     mountPath: /var/lib/docker
-      #   # image: mumoshu/actions-runner-dind:dev
-
-      #   # For buildx cache
-      #   - name: cache
-      #     mountPath: "/home/runner/.cache"
-
-        # For fixing no space left error on rootless dind runner
-        - name: rootless-dind-work-dir
-          # Omit the /share/docker part of the /home/runner/.local/share/docker as
-          # that part is created by dockerd.
-          mountPath: /home/runner/.local
-          readOnly: false
+      - name: docker
+        # PV-backed runner work dir
+        volumeMounts:
+        - name: work
+          mountPath: /runner/_work
+        # Cache docker image layers, in case dockerdWithinRunnerContainer=false
+        - name: var-lib-docker
+          mountPath: /var/lib/docker
+        # image: mumoshu/actions-runner-dind:dev
 
+        # For buildx cache
+        - name: cache
+          mountPath: "/home/runner/.cache"
         # Comment out the ephemeral work volume if you're going to test the kubernetes container mode
       # volumes:
       # - name: work
@@ -208,24 +177,6 @@ spec:
       #         resources:
       #           requests:
       #             storage: 10Gi
-
-      # Fix the following no space left errors with rootless-dind runners that can happen while running buildx build:
-      #   ------
-      #   > [4/5] RUN go mod download:
-      #   ------
-      #   ERROR: failed to solve: failed to prepare yxsw8lv9hqnuafzlfta244l0z: mkdir /home/runner/.local/share/docker/vfs/dir/yxsw8lv9hqnuafzlfta244l0z/usr/local/go/src/cmd/compile/internal/types2/testdata: no space left on device
-      #   Error: Process completed with exit code 1.
-      #
-      volumes:
-      - name: rootless-dind-work-dir
-        ephemeral:
-          volumeClaimTemplate:
-            spec:
-              accessModes: [ "ReadWriteOnce" ]
-              storageClassName: "${NAME}-rootless-dind-work-dir"
-              resources:
-                requests:
-                  storage: 3Gi
   volumeClaimTemplates:
   - metadata:
       name: vol1

acceptance/values.yaml

@@ -1,18 +1,13 @@
 # Set actions-runner-controller settings for testing
 logLevel: "-4"
-imagePullSecrets: []
+imagePullSecrets:
+- name:
 image:
-  # This needs to be an empty array rather than a single-item array with empty name.
-  # Otherwise you end up with the following error on helm-upgrade:
-  #   Error: UPGRADE FAILED: failed to create patch: map: map[] does not contain declared merge key: name && failed to create patch: map: map[] does not contain declared merge key: name
-  actionsRunnerImagePullSecrets: []
-runner:
-  statusUpdateHook:
-    enabled: true
-rbac:
-  allowGrantingKubernetesContainerModePermissions: true
+  actionsRunnerImagePullSecrets:
+  - name:
 githubWebhookServer:
-  imagePullSecrets: []
+  imagePullSecrets:
+  - name:
   logLevel: "-4"
   enabled: true
   labels: {}
@@ -33,23 +28,3 @@ githubWebhookServer:
         protocol: TCP
         name: http
         nodePort: 31000
-actionsMetricsServer:
-  imagePullSecrets: []
-  logLevel: "-4"
-  enabled: true
-  labels: {}
-  replicaCount: 1
-  secret:
-    enabled: true
-    # create: true
-    name: "actions-metrics-server"
-    ### GitHub Webhook Configuration
-    #github_webhook_secret_token: ""
-  service:
-    type: NodePort
-    ports:
-      - port: 80
-        targetPort: http
-        protocol: TCP
-        name: http
-        nodePort: 31001

api/v1alpha1/horizontalrunnerautoscaler_types.go

@@ -22,7 +22,7 @@ import (
 
 // HorizontalRunnerAutoscalerSpec defines the desired state of HorizontalRunnerAutoscaler
 type HorizontalRunnerAutoscalerSpec struct {
-	// ScaleTargetRef is the reference to scaled resource like RunnerDeployment
+	// ScaleTargetRef sis the reference to scaled resource like RunnerDeployment
 	ScaleTargetRef ScaleTargetRef `json:"scaleTargetRef,omitempty"`
 
 	// MinReplicas is the minimum number of replicas the deployment is allowed to scale
@@ -60,9 +60,6 @@ type HorizontalRunnerAutoscalerSpec struct {
 	// The earlier a scheduled override is, the higher it is prioritized.
 	// +optional
 	ScheduledOverrides []ScheduledOverride `json:"scheduledOverrides,omitempty"`
-
-	// +optional
-	GitHubAPICredentialsFrom *GitHubAPICredentialsFrom `json:"githubAPICredentialsFrom,omitempty"`
 }
 
 type ScaleUpTrigger struct {
@@ -133,7 +130,7 @@ type ScaleTargetRef struct {
 
 type MetricSpec struct {
 	// Type is the type of metric to be used for autoscaling.
-	// It can be TotalNumberOfQueuedAndInProgressWorkflowRuns or PercentageRunnersBusy.
+	// The only supported Type is TotalNumberOfQueuedAndInProgressWorkflowRuns
 	Type string `json:"type,omitempty"`
 
 	// RepositoryNames is the list of repository names to be used for calculating the metric.
@@ -173,7 +170,7 @@ type MetricSpec struct {
 }
 
 // ScheduledOverride can be used to override a few fields of HorizontalRunnerAutoscalerSpec on schedule.
-// A schedule can optionally be recurring, so that the corresponding override happens every day, week, month, or year.
+// A schedule can optionally be recurring, so that the correspoding override happens every day, week, month, or year.
 type ScheduledOverride struct {
 	// StartTime is the time at which the first override starts.
 	StartTime metav1.Time `json:"startTime"`

api/v1alpha1/runner_types.go

@@ -70,24 +70,12 @@ type RunnerConfig struct {
 	// +optional
 	DockerRegistryMirror *string `json:"dockerRegistryMirror,omitempty"`
 	// +optional
-	DockerVarRunVolumeSizeLimit *resource.Quantity `json:"dockerVarRunVolumeSizeLimit,omitempty"`
-	// +optional
 	VolumeSizeLimit *resource.Quantity `json:"volumeSizeLimit,omitempty"`
 	// +optional
 	VolumeStorageMedium *string `json:"volumeStorageMedium,omitempty"`
 
 	// +optional
 	ContainerMode string `json:"containerMode,omitempty"`
-
-	GitHubAPICredentialsFrom *GitHubAPICredentialsFrom `json:"githubAPICredentialsFrom,omitempty"`
-}
-
-type GitHubAPICredentialsFrom struct {
-	SecretRef SecretReference `json:"secretRef,omitempty"`
-}
-
-type SecretReference struct {
-	Name string `json:"name"`
 }
 
 // RunnerPodSpec defines the desired pod spec fields of the runner pod
@@ -172,9 +160,6 @@ type RunnerPodSpec struct {
 	// +optional
 	RuntimeClassName *string `json:"runtimeClassName,omitempty"`
 
-	// +optional
-	DnsPolicy corev1.DNSPolicy `json:"dnsPolicy,omitempty"`
-
 	// +optional
 	DnsConfig *corev1.PodDNSConfig `json:"dnsConfig,omitempty"`
 
@@ -198,6 +183,11 @@ func (rs *RunnerSpec) Validate(rootPath *field.Path) field.ErrorList {
 		errList = append(errList, field.Invalid(rootPath.Child("workVolumeClaimTemplate"), rs.WorkVolumeClaimTemplate, err.Error()))
 	}
 
+	err = rs.validateIsServiceAccountNameSet()
+	if err != nil {
+		errList = append(errList, field.Invalid(rootPath.Child("serviceAccountName"), rs.ServiceAccountName, err.Error()))
+	}
+
 	return errList
 }
 
@@ -236,6 +226,17 @@ func (rs *RunnerSpec) validateWorkVolumeClaimTemplate() error {
 	return rs.WorkVolumeClaimTemplate.validate()
 }
 
+func (rs *RunnerSpec) validateIsServiceAccountNameSet() error {
+	if rs.ContainerMode != "kubernetes" {
+		return nil
+	}
+
+	if rs.ServiceAccountName == "" {
+		return errors.New("service account name is required if container mode is kubernetes")
+	}
+	return nil
+}
+
 // RunnerStatus defines the observed state of Runner
 type RunnerStatus struct {
 	// Turns true only if the runner pod is ready.
@@ -250,60 +251,10 @@ type RunnerStatus struct {
 	// +optional
 	Message string `json:"message,omitempty"`
 	// +optional
-	WorkflowStatus *WorkflowStatus `json:"workflow"`
-	// +optional
 	// +nullable
 	LastRegistrationCheckTime *metav1.Time `json:"lastRegistrationCheckTime,omitempty"`
 }
 
-// WorkflowStatus contains various information that is propagated
-// from GitHub Actions workflow run environment variables to
-// ease monitoring workflow run/job/steps that are triggerred on the runner.
-type WorkflowStatus struct {
-	// +optional
-	// Name is the name of the workflow
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_WORKFLOW defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	Name string `json:"name,omitempty"`
-	// +optional
-	// Repository is the owner and repository name of the workflow
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_REPOSITORY defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	Repository string `json:"repository,omitempty"`
-	// +optional
-	// ReositoryOwner is the repository owner's name for the workflow
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_REPOSITORY_OWNER defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	RepositoryOwner string `json:"repositoryOwner,omitempty"`
-	// +optional
-	// GITHUB_RUN_NUMBER is the unique number for the current workflow run
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_RUN_ID defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	RunNumber string `json:"runNumber,omitempty"`
-	// +optional
-	// RunID is the unique number for the current workflow run
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_RUN_ID defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	RunID string `json:"runID,omitempty"`
-	// +optional
-	// Job is the name of the current job
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_JOB defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	Job string `json:"job,omitempty"`
-	// +optional
-	// Action is the name of the current action or the step ID of the current step
-	// that is triggerred within the runner.
-	// It corresponds to GITHUB_ACTION defined in
-	// https://docs.github.com/en/actions/learn-github-actions/environment-variables
-	Action string `json:"action,omitempty"`
-}
-
 // RunnerStatusRegistration contains runner registration status
 type RunnerStatusRegistration struct {
 	Enterprise   string      `json:"enterprise,omitempty"`
@@ -364,12 +315,8 @@ func (w *WorkVolumeClaimTemplate) V1VolumeMount(mountPath string) corev1.VolumeM
 // +kubebuilder:printcolumn:JSONPath=".spec.enterprise",name=Enterprise,type=string
 // +kubebuilder:printcolumn:JSONPath=".spec.organization",name=Organization,type=string
 // +kubebuilder:printcolumn:JSONPath=".spec.repository",name=Repository,type=string
-// +kubebuilder:printcolumn:JSONPath=".spec.group",name=Group,type=string
 // +kubebuilder:printcolumn:JSONPath=".spec.labels",name=Labels,type=string
 // +kubebuilder:printcolumn:JSONPath=".status.phase",name=Status,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.message",name=Message,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.workflow.repository",name=WF Repo,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.workflow.runID",name=WF Run,type=string
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Runner is the Schema for the runners API
@@ -391,7 +338,11 @@ func (r Runner) IsRegisterable() bool {
 	}
 
 	now := metav1.Now()
-	return !r.Status.Registration.ExpiresAt.Before(&now)
+	if r.Status.Registration.ExpiresAt.Before(&now) {
+		return false
+	}
+
+	return true
 }
 
 // +kubebuilder:object:root=true

api/v1alpha1/runner_webhook.go

@@ -23,7 +23,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -49,20 +48,20 @@ func (r *Runner) Default() {
 var _ webhook.Validator = &Runner{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *Runner) ValidateCreate() (admission.Warnings, error) {
+func (r *Runner) ValidateCreate() error {
 	runnerLog.Info("validate resource to be created", "name", r.Name)
-	return nil, r.Validate()
+	return r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *Runner) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *Runner) ValidateUpdate(old runtime.Object) error {
 	runnerLog.Info("validate resource to be updated", "name", r.Name)
-	return nil, r.Validate()
+	return r.Validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *Runner) ValidateDelete() (admission.Warnings, error) {
-	return nil, nil
+func (r *Runner) ValidateDelete() error {
+	return nil
 }
 
 // Validate validates resource spec.

api/v1alpha1/runnerdeployment_types.go

@@ -33,7 +33,7 @@ type RunnerDeploymentSpec struct {
 
 	// EffectiveTime is the time the upstream controller requested to sync Replicas.
 	// It is usually populated by the webhook-based autoscaler via HRA.
-	// The value is inherited to RunnerReplicaSet(s) and used to prevent ephemeral runners from unnecessarily recreated.
+	// The value is inherited to RunnerRepicaSet(s) and used to prevent ephemeral runners from unnecessarily recreated.
 	//
 	// +optional
 	// +nullable
@@ -77,11 +77,6 @@ type RunnerDeploymentStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:shortName=rdeploy
 // +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.enterprise",name=Enterprise,type=string
-// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.organization",name=Organization,type=string
-// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.repository",name=Repository,type=string
-// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.group",name=Group,type=string
-// +kubebuilder:printcolumn:JSONPath=".spec.template.spec.labels",name=Labels,type=string
 // +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number
 // +kubebuilder:printcolumn:JSONPath=".status.replicas",name=Current,type=number
 // +kubebuilder:printcolumn:JSONPath=".status.updatedReplicas",name=Up-To-Date,type=number

api/v1alpha1/runnerdeployment_webhook.go

@@ -23,7 +23,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -49,20 +48,20 @@ func (r *RunnerDeployment) Default() {
 var _ webhook.Validator = &RunnerDeployment{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *RunnerDeployment) ValidateCreate() (admission.Warnings, error) {
+func (r *RunnerDeployment) ValidateCreate() error {
 	runnerDeploymentLog.Info("validate resource to be created", "name", r.Name)
-	return nil, r.Validate()
+	return r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *RunnerDeployment) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *RunnerDeployment) ValidateUpdate(old runtime.Object) error {
 	runnerDeploymentLog.Info("validate resource to be updated", "name", r.Name)
-	return nil, r.Validate()
+	return r.Validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *RunnerDeployment) ValidateDelete() (admission.Warnings, error) {
-	return nil, nil
+func (r *RunnerDeployment) ValidateDelete() error {
+	return nil
 }
 
 // Validate validates resource spec.

api/v1alpha1/runnerreplicaset_webhook.go

@@ -23,7 +23,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // log is for logging in this package.
@@ -49,20 +48,20 @@ func (r *RunnerReplicaSet) Default() {
 var _ webhook.Validator = &RunnerReplicaSet{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *RunnerReplicaSet) ValidateCreate() (admission.Warnings, error) {
+func (r *RunnerReplicaSet) ValidateCreate() error {
 	runnerReplicaSetLog.Info("validate resource to be created", "name", r.Name)
-	return nil, r.Validate()
+	return r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *RunnerReplicaSet) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *RunnerReplicaSet) ValidateUpdate(old runtime.Object) error {
 	runnerReplicaSetLog.Info("validate resource to be updated", "name", r.Name)
-	return nil, r.Validate()
+	return r.Validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *RunnerReplicaSet) ValidateDelete() (admission.Warnings, error) {
-	return nil, nil
+func (r *RunnerReplicaSet) ValidateDelete() error {
+	return nil
 }
 
 // Validate validates resource spec.

api/v1alpha1/zz_generated.deepcopy.go

@@ -1,4 +1,5 @@
 //go:build !ignore_autogenerated
+// +build !ignore_autogenerated
 
 /*
 Copyright 2020 The actions-runner-controller authors.
@@ -89,22 +90,6 @@ func (in *CheckRunSpec) DeepCopy() *CheckRunSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GitHubAPICredentialsFrom) DeepCopyInto(out *GitHubAPICredentialsFrom) {
-	*out = *in
-	out.SecretRef = in.SecretRef
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitHubAPICredentialsFrom.
-func (in *GitHubAPICredentialsFrom) DeepCopy() *GitHubAPICredentialsFrom {
-	if in == nil {
-		return nil
-	}
-	out := new(GitHubAPICredentialsFrom)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *GitHubEventScaleUpTriggerSpec) DeepCopyInto(out *GitHubEventScaleUpTriggerSpec) {
 	*out = *in
@@ -246,11 +231,6 @@ func (in *HorizontalRunnerAutoscalerSpec) DeepCopyInto(out *HorizontalRunnerAuto
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.GitHubAPICredentialsFrom != nil {
-		in, out := &in.GitHubAPICredentialsFrom, &out.GitHubAPICredentialsFrom
-		*out = new(GitHubAPICredentialsFrom)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HorizontalRunnerAutoscalerSpec.
@@ -435,11 +415,6 @@ func (in *RunnerConfig) DeepCopyInto(out *RunnerConfig) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.DockerVarRunVolumeSizeLimit != nil {
-		in, out := &in.DockerVarRunVolumeSizeLimit, &out.DockerVarRunVolumeSizeLimit
-		x := (*in).DeepCopy()
-		*out = &x
-	}
 	if in.VolumeSizeLimit != nil {
 		in, out := &in.VolumeSizeLimit, &out.VolumeSizeLimit
 		x := (*in).DeepCopy()
@@ -450,11 +425,6 @@ func (in *RunnerConfig) DeepCopyInto(out *RunnerConfig) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.GitHubAPICredentialsFrom != nil {
-		in, out := &in.GitHubAPICredentialsFrom, &out.GitHubAPICredentialsFrom
-		*out = new(GitHubAPICredentialsFrom)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerConfig.
@@ -1053,11 +1023,6 @@ func (in *RunnerSpec) DeepCopy() *RunnerSpec {
 func (in *RunnerStatus) DeepCopyInto(out *RunnerStatus) {
 	*out = *in
 	in.Registration.DeepCopyInto(&out.Registration)
-	if in.WorkflowStatus != nil {
-		in, out := &in.WorkflowStatus, &out.WorkflowStatus
-		*out = new(WorkflowStatus)
-		**out = **in
-	}
 	if in.LastRegistrationCheckTime != nil {
 		in, out := &in.LastRegistrationCheckTime, &out.LastRegistrationCheckTime
 		*out = (*in).DeepCopy()
@@ -1171,21 +1136,6 @@ func (in *ScheduledOverride) DeepCopy() *ScheduledOverride {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretReference) DeepCopyInto(out *SecretReference) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretReference.
-func (in *SecretReference) DeepCopy() *SecretReference {
-	if in == nil {
-		return nil
-	}
-	out := new(SecretReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *WorkVolumeClaimTemplate) DeepCopyInto(out *WorkVolumeClaimTemplate) {
 	*out = *in
@@ -1221,18 +1171,3 @@ func (in *WorkflowJobSpec) DeepCopy() *WorkflowJobSpec {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowStatus) DeepCopyInto(out *WorkflowStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowStatus.
-func (in *WorkflowStatus) DeepCopy() *WorkflowStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowStatus)
-	in.DeepCopyInto(out)
-	return out
-}

apis/actions.github.com/v1alpha1/autoscalinglistener_types.go

@@ -1,97 +0,0 @@
-/*
-Copyright 2020 The actions-runner-controller authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// AutoscalingListenerSpec defines the desired state of AutoscalingListener
-type AutoscalingListenerSpec struct {
-	// Required
-	GitHubConfigUrl string `json:"githubConfigUrl,omitempty"`
-
-	// Required
-	GitHubConfigSecret string `json:"githubConfigSecret,omitempty"`
-
-	// Required
-	RunnerScaleSetId int `json:"runnerScaleSetId,omitempty"`
-
-	// Required
-	AutoscalingRunnerSetNamespace string `json:"autoscalingRunnerSetNamespace,omitempty"`
-
-	// Required
-	AutoscalingRunnerSetName string `json:"autoscalingRunnerSetName,omitempty"`
-
-	// Required
-	EphemeralRunnerSetName string `json:"ephemeralRunnerSetName,omitempty"`
-
-	// Required
-	// +kubebuilder:validation:Minimum:=0
-	MaxRunners int `json:"maxRunners,omitempty"`
-
-	// Required
-	// +kubebuilder:validation:Minimum:=0
-	MinRunners int `json:"minRunners,omitempty"`
-
-	// Required
-	Image string `json:"image,omitempty"`
-
-	// Required
-	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
-
-	// +optional
-	Proxy *ProxyConfig `json:"proxy,omitempty"`
-
-	// +optional
-	GitHubServerTLS *GitHubServerTLSConfig `json:"githubServerTLS,omitempty"`
-
-	// +optional
-	Template *corev1.PodTemplateSpec `json:"template,omitempty"`
-}
-
-// AutoscalingListenerStatus defines the observed state of AutoscalingListener
-type AutoscalingListenerStatus struct{}
-
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-//+kubebuilder:printcolumn:JSONPath=".spec.githubConfigUrl",name=GitHub Configure URL,type=string
-//+kubebuilder:printcolumn:JSONPath=".spec.autoscalingRunnerSetNamespace",name=AutoscalingRunnerSet Namespace,type=string
-//+kubebuilder:printcolumn:JSONPath=".spec.autoscalingRunnerSetName",name=AutoscalingRunnerSet Name,type=string
-
-// AutoscalingListener is the Schema for the autoscalinglisteners API
-type AutoscalingListener struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   AutoscalingListenerSpec   `json:"spec,omitempty"`
-	Status AutoscalingListenerStatus `json:"status,omitempty"`
-}
-
-//+kubebuilder:object:root=true
-
-// AutoscalingListenerList contains a list of AutoscalingListener
-type AutoscalingListenerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []AutoscalingListener `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&AutoscalingListener{}, &AutoscalingListenerList{})
-}

apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go

@@ -1,292 +0,0 @@
-/*
-Copyright 2020 The actions-runner-controller authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	"crypto/x509"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"github.com/actions/actions-runner-controller/hash"
-	"golang.org/x/net/http/httpproxy"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-//+kubebuilder:printcolumn:JSONPath=".spec.minRunners",name=Minimum Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".spec.maxRunners",name=Maximum Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.currentRunners",name=Current Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.state",name=State,type=string
-//+kubebuilder:printcolumn:JSONPath=".status.pendingEphemeralRunners",name=Pending Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.runningEphemeralRunners",name=Running Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.finishedEphemeralRunners",name=Finished Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.deletingEphemeralRunners",name=Deleting Runners,type=integer
-
-// AutoscalingRunnerSet is the Schema for the autoscalingrunnersets API
-type AutoscalingRunnerSet struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   AutoscalingRunnerSetSpec   `json:"spec,omitempty"`
-	Status AutoscalingRunnerSetStatus `json:"status,omitempty"`
-}
-
-// AutoscalingRunnerSetSpec defines the desired state of AutoscalingRunnerSet
-type AutoscalingRunnerSetSpec struct {
-	// Required
-	GitHubConfigUrl string `json:"githubConfigUrl,omitempty"`
-
-	// Required
-	GitHubConfigSecret string `json:"githubConfigSecret,omitempty"`
-
-	// +optional
-	RunnerGroup string `json:"runnerGroup,omitempty"`
-
-	// +optional
-	RunnerScaleSetName string `json:"runnerScaleSetName,omitempty"`
-
-	// +optional
-	Proxy *ProxyConfig `json:"proxy,omitempty"`
-
-	// +optional
-	GitHubServerTLS *GitHubServerTLSConfig `json:"githubServerTLS,omitempty"`
-
-	// Required
-	Template corev1.PodTemplateSpec `json:"template,omitempty"`
-
-	// +optional
-	ListenerTemplate *corev1.PodTemplateSpec `json:"listenerTemplate,omitempty"`
-
-	// +optional
-	// +kubebuilder:validation:Minimum:=0
-	MaxRunners *int `json:"maxRunners,omitempty"`
-
-	// +optional
-	// +kubebuilder:validation:Minimum:=0
-	MinRunners *int `json:"minRunners,omitempty"`
-}
-
-type GitHubServerTLSConfig struct {
-	// Required
-	CertificateFrom *TLSCertificateSource `json:"certificateFrom,omitempty"`
-}
-
-func (c *GitHubServerTLSConfig) ToCertPool(keyFetcher func(name, key string) ([]byte, error)) (*x509.CertPool, error) {
-	if c.CertificateFrom == nil {
-		return nil, fmt.Errorf("certificateFrom not specified")
-	}
-
-	if c.CertificateFrom.ConfigMapKeyRef == nil {
-		return nil, fmt.Errorf("configMapKeyRef not specified")
-	}
-
-	cert, err := keyFetcher(c.CertificateFrom.ConfigMapKeyRef.Name, c.CertificateFrom.ConfigMapKeyRef.Key)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"failed to fetch key %q in configmap %q: %w",
-			c.CertificateFrom.ConfigMapKeyRef.Key,
-			c.CertificateFrom.ConfigMapKeyRef.Name,
-			err,
-		)
-	}
-
-	systemPool, err := x509.SystemCertPool()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get system cert pool: %w", err)
-	}
-
-	pool := systemPool.Clone()
-	if !pool.AppendCertsFromPEM(cert) {
-		return nil, fmt.Errorf("failed to parse certificate")
-	}
-
-	return pool, nil
-}
-
-type TLSCertificateSource struct {
-	// Required
-	ConfigMapKeyRef *corev1.ConfigMapKeySelector `json:"configMapKeyRef,omitempty"`
-}
-
-type ProxyConfig struct {
-	// +optional
-	HTTP *ProxyServerConfig `json:"http,omitempty"`
-
-	// +optional
-	HTTPS *ProxyServerConfig `json:"https,omitempty"`
-
-	// +optional
-	NoProxy []string `json:"noProxy,omitempty"`
-}
-
-func (c *ProxyConfig) toHTTPProxyConfig(secretFetcher func(string) (*corev1.Secret, error)) (*httpproxy.Config, error) {
-	config := &httpproxy.Config{
-		NoProxy: strings.Join(c.NoProxy, ","),
-	}
-
-	if c.HTTP != nil {
-		u, err := url.Parse(c.HTTP.Url)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse proxy http url %q: %w", c.HTTP.Url, err)
-		}
-
-		if c.HTTP.CredentialSecretRef != "" {
-			secret, err := secretFetcher(c.HTTP.CredentialSecretRef)
-			if err != nil {
-				return nil, fmt.Errorf(
-					"failed to get secret %s for http proxy: %w",
-					c.HTTP.CredentialSecretRef,
-					err,
-				)
-			}
-
-			u.User = url.UserPassword(
-				string(secret.Data["username"]),
-				string(secret.Data["password"]),
-			)
-		}
-
-		config.HTTPProxy = u.String()
-	}
-
-	if c.HTTPS != nil {
-		u, err := url.Parse(c.HTTPS.Url)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse proxy https url %q: %w", c.HTTPS.Url, err)
-		}
-
-		if c.HTTPS.CredentialSecretRef != "" {
-			secret, err := secretFetcher(c.HTTPS.CredentialSecretRef)
-			if err != nil {
-				return nil, fmt.Errorf(
-					"failed to get secret %s for https proxy: %w",
-					c.HTTPS.CredentialSecretRef,
-					err,
-				)
-			}
-
-			u.User = url.UserPassword(
-				string(secret.Data["username"]),
-				string(secret.Data["password"]),
-			)
-		}
-
-		config.HTTPSProxy = u.String()
-	}
-
-	return config, nil
-}
-
-func (c *ProxyConfig) ToSecretData(secretFetcher func(string) (*corev1.Secret, error)) (map[string][]byte, error) {
-	config, err := c.toHTTPProxyConfig(secretFetcher)
-	if err != nil {
-		return nil, err
-	}
-
-	data := map[string][]byte{}
-	data["http_proxy"] = []byte(config.HTTPProxy)
-	data["https_proxy"] = []byte(config.HTTPSProxy)
-	data["no_proxy"] = []byte(config.NoProxy)
-
-	return data, nil
-}
-
-func (c *ProxyConfig) ProxyFunc(secretFetcher func(string) (*corev1.Secret, error)) (func(*http.Request) (*url.URL, error), error) {
-	config, err := c.toHTTPProxyConfig(secretFetcher)
-	if err != nil {
-		return nil, err
-	}
-
-	proxyFunc := func(req *http.Request) (*url.URL, error) {
-		return config.ProxyFunc()(req.URL)
-	}
-
-	return proxyFunc, nil
-}
-
-type ProxyServerConfig struct {
-	// Required
-	Url string `json:"url,omitempty"`
-
-	// +optional
-	CredentialSecretRef string `json:"credentialSecretRef,omitempty"`
-}
-
-// AutoscalingRunnerSetStatus defines the observed state of AutoscalingRunnerSet
-type AutoscalingRunnerSetStatus struct {
-	// +optional
-	CurrentRunners int `json:"currentRunners"`
-
-	// +optional
-	State string `json:"state"`
-
-	// EphemeralRunner counts separated by the stage ephemeral runners are in, taken from the EphemeralRunnerSet
-
-	//+optional
-	PendingEphemeralRunners int `json:"pendingEphemeralRunners"`
-	// +optional
-	RunningEphemeralRunners int `json:"runningEphemeralRunners"`
-	// +optional
-	FailedEphemeralRunners int `json:"failedEphemeralRunners"`
-}
-
-func (ars *AutoscalingRunnerSet) ListenerSpecHash() string {
-	arsSpec := ars.Spec.DeepCopy()
-	spec := arsSpec
-	return hash.ComputeTemplateHash(&spec)
-}
-
-func (ars *AutoscalingRunnerSet) RunnerSetSpecHash() string {
-	type runnerSetSpec struct {
-		GitHubConfigUrl    string
-		GitHubConfigSecret string
-		RunnerGroup        string
-		RunnerScaleSetName string
-		Proxy              *ProxyConfig
-		GitHubServerTLS    *GitHubServerTLSConfig
-		Template           corev1.PodTemplateSpec
-	}
-	spec := &runnerSetSpec{
-		GitHubConfigUrl:    ars.Spec.GitHubConfigUrl,
-		GitHubConfigSecret: ars.Spec.GitHubConfigSecret,
-		RunnerGroup:        ars.Spec.RunnerGroup,
-		RunnerScaleSetName: ars.Spec.RunnerScaleSetName,
-		Proxy:              ars.Spec.Proxy,
-		GitHubServerTLS:    ars.Spec.GitHubServerTLS,
-		Template:           ars.Spec.Template,
-	}
-	return hash.ComputeTemplateHash(&spec)
-}
-
-//+kubebuilder:object:root=true
-
-// AutoscalingRunnerSetList contains a list of AutoscalingRunnerSet
-type AutoscalingRunnerSetList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []AutoscalingRunnerSet `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&AutoscalingRunnerSet{}, &AutoscalingRunnerSetList{})
-}

apis/actions.github.com/v1alpha1/ephemeralrunner_types.go

@@ -1,133 +0,0 @@
-/*
-Copyright 2020 The actions-runner-controller authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-//+kubebuilder:object:root=true
-//+kubebuilder:subresource:status
-// +kubebuilder:printcolumn:JSONPath=".spec.githubConfigUrl",name="GitHub Config URL",type=string
-// +kubebuilder:printcolumn:JSONPath=".status.runnerId",name=RunnerId,type=number
-// +kubebuilder:printcolumn:JSONPath=".status.phase",name=Status,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.jobRepositoryName",name=JobRepository,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.jobWorkflowRef",name=JobWorkflowRef,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.workflowRunId",name=WorkflowRunId,type=number
-// +kubebuilder:printcolumn:JSONPath=".status.jobDisplayName",name=JobDisplayName,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.message",name=Message,type=string
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
-
-// EphemeralRunner is the Schema for the ephemeralrunners API
-type EphemeralRunner struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   EphemeralRunnerSpec   `json:"spec,omitempty"`
-	Status EphemeralRunnerStatus `json:"status,omitempty"`
-}
-
-// EphemeralRunnerSpec defines the desired state of EphemeralRunner
-type EphemeralRunnerSpec struct {
-	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-
-	// +required
-	GitHubConfigUrl string `json:"githubConfigUrl,omitempty"`
-
-	// +required
-	GitHubConfigSecret string `json:"githubConfigSecret,omitempty"`
-
-	// +required
-	RunnerScaleSetId int `json:"runnerScaleSetId,omitempty"`
-
-	// +optional
-	Proxy *ProxyConfig `json:"proxy,omitempty"`
-
-	// +optional
-	ProxySecretRef string `json:"proxySecretRef,omitempty"`
-
-	// +optional
-	GitHubServerTLS *GitHubServerTLSConfig `json:"githubServerTLS,omitempty"`
-
-	// +required
-	corev1.PodTemplateSpec `json:",inline"`
-}
-
-// EphemeralRunnerStatus defines the observed state of EphemeralRunner
-type EphemeralRunnerStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
-
-	// Turns true only if the runner is online.
-	// +optional
-	Ready bool `json:"ready"`
-	// Phase describes phases where EphemeralRunner can be in.
-	// The underlying type is a PodPhase, but the meaning is more restrictive
-	//
-	// The PodFailed phase should be set only when EphemeralRunner fails to start
-	// after multiple retries. That signals that this EphemeralRunner won't work,
-	// and manual inspection is required
-	//
-	// The PodSucceded phase should be set only when confirmed that EphemeralRunner
-	// actually executed the job and has been removed from the service.
-	// +optional
-	Phase corev1.PodPhase `json:"phase,omitempty"`
-	// +optional
-	Reason string `json:"reason,omitempty"`
-	// +optional
-	Message string `json:"message,omitempty"`
-
-	// +optional
-	RunnerId int `json:"runnerId,omitempty"`
-	// +optional
-	RunnerName string `json:"runnerName,omitempty"`
-	// +optional
-	RunnerJITConfig string `json:"runnerJITConfig,omitempty"`
-
-	// +optional
-	Failures map[string]bool `json:"failures,omitempty"`
-
-	// +optional
-	JobRequestId int64 `json:"jobRequestId,omitempty"`
-
-	// +optional
-	JobRepositoryName string `json:"jobRepositoryName,omitempty"`
-
-	// +optional
-	JobWorkflowRef string `json:"jobWorkflowRef,omitempty"`
-
-	// +optional
-	WorkflowRunId int64 `json:"workflowRunId,omitempty"`
-
-	// +optional
-	JobDisplayName string `json:"jobDisplayName,omitempty"`
-}
-
-//+kubebuilder:object:root=true
-
-// EphemeralRunnerList contains a list of EphemeralRunner
-type EphemeralRunnerList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []EphemeralRunner `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&EphemeralRunner{}, &EphemeralRunnerList{})
-}

apis/actions.github.com/v1alpha1/ephemeralrunnerset_types.go

@@ -1,75 +0,0 @@
-/*
-Copyright 2020 The actions-runner-controller authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package v1alpha1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// EphemeralRunnerSetSpec defines the desired state of EphemeralRunnerSet
-type EphemeralRunnerSetSpec struct {
-	// Replicas is the number of desired EphemeralRunner resources in the k8s namespace.
-	Replicas int `json:"replicas,omitempty"`
-
-	EphemeralRunnerSpec EphemeralRunnerSpec `json:"ephemeralRunnerSpec,omitempty"`
-}
-
-// EphemeralRunnerSetStatus defines the observed state of EphemeralRunnerSet
-type EphemeralRunnerSetStatus struct {
-	// CurrentReplicas is the number of currently running EphemeralRunner resources being managed by this EphemeralRunnerSet.
-	CurrentReplicas int `json:"currentReplicas"`
-
-	// EphemeralRunner counts separated by the stage ephemeral runners are in
-
-	// +optional
-	PendingEphemeralRunners int `json:"pendingEphemeralRunners"`
-	// +optional
-	RunningEphemeralRunners int `json:"runningEphemeralRunners"`
-	// +optional
-	FailedEphemeralRunners int `json:"failedEphemeralRunners"`
-}
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +kubebuilder:printcolumn:JSONPath=".spec.replicas",name="DesiredReplicas",type="integer"
-// +kubebuilder:printcolumn:JSONPath=".status.currentReplicas", name="CurrentReplicas",type="integer"
-//+kubebuilder:printcolumn:JSONPath=".status.pendingEphemeralRunners",name=Pending Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.runningEphemeralRunners",name=Running Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.finishedEphemeralRunners",name=Finished Runners,type=integer
-//+kubebuilder:printcolumn:JSONPath=".status.deletingEphemeralRunners",name=Deleting Runners,type=integer
-
-// EphemeralRunnerSet is the Schema for the ephemeralrunnersets API
-type EphemeralRunnerSet struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   EphemeralRunnerSetSpec   `json:"spec,omitempty"`
-	Status EphemeralRunnerSetStatus `json:"status,omitempty"`
-}
-
-//+kubebuilder:object:root=true
-
-// EphemeralRunnerSetList contains a list of EphemeralRunnerSet
-type EphemeralRunnerSetList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []EphemeralRunnerSet `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&EphemeralRunnerSet{}, &EphemeralRunnerSetList{})
-}

apis/actions.github.com/v1alpha1/groupversion_info.go

@@ -1,36 +0,0 @@
-/*
-Copyright 2020 The actions-runner-controller authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package v1 contains API Schema definitions for the batch v1 API group
-// +kubebuilder:object:generate=true
-// +groupName=actions.github.com
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-)
-
-var (
-	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "actions.github.com", Version: "v1alpha1"}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
-
-	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
-)

apis/actions.github.com/v1alpha1/proxy_config_test.go

@@ -1,118 +0,0 @@
-package v1alpha1_test
-
-import (
-	"net/http"
-	"testing"
-
-	corev1 "k8s.io/api/core/v1"
-
-	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestProxyConfig_ToSecret(t *testing.T) {
-	config := &v1alpha1.ProxyConfig{
-		HTTP: &v1alpha1.ProxyServerConfig{
-			Url:                 "http://proxy.example.com:8080",
-			CredentialSecretRef: "my-secret",
-		},
-		HTTPS: &v1alpha1.ProxyServerConfig{
-			Url:                 "https://proxy.example.com:8080",
-			CredentialSecretRef: "my-secret",
-		},
-		NoProxy: []string{
-			"noproxy.example.com",
-			"noproxy2.example.com",
-		},
-	}
-
-	secretFetcher := func(string) (*corev1.Secret, error) {
-		return &corev1.Secret{
-			Data: map[string][]byte{
-				"username": []byte("username"),
-				"password": []byte("password"),
-			},
-		}, nil
-	}
-
-	result, err := config.ToSecretData(secretFetcher)
-	require.NoError(t, err)
-	require.NotNil(t, result)
-
-	assert.Equal(t, "http://username:password@proxy.example.com:8080", string(result["http_proxy"]))
-	assert.Equal(t, "https://username:password@proxy.example.com:8080", string(result["https_proxy"]))
-	assert.Equal(t, "noproxy.example.com,noproxy2.example.com", string(result["no_proxy"]))
-}
-
-func TestProxyConfig_ProxyFunc(t *testing.T) {
-	config := &v1alpha1.ProxyConfig{
-		HTTP: &v1alpha1.ProxyServerConfig{
-			Url:                 "http://proxy.example.com:8080",
-			CredentialSecretRef: "my-secret",
-		},
-		HTTPS: &v1alpha1.ProxyServerConfig{
-			Url:                 "https://proxy.example.com:8080",
-			CredentialSecretRef: "my-secret",
-		},
-		NoProxy: []string{
-			"noproxy.example.com",
-			"noproxy2.example.com",
-		},
-	}
-
-	secretFetcher := func(string) (*corev1.Secret, error) {
-		return &corev1.Secret{
-			Data: map[string][]byte{
-				"username": []byte("username"),
-				"password": []byte("password"),
-			},
-		}, nil
-	}
-
-	result, err := config.ProxyFunc(secretFetcher)
-	require.NoError(t, err)
-
-	tests := []struct {
-		name string
-		in   string
-		out  string
-	}{
-		{
-			name: "http target",
-			in:   "http://target.com",
-			out:  "http://username:password@proxy.example.com:8080",
-		},
-		{
-			name: "https target",
-			in:   "https://target.com",
-			out:  "https://username:password@proxy.example.com:8080",
-		},
-		{
-			name: "no proxy",
-			in:   "https://noproxy.example.com",
-			out:  "",
-		},
-		{
-			name: "no proxy 2",
-			in:   "https://noproxy2.example.com",
-			out:  "",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			req, err := http.NewRequest("GET", test.in, nil)
-			require.NoError(t, err)
-			u, err := result(req)
-			require.NoError(t, err)
-
-			if test.out == "" {
-				assert.Nil(t, u)
-				return
-			}
-
-			assert.Equal(t, test.out, u.String())
-		})
-	}
-}

apis/actions.github.com/v1alpha1/tls_config_test.go

@@ -1,105 +0,0 @@
-package v1alpha1_test
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"net/http"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1"
-	"github.com/actions/actions-runner-controller/github/actions/testserver"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	v1 "k8s.io/api/core/v1"
-)
-
-func TestGitHubServerTLSConfig_ToCertPool(t *testing.T) {
-	t.Run("returns an error if CertificateFrom not specified", func(t *testing.T) {
-		c := &v1alpha1.GitHubServerTLSConfig{
-			CertificateFrom: nil,
-		}
-
-		pool, err := c.ToCertPool(nil)
-		assert.Nil(t, pool)
-
-		require.Error(t, err)
-		assert.Equal(t, err.Error(), "certificateFrom not specified")
-	})
-
-	t.Run("returns an error if CertificateFrom.ConfigMapKeyRef not specified", func(t *testing.T) {
-		c := &v1alpha1.GitHubServerTLSConfig{
-			CertificateFrom: &v1alpha1.TLSCertificateSource{},
-		}
-
-		pool, err := c.ToCertPool(nil)
-		assert.Nil(t, pool)
-
-		require.Error(t, err)
-		assert.Equal(t, err.Error(), "configMapKeyRef not specified")
-	})
-
-	t.Run("returns a valid cert pool with correct configuration", func(t *testing.T) {
-		c := &v1alpha1.GitHubServerTLSConfig{
-			CertificateFrom: &v1alpha1.TLSCertificateSource{
-				ConfigMapKeyRef: &v1.ConfigMapKeySelector{
-					LocalObjectReference: v1.LocalObjectReference{
-						Name: "name",
-					},
-					Key: "key",
-				},
-			},
-		}
-
-		certsFolder := filepath.Join(
-			"../../../",
-			"github",
-			"actions",
-			"testdata",
-		)
-
-		fetcher := func(name, key string) ([]byte, error) {
-			cert, err := os.ReadFile(filepath.Join(certsFolder, "rootCA.crt"))
-			require.NoError(t, err)
-
-			pool := x509.NewCertPool()
-			ok := pool.AppendCertsFromPEM(cert)
-			assert.True(t, ok)
-
-			return cert, nil
-		}
-
-		pool, err := c.ToCertPool(fetcher)
-		require.NoError(t, err)
-		require.NotNil(t, pool)
-
-		// can be used to communicate with a server
-		serverSuccessfullyCalled := false
-		server := testserver.NewUnstarted(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			serverSuccessfullyCalled = true
-			w.WriteHeader(http.StatusOK)
-		}))
-
-		cert, err := tls.LoadX509KeyPair(
-			filepath.Join(certsFolder, "server.crt"),
-			filepath.Join(certsFolder, "server.key"),
-		)
-		require.NoError(t, err)
-
-		server.TLS = &tls.Config{Certificates: []tls.Certificate{cert}}
-		server.StartTLS()
-
-		client := &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					RootCAs: pool,
-				},
-			},
-		}
-
-		_, err = client.Get(server.URL)
-		assert.NoError(t, err)
-		assert.True(t, serverSuccessfullyCalled)
-	})
-}

apis/actions.github.com/v1alpha1/zz_generated.deepcopy.go

@@ -1,532 +0,0 @@
-//go:build !ignore_autogenerated
-
-/*
-Copyright 2020 The actions-runner-controller authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	"k8s.io/api/core/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingListener) DeepCopyInto(out *AutoscalingListener) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	out.Status = in.Status
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingListener.
-func (in *AutoscalingListener) DeepCopy() *AutoscalingListener {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingListener)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AutoscalingListener) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingListenerList) DeepCopyInto(out *AutoscalingListenerList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AutoscalingListener, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingListenerList.
-func (in *AutoscalingListenerList) DeepCopy() *AutoscalingListenerList {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingListenerList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AutoscalingListenerList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingListenerSpec) DeepCopyInto(out *AutoscalingListenerSpec) {
-	*out = *in
-	if in.ImagePullSecrets != nil {
-		in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
-		*out = make([]v1.LocalObjectReference, len(*in))
-		copy(*out, *in)
-	}
-	if in.Proxy != nil {
-		in, out := &in.Proxy, &out.Proxy
-		*out = new(ProxyConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.GitHubServerTLS != nil {
-		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
-		*out = new(GitHubServerTLSConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Template != nil {
-		in, out := &in.Template, &out.Template
-		*out = new(v1.PodTemplateSpec)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingListenerSpec.
-func (in *AutoscalingListenerSpec) DeepCopy() *AutoscalingListenerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingListenerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingListenerStatus) DeepCopyInto(out *AutoscalingListenerStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingListenerStatus.
-func (in *AutoscalingListenerStatus) DeepCopy() *AutoscalingListenerStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingListenerStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingRunnerSet) DeepCopyInto(out *AutoscalingRunnerSet) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	out.Status = in.Status
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingRunnerSet.
-func (in *AutoscalingRunnerSet) DeepCopy() *AutoscalingRunnerSet {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingRunnerSet)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AutoscalingRunnerSet) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingRunnerSetList) DeepCopyInto(out *AutoscalingRunnerSetList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]AutoscalingRunnerSet, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingRunnerSetList.
-func (in *AutoscalingRunnerSetList) DeepCopy() *AutoscalingRunnerSetList {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingRunnerSetList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AutoscalingRunnerSetList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingRunnerSetSpec) DeepCopyInto(out *AutoscalingRunnerSetSpec) {
-	*out = *in
-	if in.Proxy != nil {
-		in, out := &in.Proxy, &out.Proxy
-		*out = new(ProxyConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.GitHubServerTLS != nil {
-		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
-		*out = new(GitHubServerTLSConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	in.Template.DeepCopyInto(&out.Template)
-	if in.ListenerTemplate != nil {
-		in, out := &in.ListenerTemplate, &out.ListenerTemplate
-		*out = new(v1.PodTemplateSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.MaxRunners != nil {
-		in, out := &in.MaxRunners, &out.MaxRunners
-		*out = new(int)
-		**out = **in
-	}
-	if in.MinRunners != nil {
-		in, out := &in.MinRunners, &out.MinRunners
-		*out = new(int)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingRunnerSetSpec.
-func (in *AutoscalingRunnerSetSpec) DeepCopy() *AutoscalingRunnerSetSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingRunnerSetSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AutoscalingRunnerSetStatus) DeepCopyInto(out *AutoscalingRunnerSetStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingRunnerSetStatus.
-func (in *AutoscalingRunnerSetStatus) DeepCopy() *AutoscalingRunnerSetStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(AutoscalingRunnerSetStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunner) DeepCopyInto(out *EphemeralRunner) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunner.
-func (in *EphemeralRunner) DeepCopy() *EphemeralRunner {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunner)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EphemeralRunner) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerList) DeepCopyInto(out *EphemeralRunnerList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]EphemeralRunner, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerList.
-func (in *EphemeralRunnerList) DeepCopy() *EphemeralRunnerList {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EphemeralRunnerList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerSet) DeepCopyInto(out *EphemeralRunnerSet) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	out.Status = in.Status
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerSet.
-func (in *EphemeralRunnerSet) DeepCopy() *EphemeralRunnerSet {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerSet)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EphemeralRunnerSet) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerSetList) DeepCopyInto(out *EphemeralRunnerSetList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]EphemeralRunnerSet, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerSetList.
-func (in *EphemeralRunnerSetList) DeepCopy() *EphemeralRunnerSetList {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerSetList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *EphemeralRunnerSetList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerSetSpec) DeepCopyInto(out *EphemeralRunnerSetSpec) {
-	*out = *in
-	in.EphemeralRunnerSpec.DeepCopyInto(&out.EphemeralRunnerSpec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerSetSpec.
-func (in *EphemeralRunnerSetSpec) DeepCopy() *EphemeralRunnerSetSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerSetSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerSetStatus) DeepCopyInto(out *EphemeralRunnerSetStatus) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerSetStatus.
-func (in *EphemeralRunnerSetStatus) DeepCopy() *EphemeralRunnerSetStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerSetStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerSpec) DeepCopyInto(out *EphemeralRunnerSpec) {
-	*out = *in
-	if in.Proxy != nil {
-		in, out := &in.Proxy, &out.Proxy
-		*out = new(ProxyConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.GitHubServerTLS != nil {
-		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
-		*out = new(GitHubServerTLSConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	in.PodTemplateSpec.DeepCopyInto(&out.PodTemplateSpec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerSpec.
-func (in *EphemeralRunnerSpec) DeepCopy() *EphemeralRunnerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *EphemeralRunnerStatus) DeepCopyInto(out *EphemeralRunnerStatus) {
-	*out = *in
-	if in.Failures != nil {
-		in, out := &in.Failures, &out.Failures
-		*out = make(map[string]bool, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerStatus.
-func (in *EphemeralRunnerStatus) DeepCopy() *EphemeralRunnerStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(EphemeralRunnerStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GitHubServerTLSConfig) DeepCopyInto(out *GitHubServerTLSConfig) {
-	*out = *in
-	if in.CertificateFrom != nil {
-		in, out := &in.CertificateFrom, &out.CertificateFrom
-		*out = new(TLSCertificateSource)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitHubServerTLSConfig.
-func (in *GitHubServerTLSConfig) DeepCopy() *GitHubServerTLSConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(GitHubServerTLSConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ProxyConfig) DeepCopyInto(out *ProxyConfig) {
-	*out = *in
-	if in.HTTP != nil {
-		in, out := &in.HTTP, &out.HTTP
-		*out = new(ProxyServerConfig)
-		**out = **in
-	}
-	if in.HTTPS != nil {
-		in, out := &in.HTTPS, &out.HTTPS
-		*out = new(ProxyServerConfig)
-		**out = **in
-	}
-	if in.NoProxy != nil {
-		in, out := &in.NoProxy, &out.NoProxy
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxyConfig.
-func (in *ProxyConfig) DeepCopy() *ProxyConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(ProxyConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ProxyServerConfig) DeepCopyInto(out *ProxyServerConfig) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxyServerConfig.
-func (in *ProxyServerConfig) DeepCopy() *ProxyServerConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(ProxyServerConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TLSCertificateSource) DeepCopyInto(out *TLSCertificateSource) {
-	*out = *in
-	if in.ConfigMapKeyRef != nil {
-		in, out := &in.ConfigMapKeyRef, &out.ConfigMapKeyRef
-		*out = new(v1.ConfigMapKeySelector)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSCertificateSource.
-func (in *TLSCertificateSource) DeepCopy() *TLSCertificateSource {
-	if in == nil {
-		return nil
-	}
-	out := new(TLSCertificateSource)
-	in.DeepCopyInto(out)
-	return out
-}

build/version.go

@@ -1,6 +0,0 @@
-package build
-
-// This is overridden at build-time using go-build ldflags. dev is the fallback value
-var Version = "NA"
-
-var CommitSHA = "NA"

charts/.ci/ct-config-gha.yaml

@@ -1,9 +0,0 @@
-# This file defines the config for "ct" (chart tester) used by the helm linting GitHub workflow
-lint-conf: charts/.ci/lint-config.yaml
-chart-repos:
-  - jetstack=https://charts.jetstack.io
-check-version-increment: false # Disable checking that the chart version has been bumped
-charts:
-- charts/gha-runner-scale-set-controller
-- charts/gha-runner-scale-set
-skip-clean-up: true

charts/.ci/ct-config.yaml

@@ -3,5 +3,3 @@ lint-conf: charts/.ci/lint-config.yaml
 chart-repos:
   - jetstack=https://charts.jetstack.io
 check-version-increment: false # Disable checking that the chart version has been bumped
-charts:
-- charts/actions-runner-controller

charts/actions-runner-controller/Chart.yaml

@@ -15,15 +15,15 @@ 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.23.5
+version: 0.20.0
 
 # Used as the default manager tag value when no tag property is provided in the values.yaml
-appVersion: 0.27.5
+appVersion: 0.25.0
 
-home: https://github.com/actions/actions-runner-controller
+home: https://github.com/actions-runner-controller/actions-runner-controller
 
 sources:
-  - https://github.com/actions/actions-runner-controller
+  - https://github.com/actions-runner-controller/actions-runner-controller
 
 maintainers:
   - name: actions-runner-controller

charts/actions-runner-controller/README.md

@@ -4,16 +4,16 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 
 ## Values
 
-**_The values are documented as of HEAD, to review the configuration options for your chart version ensure you view this file at the relevant [tag](https://github.com/actions/actions-runner-controller/tags)_**
+**_The values are documented as of HEAD, to review the configuration options for your chart version ensure you view this file at the relevant [tag](https://github.com/actions-runner-controller/actions-runner-controller/tags)_**
 
 > _Default values are the defaults set in the charts `values.yaml`, some properties have default configurations in the code for when the property is omitted or invalid_
 
 | Key                                                      | Description                                                                                                                | Default                                                              |
-|----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|
+|----------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------|
 | `labels`                                                 | Set labels to apply to all resources in the chart                                                                          |                                                                      |
 | `replicaCount`                                           | Set the number of controller pods                                                                                          | 1                                                                    |
 | `webhookPort`                                            | Set the containerPort for the webhook Pod                                                                                  | 9443                                                                 |
-| `syncPeriod`                                             | Set the period in which the controller reconciles the desired runners count                                                               | 1m                                                                                              |
+| `syncPeriod`                                             | Set the period in which the controler reconciles the desired runners count                                                 | 10m                                                                  |
 | `enableLeaderElection`                                   | Enable election configuration                                                                                              | true                                                                 |
 | `leaderElectionId`                                       | Set the election ID for the controller group                                                                               |                                                                      |
 | `githubEnterpriseServerURL`                              | Set the URL for a self-hosted GitHub Enterprise Server                                                                     |                                                                      |
@@ -21,7 +21,6 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 | `githubUploadURL`                                        | Override GitHub Upload URL to be used for GitHub API calls                                                                 |                                                                      |
 | `runnerGithubURL`                                        | Override GitHub URL to be used by runners during registration                                                              |                                                                      |
 | `logLevel`                                               | Set the log level of the controller container                                                                              |                                                                      |
-| `logFormat`                                              | Set the log format of the controller. Valid options are "text" and "json"                                                                 | text                                                                                            |
 | `additionalVolumes`                                      | Set additional volumes to add to the manager container                                                                     |                                                                      |
 | `additionalVolumeMounts`                                 | Set additional volume mounts to add to the manager container                                                               |                                                                      |
 | `authSecret.create`                                      | Deploy the controller auth secret                                                                                          | false                                                                |
@@ -35,21 +34,18 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 | `authSecret.github_basicauth_password`                     | Password for GitHub basic auth to use instead of PAT or GitHub APP in case it's running behind a proxy API                 |                                                                      |
 | `dockerRegistryMirror`                                   | The default Docker Registry Mirror used by runners.                                                                        |                                                                      |
 | `hostNetwork`                                            | The "hostNetwork" of the controller container                                                                              | false                                                                |
-| `dnsPolicy`                                              | The "dnsPolicy" of the controller container                                                                                               | ClusterFirst                                                                                    |
 | `image.repository`                                       | The "repository/image" of the controller container                                                                         | summerwind/actions-runner-controller                                 |
 | `image.tag`                                              | The tag of the controller container                                                                                        |                                                                      |
 | `image.actionsRunnerRepositoryAndTag`                    | The "repository/image" of the actions runner container                                                                     | summerwind/actions-runner:latest                                     |
 | `image.actionsRunnerImagePullSecrets`                    | Optional image pull secrets to be included in the runner pod's ImagePullSecrets                                            |                                                                      |
 | `image.dindSidecarRepositoryAndTag`                      | The "repository/image" of the dind sidecar container                                                                       | docker:dind                                                          |
 | `image.pullPolicy`                                       | The pull policy of the controller image                                                                                    | IfNotPresent                                                         |
-| `metrics.serviceMonitor.enable`                                 | Deploy serviceMonitor kind for for use with prometheus-operator CRDs                                                                      | false                                                                                           |
-| `metrics.serviceMonitor.interval`                                 | Configure the interval that Prometheus should scrap the controller's metrics                                                                      | 1m                                                                                           |
-| `metrics.serviceMonitor.timeout`                                 | Configure the timeout the timeout of Prometheus scrapping.                                                                      | 30s                                                                                           |
+| `metrics.serviceMonitor`                                 | Deploy serviceMonitor kind for for use with prometheus-operator CRDs                                                       | false                                                                |
 | `metrics.serviceAnnotations`                             | Set annotations for the provisioned metrics service resource                                                               |                                                                      |
 | `metrics.port`                                           | Set port of metrics service                                                                                                | 8443                                                                 |
 | `metrics.proxy.enabled`                                  | Deploy kube-rbac-proxy container in controller pod                                                                         | true                                                                 |
 | `metrics.proxy.image.repository`                         | The "repository/image" of the kube-proxy container                                                                         | quay.io/brancz/kube-rbac-proxy                                       |
-| `metrics.proxy.image.tag`                                | The tag of the kube-proxy image to use when pulling the container                                                                         | v0.13.1                                                                                         |
+| `metrics.proxy.image.tag`                                | The tag of the kube-proxy image to use when pulling the container                                                          | v0.10.0                                                              |
 | `metrics.serviceMonitorLabels`                           | Set labels to apply to ServiceMonitor resources                                                                            |                                                                      |
 | `imagePullSecrets`                                       | Specifies the secret to be used when pulling the controller pod containers                                                 |                                                                      |
 | `fullnameOverride`                                       | Override the full resource names	                                                                                        |                                                                      |
@@ -77,14 +73,12 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 | `scope.watchNamespace`                                   | Tells the controller and the github webhook server which namespace to watch if `scope.singleNamespace` is true             | `Release.Namespace` (the default namespace of the helm chart).       |
 | `scope.singleNamespace`                                  | Limit the controller to watch a single namespace                                                                           | false                                                                |
 | `certManagerEnabled`                                     | Enable cert-manager. If disabled you must set admissionWebHooks.caBundle and create TLS secrets manually                   | true                                                                 |
-| `runner.statusUpdateHook.enabled`                        | Use custom RBAC for runners (role, role binding and service account), this will enable reporting runner statuses                          | false                                                                                           |
 | `admissionWebHooks.caBundle`                             | Base64-encoded PEM bundle containing the CA that signed the webhook's serving certificate                                  |                                                                      |
 | `githubWebhookServer.logLevel`                           | Set the log level of the githubWebhookServer container                                                                     |                                                                      |
-| `githubWebhookServer.logFormat`                          | Set the log format of the githubWebhookServer controller. Valid options are "text" and "json"                                             | text                                                                                            |
 | `githubWebhookServer.replicaCount`                       | Set the number of webhook server pods                                                                                      | 1                                                                    |
-| `githubWebhookServer.useRunnerGroupsVisibility`          | Enable supporting runner groups with custom visibility, you also need to set `githubWebhookServer.secret.enabled` to enable this feature. | false                                                                                           |
+| `githubWebhookServer.useRunnerGroupsVisibility`          | Enable supporting runner groups with custom visibility. This will incur in extra API calls and may blow up your budget. Currently, you also need to set `githubWebhookServer.secret.enabled` to enable this feature. | false                                                                |
+| `githubWebhookServer.syncPeriod`                         | Set the period in which the controller reconciles the resources                                                            | 10m                                                                  |
 | `githubWebhookServer.enabled`                            | Deploy the webhook server pod                                                                                              | false                                                                |
-| `githubWebhookServer.queueLimit`                         | Set the queue size limit in the githubWebhookServer                                                                                       |                                                                                                 |
 | `githubWebhookServer.secret.enabled`                      | Passes the webhook hook secret to the github-webhook-server                                                                             | false                                                                |
 | `githubWebhookServer.secret.create`                      | Deploy the webhook hook secret                                                                                             | false                                                                |
 | `githubWebhookServer.secret.name`                        | Set the name of the webhook hook secret                                                                                    | github-webhook-server                                                |
@@ -105,11 +99,8 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 | `githubWebhookServer.tolerations`                        | Set the githubWebhookServer pod tolerations                                                                                |                                                                      |
 | `githubWebhookServer.affinity`                           | Set the githubWebhookServer pod affinity rules                                                                             |                                                                      |
 | `githubWebhookServer.priorityClassName`                  | Set the githubWebhookServer pod priorityClassName                                                                          |                                                                      |
-| `githubWebhookServer.terminationGracePeriodSeconds`      | Set the githubWebhookServer pod terminationGracePeriodSeconds. Useful when using preStop hooks to drain/sleep.                            | `10`                                                                                            |
-| `githubWebhookServer.lifecycle`                          | Set the githubWebhookServer pod lifecycle hooks                                                                                           | `{}`                                                                                            |
 | `githubWebhookServer.service.type`                       | Set githubWebhookServer service type                                                                                       |                                                                      |
 | `githubWebhookServer.service.ports`                      | Set githubWebhookServer service ports                                                                                      | `[{"port":80, "targetPort:"http", "protocol":"TCP", "name":"http"}]` |
-| `githubWebhookServer.service.loadBalancerSourceRanges`   | Set githubWebhookServer loadBalancerSourceRanges for restricting loadBalancer type services                                               | `[]`                                                                                            |
 | `githubWebhookServer.ingress.enabled`                    | Deploy an ingress kind for the githubWebhookServer                                                                         | false                                                                |
 | `githubWebhookServer.ingress.annotations`                | Set annotations for the ingress kind                                                                                       |                                                                      |
 | `githubWebhookServer.ingress.hosts`                      | Set hosts configuration for ingress                                                                                        | `[{"host": "chart-example.local", "paths": []}]`                     |
@@ -118,45 +109,3 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 | `githubWebhookServer.podDisruptionBudget.enabled`        | Enables a PDB to ensure HA of githubwebhook pods                                                                           |      false                                                           |
 | `githubWebhookServer.podDisruptionBudget.minAvailable`   | Minimum number of pods that must be available after eviction                                                               |                                                                      |
 | `githubWebhookServer.podDisruptionBudget.maxUnavailable` | Maximum number of pods that can be unavailable after eviction. Kubernetes 1.7+ required.                                   |                                                                      |
-| `actionsMetricsServer.logLevel`                           | Set the log level of the actionsMetricsServer container                                                                                    |                                                                                                 |
-| `actionsMetricsServer.logFormat`                          | Set the log format of the actionsMetricsServer controller. Valid options are "text" and "json"                                             | text                                                                                            |
-| `actionsMetricsServer.enabled`                            | Deploy the actions metrics server pod                                                                                                             | false                                                                                           |
-| `actionsMetricsServer.secret.enabled`                     | Passes the webhook hook secret to the actions-metrics-server                                                                              | false                                                                                           |
-| `actionsMetricsServer.secret.create`                      | Deploy the webhook hook secret                                                                                                            | false                                                                                           |
-| `actionsMetricsServer.secret.name`                        | Set the name of the webhook hook secret                                                                                                   | actions-metrics-server                                                                           |
-| `actionsMetricsServer.secret.github_webhook_secret_token` | Set the webhook secret token value                                                                                                        |                                                                                                 |
-| `actionsMetricsServer.imagePullSecrets`                   | Specifies the secret to be used when pulling the actionsMetricsServer pod containers                                                       |                                                                                                 |
-| `actionsMetricsServer.nameOverride`                       | Override the resource name prefix	                                                                                                       |                                                                                                 |
-| `actionsMetricsServer.fullnameOverride`                   | Override the full resource names	                                                                                                       |                                                                                                 |
-| `actionsMetricsServer.serviceAccount.create`              | Deploy the actionsMetricsServer under a service account                                                                                    | true                                                                                            |
-| `actionsMetricsServer.serviceAccount.annotations`         | Set annotations for the service account                                                                                                   |                                                                                                 |
-| `actionsMetricsServer.serviceAccount.name`                | Set the service account name                                                                                                              |                                                                                                 |
-| `actionsMetricsServer.podAnnotations`                     | Set annotations for the actionsMetricsServer pod                                                                                           |                                                                                                 |
-| `actionsMetricsServer.podLabels`                          | Set labels for the actionsMetricsServer pod                                                                                                |                                                                                                 |
-| `actionsMetricsServer.podSecurityContext`                 | Set the security context to actionsMetricsServer pod                                                                                       |                                                                                                 |
-| `actionsMetricsServer.securityContext`                    | Set the security context for each container in the actionsMetricsServer pod                                                                |                                                                                                 |
-| `actionsMetricsServer.resources`                          | Set the actionsMetricsServer pod resources                                                                                                 |                                                                                                 |
-| `actionsMetricsServer.topologySpreadConstraints`          | Set the actionsMetricsServer pod topologySpreadConstraints                                                                                 |                                                                                                 |
-| `actionsMetricsServer.nodeSelector`                       | Set the actionsMetricsServer pod nodeSelector                                                                                              |                                                                                                 |
-| `actionsMetricsServer.tolerations`                        | Set the actionsMetricsServer pod tolerations                                                                                               |                                                                                                 |
-| `actionsMetricsServer.affinity`                           | Set the actionsMetricsServer pod affinity rules                                                                                            |                                                                                                 |
-| `actionsMetricsServer.priorityClassName`                  | Set the actionsMetricsServer pod priorityClassName                                                                                         |                                                                                                 |
-| `actionsMetricsServer.terminationGracePeriodSeconds`      | Set the actionsMetricsServer pod terminationGracePeriodSeconds. Useful when using preStop hooks to drain/sleep.                           | `10`                                                                                            |
-| `actionsMetricsServer.lifecycle`                          | Set the actionsMetricsServer pod lifecycle hooks                                                                                          | `{}`                                                                                            |
-| `actionsMetricsServer.service.type`                       | Set actionsMetricsServer service type                                                                                                      |                                                                                                 |
-| `actionsMetricsServer.service.ports`                      | Set actionsMetricsServer service ports                                                                                                     | `[{"port":80, "targetPort:"http", "protocol":"TCP", "name":"http"}]`                            |
-| `actionsMetricsServer.service.loadBalancerSourceRanges`   | Set actionsMetricsServer loadBalancerSourceRanges for restricting loadBalancer type services                                              | `[]`                                                                                            |
-| `actionsMetricsServer.ingress.enabled`                    | Deploy an ingress kind for the actionsMetricsServer                                                                                        | false                                                                                           |
-| `actionsMetricsServer.ingress.annotations`                | Set annotations for the ingress kind                                                                                                      |                                                                                                 |
-| `actionsMetricsServer.ingress.hosts`                      | Set hosts configuration for ingress                                                                                                       | `[{"host": "chart-example.local", "paths": []}]`                                                |
-| `actionsMetricsServer.ingress.tls`                        | Set tls configuration for ingress                                                                                                         |                                                                                                 |
-| `actionsMetricsServer.ingress.ingressClassName`           | Set ingress class name                                                                                                                    |                                                                                                 |
-| `actionsMetrics.serviceMonitor.enable`                           | Deploy serviceMonitor kind for for use with prometheus-operator CRDs                                                                      | false                                                                                           |
-| `actionsMetrics.serviceMonitor.interval`                                 | Configure the interval that Prometheus should scrap the controller's metrics                                                                      | 1m                                                                                           |
-| `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.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.serviceMonitorLabels`                     | Set labels to apply to ServiceMonitor resources                                                                                           |                                                                                                 |

charts/actions-runner-controller/crds/actions.summerwind.dev_horizontalrunnerautoscalers.yaml

@@ -1,9 +1,9 @@
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.7.0
+  creationTimestamp: null
   name: horizontalrunnerautoscalers.actions.summerwind.dev
 spec:
   group: actions.summerwind.dev
@@ -61,16 +61,6 @@ spec:
                         type: integer
                     type: object
                   type: array
-                githubAPICredentialsFrom:
-                  properties:
-                    secretRef:
-                      properties:
-                        name:
-                          type: string
-                      required:
-                        - name
-                      type: object
-                  type: object
                 maxReplicas:
                   description: MaxReplicas is the maximum number of replicas the deployment is allowed to scale
                   type: integer
@@ -102,7 +92,7 @@ spec:
                         description: ScaleUpThreshold is the percentage of busy runners greater than which will trigger the hpa to scale runners up.
                         type: string
                       type:
-                        description: Type is the type of metric to be used for autoscaling. It can be TotalNumberOfQueuedAndInProgressWorkflowRuns or PercentageRunnersBusy.
+                        description: Type is the type of metric to be used for autoscaling. The only supported Type is TotalNumberOfQueuedAndInProgressWorkflowRuns
                         type: string
                     type: object
                   type: array
@@ -113,7 +103,7 @@ spec:
                   description: ScaleDownDelaySecondsAfterScaleUp is the approximate delay for a scale down followed by a scale up Used to prevent flapping (down->up->down->... loop)
                   type: integer
                 scaleTargetRef:
-                  description: ScaleTargetRef is the reference to scaled resource like RunnerDeployment
+                  description: ScaleTargetRef sis the reference to scaled resource like RunnerDeployment
                   properties:
                     kind:
                       description: Kind is the type of resource being referenced
@@ -180,7 +170,7 @@ spec:
                 scheduledOverrides:
                   description: ScheduledOverrides is the list of ScheduledOverride. It can be used to override a few fields of HorizontalRunnerAutoscalerSpec on schedule. The earlier a scheduled override is, the higher it is prioritized.
                   items:
-                    description: ScheduledOverride can be used to override a few fields of HorizontalRunnerAutoscalerSpec on schedule. A schedule can optionally be recurring, so that the corresponding override happens every day, week, month, or year.
+                    description: ScheduledOverride can be used to override a few fields of HorizontalRunnerAutoscalerSpec on schedule. A schedule can optionally be recurring, so that the correspoding override happens every day, week, month, or year.
                     properties:
                       endTime:
                         description: EndTime is the time at which the first override ends.
@@ -251,3 +241,9 @@ spec:
       subresources:
         status: {}
   preserveUnknownFields: false
+status:
+  acceptedNames:
+    kind: ""
+    plural: ""
+  conditions: []
+  storedVersions: []

charts/actions-runner-controller/docs/UPGRADING.md

@@ -24,13 +24,11 @@ Due to the above you can't just do a `helm upgrade` to release the latest versio
 # REMEMBER TO UPDATE THE CHART_VERSION TO RELEVANT CHART VERISON!!!!
 CHART_VERSION=0.18.0
 
-curl -L https://github.com/actions/actions-runner-controller/releases/download/actions-runner-controller-${CHART_VERSION}/actions-runner-controller-${CHART_VERSION}.tgz | tar zxv --strip 1 actions-runner-controller/crds
+curl -L https://github.com/actions-runner-controller/actions-runner-controller/releases/download/actions-runner-controller-${CHART_VERSION}/actions-runner-controller-${CHART_VERSION}.tgz | tar zxv --strip 1 actions-runner-controller/crds
 
 kubectl replace -f crds/
 ```
 
-Note that in case you're going to create prometheus-operator `ServiceMonitor` resources via the chart, you'd need to deploy prometheus-operator-related CRDs as well.
-
 2. Upgrade the Helm release
 
 ```shell

charts/actions-runner-controller/templates/_actions_metrics_server_helpers.tpl

@@ -1,60 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "actions-runner-controller-actions-metrics-server.name" -}}
-{{- default .Chart.Name .Values.actionsMetricsServer.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{- define "actions-runner-controller-actions-metrics-server.instance" -}}
-{{- printf "%s-%s" .Release.Name "actions-metrics-server" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "actions-runner-controller-actions-metrics-server.fullname" -}}
-{{- if .Values.actionsMetricsServer.fullnameOverride }}
-{{- .Values.actionsMetricsServer.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.actionsMetricsServer.nameOverride }}
-{{- $instance := include "actions-runner-controller-actions-metrics-server.instance" . }}
-{{- if contains $name $instance }}
-{{- $instance | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s-%s" .Release.Name $name "actions-metrics-server" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "actions-runner-controller-actions-metrics-server.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "actions-runner-controller-actions-metrics-server.name" . }}
-app.kubernetes.io/instance: {{ include "actions-runner-controller-actions-metrics-server.instance" . }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "actions-runner-controller-actions-metrics-server.serviceAccountName" -}}
-{{- if .Values.actionsMetricsServer.serviceAccount.create }}
-{{- default (include "actions-runner-controller-actions-metrics-server.fullname" .) .Values.actionsMetricsServer.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.actionsMetricsServer.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{- define "actions-runner-controller-actions-metrics-server.secretName" -}}
-{{- default (include "actions-runner-controller-actions-metrics-server.fullname" .) .Values.actionsMetricsServer.secret.name }}
-{{- end }}
-
-{{- define "actions-runner-controller-actions-metrics-server.roleName" -}}
-{{- include "actions-runner-controller-actions-metrics-server.fullname" . }}
-{{- end }}
-
-{{- define "actions-runner-controller-actions-metrics-server.serviceMonitorName" -}}
-{{- include "actions-runner-controller-actions-metrics-server.fullname" . | trunc 47 }}-service-monitor
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.deployment.yaml

@@ -1,172 +0,0 @@
-{{- if .Values.actionsMetricsServer.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "actions-runner-controller-actions-metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.actionsMetricsServer.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "actions-runner-controller-actions-metrics-server.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.actionsMetricsServer.podAnnotations }}
-      annotations:
-        kubectl.kubernetes.io/default-container: "actions-metrics-server"
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "actions-runner-controller-actions-metrics-server.selectorLabels" . | nindent 8 }}
-      {{- with .Values.actionsMetricsServer.podLabels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      {{- with .Values.actionsMetricsServer.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "actions-runner-controller-actions-metrics-server.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.actionsMetricsServer.podSecurityContext | nindent 8 }}
-      {{- with .Values.actionsMetricsServer.priorityClassName }}
-      priorityClassName: "{{ . }}"
-      {{- end }}
-      containers:
-      - args:
-        {{- $metricsHost := .Values.actionsMetrics.proxy.enabled | ternary "127.0.0.1" "0.0.0.0" }}
-        {{- $metricsPort := .Values.actionsMetrics.proxy.enabled | ternary "8080" .Values.actionsMetrics.port }}
-        - "--metrics-addr={{ $metricsHost }}:{{ $metricsPort }}"
-        {{- if .Values.actionsMetricsServer.logLevel }}
-        - "--log-level={{ .Values.actionsMetricsServer.logLevel }}"
-        {{- end }}
-        {{- if .Values.runnerGithubURL  }}
-        - "--runner-github-url={{ .Values.runnerGithubURL }}"
-        {{- end }}
-        {{- if .Values.actionsMetricsServer.logFormat  }}
-        - "--log-format={{ .Values.actionsMetricsServer.logFormat }}"
-        {{- end }}
-        command:
-        - "/actions-metrics-server"
-        {{- if .Values.actionsMetricsServer.lifecycle }}
-        {{- with .Values.actionsMetricsServer.lifecycle }}
-        lifecycle:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- end }}
-        env:
-        - name: GITHUB_WEBHOOK_SECRET_TOKEN
-          valueFrom:
-            secretKeyRef:
-              key: github_webhook_secret_token
-              name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
-              optional: true
-        {{- if .Values.githubEnterpriseServerURL  }}
-        - name: GITHUB_ENTERPRISE_URL
-          value: {{ .Values.githubEnterpriseServerURL }}
-        {{- end }}
-        {{- if .Values.githubURL  }}
-        - name: GITHUB_URL
-          value: {{ .Values.githubURL }}
-        {{- end }}
-        {{- if .Values.githubUploadURL  }}
-        - name: GITHUB_UPLOAD_URL
-          value: {{ .Values.githubUploadURL }}
-        {{- end }}
-        {{- if .Values.actionsMetricsServer.secret.enabled }}
-        - name: GITHUB_TOKEN
-          valueFrom:
-            secretKeyRef:
-              key: github_token
-              name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
-              optional: true
-        - name: GITHUB_APP_ID
-          valueFrom:
-            secretKeyRef:
-              key: github_app_id
-              name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
-              optional: true
-        - name: GITHUB_APP_INSTALLATION_ID
-          valueFrom:
-            secretKeyRef:
-              key: github_app_installation_id
-              name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
-              optional: true
-        - name: GITHUB_APP_PRIVATE_KEY
-          valueFrom:
-            secretKeyRef:
-              key: github_app_private_key
-              name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
-              optional: true
-        {{- if .Values.authSecret.github_basicauth_username }}
-        - name: GITHUB_BASICAUTH_USERNAME
-          value: {{ .Values.authSecret.github_basicauth_username }}
-        {{- end }}
-        - name: GITHUB_BASICAUTH_PASSWORD
-          valueFrom:
-            secretKeyRef:
-              key: github_basicauth_password
-              name: {{ include "actions-runner-controller.secretName" . }}
-              optional: true
-        {{- end }}
-        {{- if kindIs "slice" .Values.actionsMetricsServer.env }}
-        {{- toYaml .Values.actionsMetricsServer.env | nindent 8 }}
-        {{- else }}
-        {{- range $key, $val := .Values.actionsMetricsServer.env }}
-        - name: {{ $key }}
-          value: {{ $val | quote }}
-        {{- end }}
-        {{- end }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag  | default (cat "v" .Chart.AppVersion | replace " " "") }}"
-        name: actions-metrics-server
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        ports:
-        - containerPort: 8000
-          name: http
-          protocol: TCP
-        {{- if not .Values.actionsMetrics.proxy.enabled }}
-        - containerPort: {{ .Values.actionsMetrics.port }}
-          name: metrics-port
-          protocol: TCP
-        {{- end }}
-        resources:
-          {{- toYaml .Values.actionsMetricsServer.resources | nindent 12 }}
-        securityContext:
-          {{- toYaml .Values.actionsMetricsServer.securityContext | nindent 12 }}
-      {{- if .Values.actionsMetrics.proxy.enabled }}
-      - args:
-        - "--secure-listen-address=0.0.0.0:{{ .Values.actionsMetrics.port }}"
-        - "--upstream=http://127.0.0.1:8080/"
-        - "--logtostderr=true"
-        - "--v=10"
-        image: "{{ .Values.actionsMetrics.proxy.image.repository }}:{{ .Values.actionsMetrics.proxy.image.tag }}"
-        name: kube-rbac-proxy
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        ports:
-        - containerPort: {{ .Values.actionsMetrics.port }}
-          name: metrics-port
-        resources:
-          {{- toYaml .Values.resources | nindent 12 }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-      {{- end }}
-      terminationGracePeriodSeconds: {{ .Values.actionsMetricsServer.terminationGracePeriodSeconds }}
-      {{- with .Values.actionsMetricsServer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.actionsMetricsServer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.actionsMetricsServer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.actionsMetricsServer.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.ingress.yaml.yml

@@ -1,47 +0,0 @@
-{{- if .Values.actionsMetricsServer.ingress.enabled -}}
-{{- $fullName := include "actions-runner-controller-actions-metrics-server.fullname" . -}}
-{{- $svcPort := (index .Values.actionsMetricsServer.service.ports 0).port -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  {{- with .Values.actionsMetricsServer.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.actionsMetricsServer.ingress.tls }}
-  tls:
-    {{- range .Values.actionsMetricsServer.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  {{- with .Values.actionsMetricsServer.ingress.ingressClassName }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  rules:
-    {{- range .Values.actionsMetricsServer.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- if .extraPaths }}
-          {{- toYaml .extraPaths | nindent 10 }}
-          {{- end }}
-          {{- range .paths }}
-          - path: {{ .path }}
-            pathType: {{ .pathType }}
-            backend:
-              service:
-               name: {{ $fullName }}
-               port:
-                 number: {{ $svcPort }}
-          {{- end }}
-    {{- end }}
-  {{- end }}

charts/actions-runner-controller/templates/actionsmetrics.role.yaml

@@ -1,90 +0,0 @@
-{{- if .Values.actionsMetricsServer.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  name: {{ include "actions-runner-controller-actions-metrics-server.roleName" . }}
-rules:
-- apiGroups: 
-  - actions.summerwind.dev
-  resources:
-  - horizontalrunnerautoscalers
-  verbs:
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - horizontalrunnerautoscalers/finalizers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - horizontalrunnerautoscalers/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnersets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnerdeployments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnerdeployments/finalizers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnerdeployments/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - authentication.k8s.io
-  resources:
-  - tokenreviews
-  verbs:
-  - create
-- apiGroups:
-  - authorization.k8s.io
-  resources:
-  - subjectaccessreviews
-  verbs:
-  - create
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.role_binding.yaml

@@ -1,14 +0,0 @@
-{{- if .Values.actionsMetricsServer.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "actions-runner-controller-actions-metrics-server.roleName" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "actions-runner-controller-actions-metrics-server.roleName" . }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "actions-runner-controller-actions-metrics-server.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.secrets.yaml

@@ -1,28 +0,0 @@
-{{- if .Values.actionsMetricsServer.enabled }}
-{{- if .Values.actionsMetricsServer.secret.create }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "actions-runner-controller-actions-metrics-server.secretName" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-type: Opaque
-data:
-{{- if .Values.actionsMetricsServer.secret.github_webhook_secret_token }}
-  github_webhook_secret_token: {{ .Values.actionsMetricsServer.secret.github_webhook_secret_token | toString | b64enc }}
-{{- end }}
-{{- if .Values.actionsMetricsServer.secret.github_app_id }}
-  github_app_id: {{ .Values.actionsMetricsServer.secret.github_app_id | toString | b64enc }}
-{{- end }}
-{{- if .Values.actionsMetricsServer.secret.github_app_installation_id }}
-  github_app_installation_id: {{ .Values.actionsMetricsServer.secret.github_app_installation_id | toString | b64enc }}
-{{- end }}
-{{- if .Values.actionsMetricsServer.secret.github_app_private_key }}
-  github_app_private_key: {{ .Values.actionsMetricsServer.secret.github_app_private_key | toString | b64enc }}
-{{- end }}
-{{- if .Values.actionsMetricsServer.secret.github_token }}
-  github_token: {{ .Values.actionsMetricsServer.secret.github_token | toString | b64enc }}
-{{- end }}
-{{- end }}
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.service.yaml

@@ -1,32 +0,0 @@
-{{- if .Values.actionsMetricsServer.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "actions-runner-controller-actions-metrics-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller-actions-metrics-server.selectorLabels" . | nindent 4 }}
-{{- if .Values.actionsMetricsServer.service.annotations }}
-  annotations:
-    {{ toYaml .Values.actionsMetricsServer.service.annotations | nindent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.actionsMetricsServer.service.type }}
-  ports:
-    {{ range $_, $port := .Values.actionsMetricsServer.service.ports -}}
-    - {{ $port | toYaml | nindent 6 }}
-    {{- end }}
-    {{- if .Values.actionsMetrics.serviceMonitor.enable }}
-    - name: metrics-port
-      port: {{ .Values.actionsMetrics.port }}
-      targetPort: metrics-port
-    {{- end }}
-  selector:
-    {{- include "actions-runner-controller-actions-metrics-server.selectorLabels" . | nindent 4 }}
-  {{- if .Values.actionsMetricsServer.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-    {{- range $ip := .Values.actionsMetricsServer.service.loadBalancerSourceRanges }}
-    - {{ $ip -}}
-    {{- end }}
-  {{- end }}
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.serviceaccount.yaml.yml

@@ -1,15 +0,0 @@
-{{- if .Values.actionsMetricsServer.enabled -}}
-{{- if .Values.actionsMetricsServer.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "actions-runner-controller-actions-metrics-server.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  {{- with .Values.actionsMetricsServer.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
-{{- end }}

charts/actions-runner-controller/templates/actionsmetrics.servicemonitor.yaml.yml

@@ -1,27 +0,0 @@
-{{- if and .Values.actionsMetricsServer.enabled .Values.actionsMetrics.serviceMonitor.enable }}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  {{- with .Values.actionsMetrics.serviceMonitorLabels }}
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  name: {{ include "actions-runner-controller-actions-metrics-server.serviceMonitorName" . }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  endpoints:
-    - path: /metrics
-      port: metrics-port
-      {{- if .Values.actionsMetrics.proxy.enabled }}
-      bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-      scheme: https
-      tlsConfig:
-        insecureSkipVerify: true
-      {{- end }}
-      interval: {{ .Values.actionsMetrics.serviceMonitor.interval }}
-      scrapeTimeout: {{ .Values.actionsMetrics.serviceMonitor.timeout }}
-  selector:
-    matchLabels:
-      {{- include "actions-runner-controller-actions-metrics-server.selectorLabels" . | nindent 6 }}
-{{- end }}

charts/actions-runner-controller/templates/controller.metrics.serviceMonitor.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.metrics.serviceMonitor.enable }}
+{{- if .Values.metrics.serviceMonitor }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -8,7 +8,6 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   name: {{ include "actions-runner-controller.serviceMonitorName" . }}
-  namespace: {{ .Release.Namespace }}
 spec:
   endpoints:
     - path: /metrics
@@ -19,8 +18,6 @@ spec:
       tlsConfig:
         insecureSkipVerify: true
       {{- end }}
-      interval: {{ .Values.metrics.serviceMonitor.interval }}
-      scrapeTimeout: {{ .Values.metrics.serviceMonitor.timeout }}
   selector:
     matchLabels:
       {{- include "actions-runner-controller.selectorLabels" . | nindent 6 }}

charts/actions-runner-controller/templates/controller.pdb.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: policy/v1
+apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   labels:

charts/actions-runner-controller/templates/deployment.yaml

@@ -58,21 +58,15 @@ spec:
         {{- if .Values.scope.singleNamespace }}
         - "--watch-namespace={{ default .Release.Namespace .Values.scope.watchNamespace }}"
         {{- end }}
+        {{- if .Values.githubAPICacheDuration }}
+        - "--github-api-cache-duration={{ .Values.githubAPICacheDuration }}"
+        {{- end }}
         {{- if .Values.logLevel }}
         - "--log-level={{ .Values.logLevel }}"
         {{- end }}
         {{- if .Values.runnerGithubURL  }}
         - "--runner-github-url={{ .Values.runnerGithubURL }}"
         {{- end }}
-        {{- if .Values.runner.statusUpdateHook.enabled }}
-        - "--runner-status-update-hook"
-        {{- end }}
-        {{- if .Values.logFormat  }}  
-        - "--log-format={{ .Values.logFormat }}"
-        {{- end }}
-        {{- if .Values.dockerGID  }}
-        - "--docker-gid={{ .Values.dockerGID }}"
-        {{- end }}
         command:
         - "/manager"
         env:
@@ -124,14 +118,10 @@ spec:
               name: {{ include "actions-runner-controller.secretName" . }}
               optional: true
         {{- end }}
-        {{- if kindIs "slice" .Values.env }}
-        {{- toYaml .Values.env | nindent 8 }}
-        {{- else }}
         {{- range $key, $val := .Values.env }}
         - name: {{ $key }}
           value: {{ $val | quote }}
         {{- end }}
-        {{- end }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (cat "v" .Chart.AppVersion | replace " " "") }}"
         name: manager
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -214,6 +204,3 @@ spec:
       {{- if .Values.hostNetwork }}
       hostNetwork: {{ .Values.hostNetwork }}
       {{- end }}
-      {{- if .Values.dnsPolicy }}
-      dnsPolicy: {{ .Values.dnsPolicy }}
-      {{- end }}

charts/actions-runner-controller/templates/githubwebhook.deployment.yaml

@@ -39,6 +39,7 @@ spec:
         {{- $metricsHost := .Values.metrics.proxy.enabled | ternary "127.0.0.1" "0.0.0.0" }}
         {{- $metricsPort := .Values.metrics.proxy.enabled | ternary "8080" .Values.metrics.port }}
         - "--metrics-addr={{ $metricsHost }}:{{ $metricsPort }}"
+        - "--sync-period={{ .Values.githubWebhookServer.syncPeriod }}"
         {{- if .Values.githubWebhookServer.logLevel }}
         - "--log-level={{ .Values.githubWebhookServer.logLevel }}"
         {{- end }}
@@ -48,20 +49,8 @@ spec:
         {{- if .Values.runnerGithubURL  }}
         - "--runner-github-url={{ .Values.runnerGithubURL }}"
         {{- end }}
-        {{- if .Values.githubWebhookServer.queueLimit }}
-        - "--queue-limit={{ .Values.githubWebhookServer.queueLimit }}"
-        {{- end }}
-        {{- if .Values.githubWebhookServer.logFormat  }}
-        - "--log-format={{ .Values.githubWebhookServer.logFormat }}"
-        {{- end }}
         command:
         - "/github-webhook-server"
-        {{- if .Values.githubWebhookServer.lifecycle }}
-        {{- with .Values.githubWebhookServer.lifecycle }}
-        lifecycle:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- end }}
         env:
         - name: GITHUB_WEBHOOK_SECRET_TOKEN
           valueFrom:
@@ -117,14 +106,10 @@ spec:
               name: {{ include "actions-runner-controller.secretName" . }}
               optional: true
         {{- end }}
-        {{- if kindIs "slice" .Values.githubWebhookServer.env }}
-        {{- toYaml .Values.githubWebhookServer.env | nindent 8 }}
-        {{- else }}
         {{- range $key, $val := .Values.githubWebhookServer.env }}
         - name: {{ $key }}
           value: {{ $val | quote }}
         {{- end }}
-        {{- end }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag  | default (cat "v" .Chart.AppVersion | replace " " "") }}"
         name: github-webhook-server
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -158,7 +143,7 @@ spec:
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
       {{- end }}
-      terminationGracePeriodSeconds: {{ .Values.githubWebhookServer.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: 10
       {{- with .Values.githubWebhookServer.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/actions-runner-controller/templates/githubwebhook.ingress.yaml

@@ -1,7 +1,13 @@
 {{- if .Values.githubWebhookServer.ingress.enabled -}}
 {{- $fullName := include "actions-runner-controller-github-webhook-server.fullname" . -}}
 {{- $svcPort := (index .Values.githubWebhookServer.service.ports 0).port -}}
+{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
 apiVersion: networking.k8s.io/v1
+{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1/Ingress" }}
+apiVersion: extensions/v1beta1
+{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -36,12 +42,19 @@ spec:
           {{- end }}
           {{- range .paths }}
           - path: {{ .path }}
+            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
             pathType: {{ .pathType }}
+            {{- end }}
             backend:
+              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
               service:
                name: {{ $fullName }}
                port:
                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+              {{- end }}
           {{- end }}
     {{- end }}
   {{- end }}

charts/actions-runner-controller/templates/githubwebhook.pdb.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.githubWebhookServer.podDisruptionBudget.enabled }}
-apiVersion: policy/v1
+apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
   labels:

charts/actions-runner-controller/templates/githubwebhook.service.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ include "actions-runner-controller-github-webhook-server.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 4 }}
+    {{- include "actions-runner-controller.labels" . | nindent 4 }}
 {{- if .Values.githubWebhookServer.service.annotations }}
   annotations:
     {{ toYaml .Values.githubWebhookServer.service.annotations | nindent 4 }}
@@ -16,17 +16,11 @@ spec:
     {{ range $_, $port := .Values.githubWebhookServer.service.ports -}}
     - {{ $port | toYaml | nindent 6 }}
     {{- end }}
-    {{- if .Values.metrics.serviceMonitor.enable }}
+    {{- if .Values.metrics.serviceMonitor }}
     - name: metrics-port
       port: {{ .Values.metrics.port }}
       targetPort: metrics-port
     {{- end }}
   selector:
     {{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 4 }}
-  {{- if .Values.githubWebhookServer.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-    {{- range $ip := .Values.githubWebhookServer.service.loadBalancerSourceRanges }}
-    - {{ $ip -}}
-    {{- end }}
-  {{- end }}
 {{- end }}

charts/actions-runner-controller/templates/githubwebhook.serviceMonitor.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.githubWebhookServer.enabled .Values.metrics.serviceMonitor.enable }}
+{{- if and .Values.githubWebhookServer.enabled .Values.metrics.serviceMonitor }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -8,7 +8,6 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   name: {{ include "actions-runner-controller-github-webhook-server.serviceMonitorName" . }}
-  namespace: {{ .Release.Namespace }}
 spec:
   endpoints:
     - path: /metrics
@@ -19,8 +18,6 @@ spec:
       tlsConfig:
         insecureSkipVerify: true
       {{- end }}
-      interval: {{ .Values.metrics.serviceMonitor.interval }}
-      scrapeTimeout: {{ .Values.metrics.serviceMonitor.timeout }}
   selector:
     matchLabels:
       {{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 6 }}

charts/actions-runner-controller/templates/manager_role.yaml

@@ -250,57 +250,11 @@ rules:
   - patch
   - update
   - watch
-{{- if .Values.runner.statusUpdateHook.enabled }}
 - apiGroups:
   - ""
   resources:
-  - serviceaccounts
-  verbs:
-  - create
-  - delete
-  - get
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - rolebindings
-  verbs:
-  - create
-  - delete
-  - get
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - roles
-  verbs:
-  - create
-  - delete
-  - get
-{{- end }}
-{{- if .Values.rbac.allowGrantingKubernetesContainerModePermissions }}
-{{/* These permissions are required by ARC to create RBAC resources for the runner pod to use the kubernetes container mode. */}}
-{{/* See https://github.com/actions/actions-runner-controller/pull/1268/files#r917331632 */}}
-- apiGroups:
-  - ""
-  resources:
-  - pods/exec
-  verbs:
-  - create
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - pods/log
+  - secrets
   verbs:
   - get
   - list
   - watch
-- apiGroups:
-  - "batch"
-  resources:
-  - jobs
-  verbs:
-  - get
-  - list
-  - create
-  - delete
-{{- end }}

charts/actions-runner-controller/templates/manager_role_binding_secrets.yaml

@@ -1,21 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-{{- if .Values.scope.singleNamespace }}
-kind: RoleBinding
-{{- else }}
-kind: ClusterRoleBinding
-{{- end }}
-metadata:
-  name: {{ include "actions-runner-controller.managerRoleName" . }}-secrets
-  namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  {{- if .Values.scope.singleNamespace }}
-  kind: Role
-  {{- else }}
-  kind: ClusterRole
-  {{- end }}
-  name: {{ include "actions-runner-controller.managerRoleName" . }}-secrets
-subjects:
-- kind: ServiceAccount
-  name: {{ include "actions-runner-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}

charts/actions-runner-controller/templates/manager_role_secrets.yaml

@@ -1,24 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-{{- if .Values.scope.singleNamespace }}
-kind: Role
-{{- else }}
-kind: ClusterRole
-{{- end }}
-metadata:
-  creationTimestamp: null
-  name: {{ include "actions-runner-controller.managerRoleName" . }}-secrets
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-{{- if .Values.rbac.allowGrantingKubernetesContainerModePermissions }}
-{{/* These permissions are required by ARC to create RBAC resources for the runner pod to use the kubernetes container mode. */}}
-{{/* See https://github.com/actions/actions-runner-controller/pull/1268/files#r917331632 */}}
-  - create
-  - delete
-{{- end }}

charts/actions-runner-controller/templates/webhook_configs.yaml

@@ -1,8 +1,4 @@
-{{/*
-We will use a self managed CA if one is not provided by cert-manager
-*/}}
-{{- $ca := genCA "actions-runner-ca" 3650 }}
-{{- $cert := genSignedCert (printf "%s.%s.svc" (include "actions-runner-controller.webhookServiceName" .) .Release.Namespace) nil (list (printf "%s.%s.svc" (include "actions-runner-controller.webhookServiceName" .) .Release.Namespace)) 3650 $ca }}
+
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
@@ -19,13 +15,11 @@ webhooks:
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
     caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -44,19 +38,16 @@ webhooks:
     resources:
     - runners
   sideEffects: None
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
 - admissionReviewVersions:
   - v1beta1
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
+    caBundle: {{ .Values.admissionWebHooks.caBundle }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -75,19 +66,16 @@ webhooks:
     resources:
     - runnerdeployments
   sideEffects: None
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
 - admissionReviewVersions:
   - v1beta1
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
+    caBundle: {{ .Values.admissionWebHooks.caBundle }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -106,19 +94,16 @@ webhooks:
     resources:
     - runnerreplicasets
   sideEffects: None
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
 - admissionReviewVersions:
   - v1beta1
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
+    caBundle: {{ .Values.admissionWebHooks.caBundle }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -139,7 +124,6 @@ webhooks:
   objectSelector:
     matchLabels:
       "actions-runner-controller/inject-registration-token": "true"
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
@@ -156,13 +140,11 @@ webhooks:
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
+    caBundle: {{ .Values.admissionWebHooks.caBundle }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -181,19 +163,16 @@ webhooks:
     resources:
     - runners
   sideEffects: None
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
 - admissionReviewVersions:
   - v1beta1
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
+    caBundle: {{ .Values.admissionWebHooks.caBundle }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -212,19 +191,16 @@ webhooks:
     resources:
     - runnerdeployments
   sideEffects: None
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
 - admissionReviewVersions:
   - v1beta1
   {{- if .Values.scope.singleNamespace }}
   namespaceSelector:
     matchLabels:
-      kubernetes.io/metadata.name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
+      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
   {{- end }}
   clientConfig:
     {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- else if not .Values.certManagerEnabled }}
-    caBundle: {{ $ca.Cert | b64enc | quote }}
+    caBundle: {{ .Values.admissionWebHooks.caBundle }}
     {{- end }}
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
@@ -243,19 +219,3 @@ webhooks:
     resources:
     - runnerreplicasets
   sideEffects: None
-{{ if not (or (hasKey .Values.admissionWebHooks "caBundle") .Values.certManagerEnabled) }}
-  timeoutSeconds: {{ .Values.admissionWebHooks.timeoutSeconds | default 10}}
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "actions-runner-controller.servingCertName" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-type: kubernetes.io/tls
-data:
-  tls.crt: {{ $cert.Cert | b64enc | quote }}
-  tls.key: {{ $cert.Key | b64enc | quote }}
-  ca.crt: {{ $ca.Cert | b64enc | quote }}
-{{- end }}

charts/actions-runner-controller/values.yaml

@@ -15,6 +15,12 @@ enableLeaderElection: true
 # Must be unique if more than one controller installed onto the same namespace.
 #leaderElectionId: "actions-runner-controller"
 
+# DEPRECATED: This has been removed as unnecessary in #1192
+# The controller tries its best not to repeat the duplicate GitHub API call
+# within this duration.
+# Defaults to syncPeriod - 10s.
+#githubAPICacheDuration: 30s
+
 # The URL of your GitHub Enterprise server, if you're using one.
 #githubEnterpriseServerURL: https://github.example.com
 
@@ -30,7 +36,7 @@ enableLeaderElection: true
 #
 # Do set authSecret.enabled=false and set env if you want full control over
 # the GitHub authn related envvars of the container.
-# See https://github.com/actions/actions-runner-controller/pull/937 for more details.
+# See https://github.com/actions-runner-controller/actions-runner-controller/pull/937 for more details.
 authSecret:
   enabled: true
   create: false
@@ -47,7 +53,6 @@ authSecret:
   #github_basicauth_username: ""
   #github_basicauth_password: ""
 
-# http(s) should be specified for dockerRegistryMirror, e.g.: dockerRegistryMirror="https://<your-docker-registry-mirror>"
 dockerRegistryMirror: ""
 image:
   repository: "summerwind/actions-runner-controller"
@@ -62,18 +67,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-runner:
-  statusUpdateHook:
-    enabled: false
-
-rbac:
-  {}
-  # # This allows ARC to dynamically create a ServiceAccount and a Role for each Runner pod that uses "kubernetes" container mode,
-  # # by extending ARC's manager role to have the same permissions required by the pod runs the runner agent in "kubernetes" container mode.
-  # # Without this, Kubernetes blocks ARC to create the role to prevent a privilege escalation.
-  # # See https://github.com/actions/actions-runner-controller/pull/1268/files#r917327010
-  # allowGrantingKubernetesContainerModePermissions: true
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -109,17 +102,14 @@ service:
 # Metrics service resource
 metrics:
   serviceAnnotations: {}
-  serviceMonitor:
-    enable: false
-    timeout: 30s
-    interval: 1m
+  serviceMonitor: false
   serviceMonitorLabels: {}
   port: 8443
   proxy:
     enabled: true
     image:
       repository: quay.io/brancz/kube-rbac-proxy
-      tag: v0.13.1
+      tag: v0.13.0
 
 resources:
   {}
@@ -151,21 +141,12 @@ podDisruptionBudget:
 # PriorityClass: system-cluster-critical
 priorityClassName: ""
 
-# env:
-  # specify additional environment variables for the controller pod.
-  # It's possible to specify either key vale pairs e.g.:
+env:
+  {}
   # http_proxy: "proxy.com:8080"
   # https_proxy: "proxy.com:8080"
   # no_proxy: ""
 
-  # or a list of complete environment variable definitions e.g.:
-  # - name: GITHUB_APP_INSTALLATION_ID
-  #   valueFrom:
-  #     secretKeyRef:
-  #       key: some_key_in_the_secret
-  #       name: some-secret-name
-  #       optional: true
-
 ## specify additional volumes to mount in the manager container, this can be used
 ## to specify additional storage of material or to inject files from ConfigMaps
 ## into the running container
@@ -188,26 +169,14 @@ admissionWebHooks:
   #caBundle: "Ci0tLS0tQk...<base64-encoded PEM bundle containing the CA that signed the webhook's serving certificate>...tLS0K"
 
 # There may be alternatives to setting `hostNetwork: true`, see
-# https://github.com/actions/actions-runner-controller/issues/1005#issuecomment-993097155
+# https://github.com/actions-runner-controller/actions-runner-controller/issues/1005#issuecomment-993097155
 #hostNetwork: true
 
-# If you use `hostNetwork: true`, then you need dnsPolicy: ClusterFirstWithHostNet
-# https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy
-#dnsPolicy: ClusterFirst
-
-## specify log format for actions runner controller.  Valid options are "text" and "json"
-logFormat: text
-
-# enable setting the docker group id for the runner container
-# https://github.com/actions/actions-runner-controller/pull/2499
-#dockerGID: 121
-
 githubWebhookServer:
   enabled: false
   replicaCount: 1
+  syncPeriod: 10m
   useRunnerGroupsVisibility: false
-  ## specify log format for github webhook server.  Valid options are "text" and "json"
-  logFormat: text
   secret:
     enabled: false
     create: false
@@ -251,7 +220,6 @@ githubWebhookServer:
         protocol: TCP
         name: http
         #nodePort: someFixedPortForUseWithTerraformCdkCfnEtc
-    loadBalancerSourceRanges: []
   ingress:
     enabled: false
     ingressClassName: ""
@@ -287,134 +255,3 @@ githubWebhookServer:
     enabled: false
     # minAvailable: 1
     # maxUnavailable: 3
-  # queueLimit: 100
-  terminationGracePeriodSeconds: 10
-  lifecycle: {}
-  # 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"
-  # my_other_env_var: "other value"
-
-  # or a list of complete environment variable definitions e.g.:
-  # - name: GITHUB_WEBHOOK_SECRET_TOKEN
-  #   valueFrom:
-  #     secretKeyRef:
-  #       key: GITHUB_WEBHOOK_SECRET_TOKEN
-  #       name: prod-gha-controller-webhook-token
-  #       optional: true
-  # env:
-
-actionsMetrics:
-  serviceAnnotations: {}
-  # Set serviceMonitor=true to create a service monitor
-  # as a part of the helm release.
-  # Do note that you also need actionsMetricsServer.enabled=true
-  # to deploy the actions-metrics-server whose k8s service is referenced by the service monitor.
-  serviceMonitor:
-    enable: false
-    timeout: 30s
-    interval: 1m
-  serviceMonitorLabels: {}
-  port: 8443
-  proxy:
-    enabled: true
-    image:
-      repository: quay.io/brancz/kube-rbac-proxy
-      tag: v0.13.1
-  # 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"
-  # my_other_env_var: "other value"
-
-  # or a list of complete environment variable definitions e.g.:
-  # - name: GITHUB_WEBHOOK_SECRET_TOKEN
-  #   valueFrom:
-  #     secretKeyRef:
-  #       key: GITHUB_WEBHOOK_SECRET_TOKEN
-  #       name: prod-gha-controller-webhook-token
-  #       optional: true
-  # env:
-
-actionsMetricsServer:
-  enabled: false
-  # DO NOT CHANGE THIS!
-  # See the thread below for more context.
-  # https://github.com/actions/actions-runner-controller/pull/1814#discussion_r974758924
-  replicaCount: 1
-  ## specify log format for actions metrics server.  Valid options are "text" and "json"
-  logFormat: text
-  secret:
-    enabled: false
-    create: false
-    name: "actions-metrics-server"
-    ### GitHub Webhook Configuration
-    github_webhook_secret_token: ""
-    ### GitHub Apps Configuration
-    ## NOTE: IDs MUST be strings, use quotes
-    #github_app_id: ""
-    #github_app_installation_id: ""
-    #github_app_private_key: |
-    ### GitHub PAT Configuration
-    #github_token: ""
-  imagePullSecrets: []
-  nameOverride: ""
-  fullnameOverride: ""
-  serviceAccount:
-    # Specifies whether a service account should be created
-    create: true
-    # Annotations to add to the service account
-    annotations: {}
-    # The name of the service account to use.
-    # If not set and create is true, a name is generated using the fullname template
-    name: ""
-  podAnnotations: {}
-  podLabels: {}
-  podSecurityContext: {}
-  # fsGroup: 2000
-  securityContext: {}
-  resources: {}
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  priorityClassName: ""
-  service:
-    type: ClusterIP
-    annotations: {}
-    ports:
-      - port: 80
-        targetPort: http
-        protocol: TCP
-        name: http
-        #nodePort: someFixedPortForUseWithTerraformCdkCfnEtc
-    loadBalancerSourceRanges: []
-  ingress:
-    enabled: false
-    ingressClassName: ""
-    annotations: {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    hosts:
-      - host: chart-example.local
-        paths: []
-        #  - path: /*
-        #    pathType: ImplementationSpecific
-        # Extra paths that are not automatically connected to the server. This is useful when working with annotation based services.
-        extraPaths: []
-        # - path: /*
-        #   backend:
-        #     serviceName: ssl-redirect
-        #     servicePort: use-annotation
-        ## for Kubernetes >=1.19 (when "networking.k8s.io/v1" is used)
-        # - path: /*
-        #   pathType: Prefix
-        #   backend:
-        #     service:
-        #       name: ssl-redirect
-        #       port:
-        #         name: use-annotation
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
-  terminationGracePeriodSeconds: 10
-  lifecycle: {}