Update index.yaml

Signed-off-by: mumoshu <mumoshu@users.noreply.github.com>

.dockerignore

@@ -1,14 +0,0 @@
-Makefile
-acceptance
-runner
-hack
-test-assets
-config
-charts
-.github
-.envrc
-.env
-*.md
-*.txt
-*.sh
-test/e2e/.docker-build

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,177 +0,0 @@
-name: Bug Report
-description: File a bug report
-title: "Bug"
-labels: ["bug"]
-body:
-- type: input
-  id: controller-version
-  attributes:
-    label: Controller Version
-    description: Refer to semver-like release tags for controller versions. Any release tags prefixed with `actions-runner-controller-` are for chart releases
-    placeholder: ex. 0.18.2 or git commit ID
-  validations:
-    required: true
-- type: input
-  id: chart-version
-  attributes:
-    label: Helm Chart Version
-    description: Run `helm list` and see what's shown under CHART VERSION. Any release tags prefixed with `actions-runner-controller-` are for chart releases
-    placeholder: ex. 0.11.0
-- type: input
-  id: cert-manager-version
-  attributes:
-    label: CertManager Version
-    description: Run `kubectl get po -o yaml $CERT_MANAGER_POD` and see the image tag, or run `helm list` and see what's shown under APP VERSION for your cert-manager Helm release.
-    placeholder: ex. 1.8
-- 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: textarea
-  id: cert-manager
-  attributes:
-    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-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:
-    required: true
-- type: checkboxes
-  id: checks
-  attributes:
-    label: Checks
-    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-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-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
-- type: textarea
-  id: resource-definitions
-  attributes:
-    label: Resource Definitions
-    description: "Add copy(s) of your resource definition(s) (RunnerDeployment or RunnerSet, and HorizontalRunnerAutoscaler. If RunnerSet, also include the StorageClass being used)"
-    render: yaml
-    placeholder: |
-      apiVersion: actions.summerwind.dev/v1alpha1
-      kind: RunnerDeployment
-      metadata:
-        name: example
-      spec:
-        #snip
-      ---
-      apiVersion: actions.summerwind.dev/v1alpha1
-      kind: RunnerSet
-      metadata:
-        name: example
-      spec:
-        #snip
-      ---
-      apiVersion: storage.k8s.io/v1
-      kind: StorageClass
-      metadata:
-        name: example
-      provisioner: ...
-      reclaimPolicy: ...
-      volumeBindingMode: ...
-      ---
-      apiVersion: actions.summerwind.dev/v1alpha1
-      kind: HorizontalRunnerAutoscaler
-      metadata:
-        name:
-      spec:
-        #snip
-  validations:
-    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: controller-logs
-  attributes:
-    label: Controller Logs
-    description: "NEVER EVER OMIT THIS! Include logs from `actions-runner-controller`'s controller-manager pod"
-    render: shell
-    placeholder: |
-      To grab controller logs:
-
-      # Set NS according to your setup
-      NS=actions-runner-system
-
-      # Grab the pod name and set it to $POD_NAME
-      kubectl -n $NS get po
-
-      kubectl -n $NS logs $POD_NAME > arc.log
-
-      Upload it to e.g. https://gist.github.com/ and paste the link to it here.
-  validations:
-    required: true
-- type: textarea
-  id: runner-pod-logs
-  attributes:
-    label: Runner Pod Logs
-    description: "Include logs from runner pod(s)"
-    render: shell
-    placeholder: |
-      To grab the runner pod logs:
-
-      # Set NS according to your setup. It should match your RunnerDeployment's metadata.namespace.
-      NS=default
-
-      # Grab the name of the problematic runner pod and set it to $POD_NAME
-      kubectl -n $NS get po
-
-      kubectl -n $NS logs $POD_NAME -c runner > runnerpod_runner.log
-      kubectl -n $NS logs $POD_NAME -c docker > runnerpod_docker.log
-
-      Upload it to e.g. https://gist.github.com/ and paste the link to it here.
-  validations:
-    required: true
-- type: textarea
-  id: additional-context
-  attributes:
-    label: Additional Context
-    description: |
-      Add any other context about the problem here.
-
-      Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,15 +0,0 @@
-# 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: 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-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-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-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-runner-controller/actions-runner-controller/tree/master/CODEOWNERS

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,19 +0,0 @@
----
-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/RELEASE_NOTE_TEMPLATE.md

@@ -1,34 +0,0 @@
-# Release Note Template
-
-This is the template of actions-runner-controller's release notes.
-
-Whenever a new release is made, I start by manually copy-pasting this template onto the GitHub UI for creating the release.
-
-I then walk-through all the changes, take sometime to think abount best one-sentence explanations to tell the users about changes, write it all,
-and click the publish button.
-
-If you think you can improve future release notes in any way, please do submit a pull request to change the template below.
-
-Note that even though it looks like a Go template, I don't use any templating to generate the changelog.
-It's just that I'm used to reading and intepreting Go template by myself, not a computer program :)
-
-**Title**:
-
-```
-v{{ .Version }}: {{ .TitlesOfImportantChanges }}
-```
-
-**Body**:
-
-```
-**CAUTION:** If you're using the Helm chart, beware to review changes to CRDs and do manually upgrade CRDs! Helm installs CRDs only on installing a chart. It doesn't automatically upgrade CRDs. Otherwise you end up with troubles like #427, #467, and #468. Please refer to the [UPGRADING](charts/actions-runner-controller/docs/UPGRADING.md) docs for the latest process.
-
-This release includes the following changes from contributors. Thank you!
-
-- @{{ .GitHubUser }} fixed {{ .Feature }} to not break when ... (#{{ .PullRequestNumber }})
-- @{{ .GitHubUser }} enhanced {{ .Feature }} to ... (#{{ .PullRequestNumber }})
-- @{{ .GitHubUser }} added {{ .Feature }} for ... (#{{ .PullRequestNumber }})
-- @{{ .GitHubUser }} fixed {{ .Topic }} in the documentation so that ... (#{{ .PullRequestNumber }})
-- @{{ .GitHubUser }} added {{ .Topic }} to the documentation (#{{ .PullRequestNumber }})
-- @{{ .GitHubUser }} improved the documentation about {{ .Topic }} to also cover ... (#{{ .PullRequestNumber }})
-```

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

@@ -1,50 +0,0 @@
-name: "Setup Docker"
-
-inputs:
-  username:
-    description: "Username"
-    required: true
-  password:
-    description: "Password"
-    required: true
-  ghcr_username:
-    description: "GHCR username. Usually set from the github.actor variable"
-    required: true
-  ghcr_password:
-    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 ::set-output name=sha_short::${GITHUB_SHA::7}
-      shell: bash
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-      with:
-        version: latest
-
-    - name: Login to DockerHub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ inputs.username }}
-        password: ${{ inputs.password }}
-
-    - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ inputs.ghcr_username }}
-        password: ${{ inputs.ghcr_password }}

.github/renovate.json5

@@ -1,41 +0,0 @@
-{
-  "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/build-runner.yml

@@ -0,0 +1,64 @@
+on:
+  pull_request:
+    branches:
+      - '**'
+    paths:
+      - 'runner/**'
+      - .github/workflows/build-runner.yml
+  push:
+    branches:
+      - master
+    paths:
+      - runner/patched/*
+      - runner/Dockerfile
+      - runner/dindrunner.Dockerfile
+      - runner/entrypoint.sh
+      - .github/workflows/build-runner.yml
+name: Runner
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build ${{ matrix.name }}
+    strategy:
+      matrix:
+        include:
+          - name: actions-runner
+            dockerfile: Dockerfile
+          - name: actions-runner-dind
+            dockerfile: dindrunner.Dockerfile
+    env:
+      RUNNER_VERSION: 2.275.1
+      DOCKER_VERSION: 19.03.12
+      DOCKERHUB_USERNAME: ${{ github.repository_owner }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        if: ${{ github.event_name == 'push' }}
+        with:
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Build [and Push]
+        uses: docker/build-push-action@v2
+        with:
+          context: ./runner
+          file: ./runner/${{ matrix.dockerfile }}
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            RUNNER_VERSION=${{ env.RUNNER_VERSION }}
+            DOCKER_VERSION=${{ env.DOCKER_VERSION }}
+          tags: |
+            ${{ env.DOCKERHUB_USERNAME }}/${{ matrix.name }}:v${{ env.RUNNER_VERSION }}
+            ${{ env.DOCKERHUB_USERNAME }}/${{ matrix.name }}:latest

.github/workflows/publish-canary.yaml

@@ -1,58 +0,0 @@
-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

@@ -1,127 +0,0 @@
-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@v2.1
-        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.2.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/release.yml

@@ -1,23 +1,16 @@
-name: Publish ARC
-
 on:
   release:
-    types:
-      - published
+    types: [published]
 
 jobs:
-  release-controller:
-    name: Release
+  build:
     runs-on: ubuntu-latest
+    name: Release
     env:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USER }}
+      DOCKERHUB_USERNAME: ${{ github.repository_owner }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.18.2'
+        uses: actions/checkout@v2
 
       - name: Install tools
         run: |
@@ -36,28 +29,28 @@ jobs:
       - name: Upload artifacts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          make github-release
+        run: make github-release
 
-      - name: Setup Docker Environment
-        id: vars
-        uses: ./.github/actions/setup-docker-environment
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
         with:
-          username: ${{ env.DOCKERHUB_USERNAME }}
+          version: latest
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-          ghcr_username: ${{ github.actor }}
-          ghcr_password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v2
         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 }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          tags: ${{ env.DOCKERHUB_USERNAME }}/actions-runner-controller:${{ env.VERSION }} 
 

.github/workflows/run-codeql.yaml

@@ -1,32 +0,0 @@
-name: Run CodeQL
-
-on:
-  push:
-    branches: 
-      - master
-  pull_request:
-    branches:
-      - master
-  schedule:
-    - cron: '30 1 * * 0'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: go
-
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2

.github/workflows/run-stale.yaml

@@ -1,25 +0,0 @@
-name: Run Stale Bot
-on:
-  schedule:
-    - cron: '30 1 * * *'
-
-permissions:
-  contents: read
-
-jobs:
-  stale:
-    name: Run Stale
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write         # for actions/stale to close stale issues
-      pull-requests: write  # for actions/stale to close stale PRs
-    steps:
-      - 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
-          days-before-stale: -1
-          # turn stale back on for issues only
-          days-before-issue-stale: 30
-          days-before-issue-close: 14
-          exempt-issue-labels: 'pinned,security,enhancement,refactor,documentation,chore,bug,dependencies,needs-investigation'

.github/workflows/runners.yaml

@@ -1,72 +0,0 @@
-name: Runners
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-      - closed
-    branches:
-      - 'master'
-    paths:
-      - 'runner/**'
-      - '!runner/Makefile'
-      - '.github/workflows/runners.yaml'
-      - '!**.md'
-
-env:
-  RUNNER_VERSION: 2.293.0
-  DOCKER_VERSION: 20.10.12
-  DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USER }}
-
-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.ref == 'master' && github.event.pull_request.merged == true }}
-          build-args: |
-            RUNNER_VERSION=${{ env.RUNNER_VERSION }}
-            DOCKER_VERSION=${{ env.DOCKER_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/test.yaml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+    - 'runner/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Test
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install kubebuilder
+      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
+    - name: Run tests
+      run: make test
+    - name: Verify manifests are up-to-date
+      run: |
+        make manifests
+        git diff --exit-code

.github/workflows/validate-arc.yaml

@@ -1,60 +0,0 @@
-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,82 +0,0 @@
-name: Validate Helm Chart
-
-on:
-  push:
-    paths:
-      - 'charts/**'
-      - '.github/workflows/validate-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:
-  validate-chart:
-    name: Lint Chart
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v2.1
-        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
-        uses: helm/kind-action@v1.2.0
-        if: steps.list-changed.outputs.changed == 'true'
-
-      # 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)
-        run: |
-          ct install --config charts/.ci/ct-config.yaml

.github/workflows/validate-runners.yaml

@@ -1,25 +0,0 @@
-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

.github/workflows/wip.yml

@@ -0,0 +1,40 @@
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - "runner/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: release-latest
+    env:
+      DOCKERHUB_USERNAME: ${{ github.repository_owner }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      - name: Build and Push
+        uses: docker/build-push-action@v2
+        with:
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ env.DOCKERHUB_USERNAME }}/actions-runner-controller:latest 
+

.gitignore

@@ -1,4 +1,3 @@
-# Deploy Assets
 release
 
 # Binaries for programs and plugins
@@ -16,21 +15,14 @@ bin
 *.out
 
 # Kubernetes Generated files - skip generated files, except for vendored files
+
 !vendor/**/zz_generated.*
 
 # editor and IDE paraphernalia
-.vscode
 .idea
 *.swp
 *.swo
 *~
 
 .envrc
-.env
-.test.env
 *.pem
-
-# OS
-.DS_STORE
-
-/test-assets

CODEOWNERS

@@ -1,2 +0,0 @@
-# actions-runner-controller maintainers
-* @mumoshu @toast-gear

CONTRIBUTING.md

@@ -1,157 +0,0 @@
-## Contributing
-
-### 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](/README.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.
-
-### How to Contribute a Patch
-
-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.
-
-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.
-
-#### Running an End to End Test
-
-> **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
-```
-
-#### 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.
-
-To make your development cycle faster, use the below command to update deploy and update all the three:
-
-```shell
-# Let assume we have all other envvars like DOCKER_USER, GITHUB_TOKEN already set,
-# The below command will (re)build `actions-runner-controller:controller1` and `actions-runner:runner1`,
-# load those into kind nodes, and then rerun kubectl or helm to install/upgrade the controller,
-# and finally upgrade the runner deployment to use the new runner image.
-#
-# As helm 3 and kubectl is unable to recreate a pod when no tag change,
-# you either need to bump VERSION and RUNNER_TAG on each run,
-# or manually run `kubectl delete pod $POD` on respective pods for changes to actually take effect.
-
-# Makefile
-VERSION=controller1 \
-  RUNNER_TAG=runner1 \
-  make acceptance/pull acceptance/kind docker-build acceptance/load acceptance/deploy
-```
-
-If you've already deployed actions-runner-controller and only want to recreate pods to use the newer image, you can run:
-
-```shell
-# Makefile
-NAME=$DOCKER_USER/actions-runner-controller \
-  make docker-build acceptance/load && \
-  kubectl -n actions-runner-system delete po $(kubectl -n actions-runner-system get po -ojsonpath={.items[*].metadata.name})
-```
-
-Similarly, if you'd like to recreate runner pods with the newer runner image you can use the runner specific [Makefile](runner/Makefile) to build and / or push new runner images
-
-```shell
-# runner/Makefile
-NAME=$DOCKER_USER/actions-runner make \
-  -C runner docker-{build,push}-ubuntu && \
-  (kubectl get po -ojsonpath={.items[*].metadata.name} | xargs -n1 kubectl delete po)
-```
-
-#### Developing the Runners
-
-**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.
-
-**Running Ginkgo Tests**
-
-You can run the integration test suite that is written in Ginkgo with:
-
-```shell
-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.
-
-```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-runner-controller/actions-runner-controller/controllers
-```
-
-To run Ginkgo tests selectively, set the pattern of target test names to `GINKGO_FOCUS`.
-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-runner-controller/actions-runner-controller/controllers
-```
-
-#### Helm Version Bumps
-
-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,44 +1,28 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.18.2 as builder
+FROM golang:1.15 as builder
+
+ARG TARGETPLATFORM
 
 WORKDIR /workspace
 
-# Make it runnable on a distroless image/without libc
-ENV CGO_ENABLED=0
+ENV GO111MODULE=on \
+  CGO_ENABLED=0
 
 # Copy the Go Modules manifests
 COPY go.mod go.sum ./
 
 # cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer.
-#
-# Also, we need to do this before setting TARGETPLATFORM/TARGETOS/TARGETARCH/TARGETVARIANT
-# so that go mod cache is shared across platforms.
+# and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
 # Copy the go source
-# COPY . .
-
-# Usage:
-#   docker buildx build --tag repo/img:tag -f ./Dockerfile . --platform linux/amd64,linux/arm64,linux/arm/v7
-#
-# With the above commmand,
-# TARGETOS can be "linux", TARGETARCH can be "amd64", "arm64", and "arm", TARGETVARIANT can be "v7".
-
-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
+COPY . .
 
 # Build
-RUN --mount=target=. \
-  --mount=type=cache,mode=0777,target=${GOCACHE} \
-  export GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} && \
-  go build -o /out/manager main.go && \
-  go build -o /out/github-webhook-server ./cmd/githubwebhookserver
+RUN export GOOS=$(echo ${TARGETPLATFORM} | cut -d / -f1) && \
+  export GOARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) && \
+  GOARM=$(echo ${TARGETPLATFORM} | cut -d / -f3 | cut -c2-) && \
+  go build -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
@@ -46,8 +30,7 @@ FROM gcr.io/distroless/static:nonroot
 
 WORKDIR /
 
-COPY --from=builder /out/manager .
-COPY --from=builder /out/github-webhook-server .
+COPY --from=builder /workspace/manager .
 
 USER nonroot:nonroot
 

Makefile

@@ -1,27 +1,11 @@
-ifdef DOCKER_USER
-	NAME ?= ${DOCKER_USER}/actions-runner-controller
-else
-	NAME ?= summerwind/actions-runner-controller
-endif
-DOCKER_USER ?= $(shell echo ${NAME} | cut -d / -f1)
+NAME ?= summerwind/actions-runner-controller
 VERSION ?= latest
-RUNNER_VERSION ?= 2.293.0
-TARGETPLATFORM ?= $(shell arch)
-RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
-RUNNER_TAG  ?= ${VERSION}
-TEST_REPO ?= ${DOCKER_USER}/actions-runner-controller
-TEST_ORG ?=
-TEST_ORG_REPO ?=
-TEST_EPHEMERAL ?= false
-SYNC_PERIOD ?= 1m
-USE_RUNNERSET ?=
-KUBECONTEXT ?= kind-acceptance
-CLUSTER ?= acceptance
-CERT_MANAGER_VERSION ?= v1.1.1
-KUBE_RBAC_PROXY_VERSION ?= v0.11.0
+# From https://github.com/VictoriaMetrics/operator/pull/44
+YAML_DROP=$(YQ) delete --inplace
+YAML_DROP_PREFIX=spec.validation.openAPIV3Schema.properties.spec.properties
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true"
+CRD_OPTIONS ?= "crd:trivialVersions=true"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -30,8 +14,6 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-TEST_ASSETS=$(PWD)/test-assets
-
 # default list of platforms for which multiarch image is built
 ifeq (${PLATFORMS}, )
 	export PLATFORMS="linux/amd64,linux/arm64"
@@ -40,8 +22,8 @@ endif
 # if IMG_RESULT is unspecified, by default the image will be pushed to registry
 ifeq (${IMG_RESULT}, load)
 	export PUSH_ARG="--load"
-	# if load is specified, image will be built only for the build machine architecture.
-	export PLATFORMS="local"
+    # if load is specified, image will be built only for the build machine architecture.
+    export PLATFORMS="local"
 else ifeq (${IMG_RESULT}, cache)
 	# if cache is specified, image will only be available in the build cache, it won't be pushed or loaded
 	# therefore no PUSH_ARG will be specified
@@ -51,19 +33,9 @@ endif
 
 all: manager
 
-GO_TEST_ARGS ?= -short
-
 # Run tests
 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
-	TEST_ASSET_KUBE_APISERVER=$(KUBE_APISERVER_BIN) \
-	TEST_ASSET_ETCD=$(ETCD_BIN) \
-	TEST_ASSET_KUBECTL=$(KUBECTL_BIN) \
-	  make test
+	go test ./... -coverprofile cover.out
 
 # Build manager binary
 manager: generate fmt vet
@@ -87,13 +59,10 @@ deploy: manifests
 	kustomize build config/default | kubectl apply -f -
 
 # Generate manifests e.g. CRD, RBAC etc.
-manifests: manifests-gen-crds chart-crds
+manifests: manifests-118 fix118 chart-crds
 
-manifests-gen-crds: controller-gen yq
+manifests-118: controller-gen
 	$(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) write --inplace "$$YAMLFILE" spec.preserveUnknownFields false; \
-	done
 
 chart-crds:
 	cp config/crd/bases/*.yaml charts/actions-runner-controller/crds/
@@ -106,13 +75,36 @@ fmt:
 vet:
 	go vet ./...
 
+# workaround for CRD issue with k8s 1.18 & controller-gen
+# ref: https://github.com/kubernetes/kubernetes/issues/91395
+fix118: yq
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.containers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.initContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.sidecarContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.ephemeralContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.containers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.initContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.sidecarContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml $(YAML_DROP_PREFIX).template.properties.spec.properties.ephemeralContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runners.yaml $(YAML_DROP_PREFIX).containers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runners.yaml $(YAML_DROP_PREFIX).initContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runners.yaml $(YAML_DROP_PREFIX).sidecarContainers.items.properties
+	$(YAML_DROP) config/crd/bases/actions.summerwind.dev_runners.yaml $(YAML_DROP_PREFIX).ephemeralContainers.items.properties
+
 # Generate code
 generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths="./..."
 
+# Build the docker image
+docker-build: test
+	docker build . -t ${NAME}:${VERSION}
+
+# Push the docker image
+docker-push:
+	docker push ${NAME}:${VERSION}
+
 docker-buildx:
-	export DOCKER_CLI_EXPERIMENTAL=enabled ;\
-	export DOCKER_BUILDKIT=1
+	export DOCKER_CLI_EXPERIMENTAL=enabled
 	@if ! docker buildx ls | grep -q container-builder; then\
 		docker buildx create --platform ${PLATFORMS} --name container-builder --use;\
 	fi
@@ -123,11 +115,6 @@ docker-buildx:
 		-f Dockerfile \
 		. ${PUSH_ARG}
 
-# Push the docker image
-docker-push:
-	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=${NAME}:${VERSION}
@@ -139,41 +126,19 @@ release/clean:
 	rm -rf release
 
 .PHONY: acceptance
-acceptance: release/clean acceptance/pull docker-build release
-	ACCEPTANCE_TEST_SECRET_TYPE=token make acceptance/run
-	ACCEPTANCE_TEST_SECRET_TYPE=app make acceptance/run
-	ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm ACCEPTANCE_TEST_SECRET_TYPE=token make acceptance/run
-	ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm ACCEPTANCE_TEST_SECRET_TYPE=app make acceptance/run
-
-acceptance/run: acceptance/kind acceptance/load acceptance/setup acceptance/deploy acceptance/tests acceptance/teardown
+acceptance: release/clean docker-build docker-push release
+	ACCEPTANCE_TEST_SECRET_TYPE=token make acceptance/kind acceptance/setup acceptance/tests acceptance/teardown
+	ACCEPTANCE_TEST_SECRET_TYPE=app make acceptance/kind acceptance/setup acceptance/tests acceptance/teardown
+	ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm ACCEPTANCE_TEST_SECRET_TYPE=token make acceptance/kind acceptance/setup acceptance/tests acceptance/teardown
+	ACCEPTANCE_TEST_DEPLOYMENT_TOOL=helm ACCEPTANCE_TEST_SECRET_TYPE=app make acceptance/kind acceptance/setup acceptance/tests acceptance/teardown
 
 acceptance/kind:
-	kind create cluster --name ${CLUSTER} --config acceptance/kind.yaml
-
-# Set TMPDIR to somewhere under $HOME when you use docker installed with Ubuntu snap
-# 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 ${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}
-	kind load docker-image quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION) --name ${CLUSTER}
-	kind load docker-image quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION) --name ${CLUSTER}
-	kind load docker-image quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION) --name ${CLUSTER}
-	kubectl cluster-info --context ${KUBECONTEXT}
-
-# Pull the docker images for acceptance
-acceptance/pull:
-	docker pull quay.io/brancz/kube-rbac-proxy:$(KUBE_RBAC_PROXY_VERSION)
-	docker pull docker:dind
-	docker pull quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION)
-	docker pull quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION)
-	docker pull quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION)
+	kind create cluster --name acceptance
+	kubectl cluster-info --context kind-acceptance
 
 acceptance/setup:
-	kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml	#kubectl create namespace actions-runner-system
-	kubectl -n cert-manager wait deploy/cert-manager-cainjector --for condition=available --timeout 90s
+	kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.0.4/cert-manager.yaml	#kubectl create namespace actions-runner-system
+	kubectl -n cert-manager wait deploy/cert-manager-cainjector --for condition=available --timeout 60s
 	kubectl -n cert-manager wait deploy/cert-manager-webhook --for condition=available --timeout 60s
 	kubectl -n cert-manager wait deploy/cert-manager --for condition=available --timeout 60s
 	kubectl create namespace actions-runner-system || true
@@ -181,39 +146,18 @@ acceptance/setup:
 	sleep 5
 
 acceptance/teardown:
-	kind delete cluster --name ${CLUSTER}
-
-acceptance/deploy:
-	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} \
-	acceptance/deploy.sh
+	kind delete cluster --name acceptance
 
 acceptance/tests:
+	acceptance/deploy.sh
 	acceptance/checks.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/
-.PHONY: e2e
-e2e:
-	go test -count=1 -v -timeout 600s -run '^TestE2E$$' ./test/e2e
-
 # Upload release file to GitHub.
 github-release: release
 	ghr ${VERSION} release/
 
-# Find or download controller-gen
-#
-# Note that controller-gen newer than 0.4.1 is needed for https://github.com/kubernetes-sigs/controller-tools/issues/444#issuecomment-680168439
-# Otherwise we get errors like the below:
-#   Error: failed to install CRD crds/actions.summerwind.dev_runnersets.yaml: CustomResourceDefinition.apiextensions.k8s.io "runnersets.actions.summerwind.dev" is invalid: [spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[containers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property, spec.validation.openAPIV3Schema.properties[spec].properties[template].properties[spec].properties[initContainers].items.properties[ports].items.properties[protocol].default: Required value: this property is in x-kubernetes-list-map-keys, so it must have a default or be a required property]
-#
-# Note that controller-gen newer than 0.6.0 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
-# Otherwise ObjectMeta embedded in Spec results in empty on the storage.
+# find or download controller-gen
+# download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
 ifeq (, $(wildcard $(GOBIN)/controller-gen))
@@ -222,7 +166,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.7.0 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 endif
@@ -242,82 +186,8 @@ ifeq (, $(wildcard $(GOBIN)/yq))
 	YQ_TMP_DIR=$$(mktemp -d) ;\
 	cd $$YQ_TMP_DIR ;\
 	go mod init tmp ;\
-	go install github.com/mikefarah/yq/v3@3.4.0 ;\
+	go get github.com/mikefarah/yq/v3@3.4.0 ;\
 	rm -rf $$YQ_TMP_DIR ;\
 	}
 endif
 YQ=$(GOBIN)/yq
-
-OS_NAME := $(shell uname -s | tr A-Z a-z)
-
-# find or download etcd
-etcd:
-ifeq (, $(shell which etcd))
-ifeq (, $(wildcard $(TEST_ASSETS)/etcd))
-	@{ \
-	set -xe ;\
-	INSTALL_TMP_DIR=$$(mktemp -d) ;\
-	cd $$INSTALL_TMP_DIR ;\
-	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 ;\
-	}
-ETCD_BIN=$(TEST_ASSETS)/etcd
-else
-ETCD_BIN=$(TEST_ASSETS)/etcd
-endif
-else
-ETCD_BIN=$(shell which etcd)
-endif
-
-# find or download kube-apiserver
-kube-apiserver:
-ifeq (, $(shell which kube-apiserver))
-ifeq (, $(wildcard $(TEST_ASSETS)/kube-apiserver))
-	@{ \
-	set -xe ;\
-	INSTALL_TMP_DIR=$$(mktemp -d) ;\
-	cd $$INSTALL_TMP_DIR ;\
-	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
-else
-KUBE_APISERVER_BIN=$(TEST_ASSETS)/kube-apiserver
-endif
-else
-KUBE_APISERVER_BIN=$(shell which kube-apiserver)
-endif
-
-# find or download kubectl
-kubectl:
-ifeq (, $(shell which kubectl))
-ifeq (, $(wildcard $(TEST_ASSETS)/kubectl))
-	@{ \
-	set -xe ;\
-	INSTALL_TMP_DIR=$$(mktemp -d) ;\
-	cd $$INSTALL_TMP_DIR ;\
-	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 ;\
-	}
-KUBECTL_BIN=$(TEST_ASSETS)/kubectl
-else
-KUBECTL_BIN=$(TEST_ASSETS)/kubectl
-endif
-else
-KUBECTL_BIN=$(shell which kubectl)
-endif

PROJECT

@@ -1,5 +1,5 @@
 domain: summerwind.dev
-repo: github.com/actions-runner-controller/actions-runner-controller
+repo: github.com/summerwind/actions-runner-controller
 resources:
 - group: actions
   kind: Runner

SECURITY.md

@@ -1,22 +0,0 @@
-# Security Policy
-
-##  Sponsoring the project
-
-This project is maintained by a small team of two and therefore lacks the resource to provide security fixes in a timely manner.
-
-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.
-
-Please refer to https://github.com/sponsors/actions-runner-controller for available tiers.
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 0.23.0  | :white_check_mark: |
-| < 0.23.0| :x:                |
-
-## Reporting a Vulnerability
-
-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.
-
-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

@@ -1,222 +0,0 @@
-# Troubleshooting
-
-* [Tools](#tools)
-* [Installation](#installation)
-  * [Invalid header field value](#invalid-header-field-value)
-  * [Deployment fails on GKE due to webhooks](#deployment-fails-on-gke-due-to-webhooks)
-* [Operations](#operations)
-  * [Stuck runner kind or backing pod](#stuck-runner-kind-or-backing-pod)
-  * [Delay in jobs being allocated to runners](#delay-in-jobs-being-allocated-to-runners)
-  * [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)
-
-## Tools
-
-A list of tools which are helpful for troubleshooting
-
-* 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
-
-Troubeshooting runbooks that relate to ARC installation problems
-
-### Invalid header field value
-
-**Problem**
-
-```json
-2020-11-12T22:17:30.693Z	ERROR	controller-runtime.controller	Reconciler error	
-{
-  "controller": "runner",
-  "request": "actions-runner-system/runner-deployment-dk7q8-dk5c9",
-  "error": "failed to create registration token: Post \"https://api.github.com/orgs/$YOUR_ORG_HERE/actions/runners/registration-token\": net/http: invalid header field value \"Bearer $YOUR_TOKEN_HERE\\n\" for key Authorization"
-}
-```
-
-**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
-
-
-### Deployment fails on GKE due to webhooks
-
-**Problem**
-
-Due to GKEs firewall settings you may run into the following errors when trying to deploy runners on a private GKE cluster:
-
-```
-Internal error occurred: failed calling webhook "mutate.runner.actions.summerwind.dev": 
-Post https://webhook-service.actions-runner-system.svc:443/mutate-actions-summerwind-dev-v1alpha1-runner?timeout=10s: 
-context deadline exceeded
-```
-
-**Solution**<br />
-
-To fix this, you may either:
-
-1. Configure the webhook to use another port, such as 443 or 10250, [each of
-   which allow traffic by default](https://cloud.google.com/kubernetes-engine/docs/how-to/private-clusters#add_firewall_rules).
-
-   ```sh
-   # With helm, you'd set `webhookPort` to the port number of your choice
-   # 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
-   ```
-
-2. Set up a firewall rule to allow the master node to connect to the default
-   webhook port. The exact way to do this may vary, but the following script
-   should point you in the right direction:
-
-   ```sh
-   # 1) Retrieve the network tag automatically given to the worker nodes
-   # NOTE: this only works if you have only one cluster in your GCP project. You will have to manually inspect the result of this command to find the tag for the cluster you want to target
-   WORKER_NODES_TAG=$(gcloud compute instances list --format='text(tags.items[0])' --filter='metadata.kubelet-config:*' | grep tags | awk '{print $2}' | sort | uniq)
-
-   # 2) Take note of the VPC network in which you deployed your cluster
-   # NOTE this only works if you have only one network in which you deploy your clusters
-   NETWORK=$(gcloud compute instances list --format='text(networkInterfaces[0].network)' --filter='metadata.kubelet-config:*' | grep networks | awk -F'/' '{print $NF}' | sort | uniq)
-
-   # 3) Get the master source ip block
-   SOURCE=$(gcloud container clusters describe <cluster-name> --region <region> | grep masterIpv4CidrBlock| cut -d ':' -f 2 | tr -d ' ')
-
-   gcloud compute firewall-rules create k8s-cert-manager --source-ranges $SOURCE --target-tags $WORKER_NODES_TAG  --allow TCP:9443 --network $NETWORK
-   ```
-
-## Operations
-
-Troubeshooting runbooks that relate to ARC operational problems
-
-### Stuck runner kind or backing pod
-
-**Problem**
-
-Sometimes either the runner kind (`kubectl get runners`) or it's underlying pod can get stuck in a terminating state for various reasons. You can get the kind unstuck by removing its finaliser using something like this:
-
-**Solution**
-
-Remove the finaliser from the relevent runner kind or pod
-
-```
-# 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}}'
-
-# Get all pods that are stuck terminating and remove the finalizer
-$ kubectl -n get pods | grep Terminating | awk {'print $1'} | xargs kubectl patch pod -p '{"metadata":{"finalizers":null}}'
-```
-
-_Note the code assumes you have already selected the namespace your runners are in and that they 
-are in a namespace not shared with anything else_
-
-### Delay in jobs being allocated to runners
-
-**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 https://github.com/actions-runner-controller/actions-runner-controller/issues/1387#issuecomment-1122593984 that this is caused from the self-update process somehow.
-
-**Solution**
-
-Disable the self-update process in your runner manifests
-
-```yaml
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerDeployment
-metadata:
-  name: example-runnerdeployment-with-sleep
-spec:
-  template:
-    spec:
-      ...
-      env:
-        - name: DISABLE_RUNNER_UPDATE
-          value: "true"
-```
-
-### Runner coming up before network available
-
-**Problem**
-
-If you're running your action runners on a service mesh like Istio, you might
-have problems with runner configuration accompanied by logs like:
-
-```
-....
-runner Starting Runner listener with startup type: service
-runner Started listener process
-runner An error occurred: Not configured
-runner Runner listener exited with error code 2
-runner Runner listener exit with retryable error, re-launch runner in 5 seconds.
-....
-```
-
-This is because the `istio-proxy` has not completed configuring itself when the
-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**<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-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.
-
-```yaml
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerDeployment
-metadata:
-  name: example-runnerdeployment-with-sleep
-spec:
-  template:
-    spec:
-      ...
-      env:
-        - name: STARTUP_DELAY_IN_SECONDS
-          value: "5"
-```
-
-## Outgoing network action hangs indefinitely
-
-**Problem**
-
-Some random outgoing network actions hangs indefinitely. This could be because your cluster does not give Docker the standard MTU of 1500, you can check this out by running `ip link` in a pod that encounters the problem and reading the outgoing interface's MTU value. If it is smaller than 1500, then try the following.
-
-**Solution**
-
-Add a `dockerMTU` key in your runner's spec with the value you read on the outgoing interface. For instance:
-
-```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: []
-```
-
-There may be more places you need to tweak for MTU.
-Please consult issues like #651 for more information.
-
-## Unable to scale to zero with TotalNumberOfQueuedAndInProgressWorkflowRuns
-
-**Problem**
-
-HRA doesn't scale the RunnerDeployment to zero, even though you did configure HRA correctly, to have a pull-based scaling metric `TotalNumberOfQueuedAndInProgressWorkflowRuns`, and set `minReplicas: 0`.
-
-**Solution**
-
-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).

acceptance/checks.sh

@@ -1,84 +1,29 @@
 #!/usr/bin/env bash
 
-set +e
+set -e
 
-repo_runnerdeployment_passed="skipped"
-repo_runnerset_passed="skipped"
+runner_name=
 
-echo "Checking if RunnerDeployment repo test is set"
-if [ "${TEST_REPO}" ] && [ ! "${USE_RUNNERSET}" ]; then
-  runner_name=
-  count=0
-  while [ $count -le 30 ]; do
-    echo "Finding Runner ..."
-    runner_name=$(kubectl get runner --output=jsonpath="{.items[*].metadata.name}")
-    if [ "${runner_name}" ]; then
-      while [ $count -le 30 ]; do
-        runner_pod_name=
-        echo "Found Runner \""${runner_name}"\""
-        echo "Finding underlying pod ..."
-        runner_pod_name=$(kubectl get pod --output=jsonpath="{.items[*].metadata.name}" | grep ${runner_name})
-        if [ "${runner_pod_name}" ]; then
-          echo "Found underlying pod \""${runner_pod_name}"\""
-          echo "Waiting for pod \""${runner_pod_name}"\" to become ready..."
-          kubectl wait pod/${runner_pod_name} --for condition=ready --timeout 270s
-          break 2
-        fi
-        sleep 1
-        let "count=count+1"
-      done
-    fi
-    sleep 1
-    let "count=count+1"
-  done
-  if [ $count -ge 30 ]; then
-    repo_runnerdeployment_passed=false
-  else
-    repo_runnerdeployment_passed=true
-  fi
-echo "Checking if RunnerSet repo test is set"
-elif [ "${TEST_REPO}" ] && [ "${USE_RUNNERSET}" ]; then
-  runnerset_name=
-  count=0
-  while [ $count -le 30 ]; do
-    echo "Finding RunnerSet ..."
-    runnerset_name=$(kubectl get runnerset --output=jsonpath="{.items[*].metadata.name}")
-    if [ "${runnerset_name}" ]; then
-      while [ $count -le 30 ]; do
-        runnerset_pod_name=
-        echo "Found RunnerSet \""${runnerset_name}"\""
-        echo "Finding underlying pod ..."
-        runnerset_pod_name=$(kubectl get pod --output=jsonpath="{.items[*].metadata.name}" | grep ${runnerset_name})
-        echo "BEFORE IF"
-        if [ "${runnerset_pod_name}" ]; then
-          echo "AFTER IF"
-          echo "Found underlying pod \""${runnerset_pod_name}"\""
-          echo "Waiting for pod \""${runnerset_pod_name}"\" to become ready..."
-          kubectl wait pod/${runnerset_pod_name} --for condition=ready --timeout 270s
-          break 2
-        fi
-      sleep 1
-      let "count=count+1"
-      done
-    fi
-    sleep 1
-    let "count=count+1"
-  done
-  if [ $count -ge 30 ]; then
-    repo_runnerset_passed=false
-  else
-    repo_runnerset_passed=true
-  fi
-fi
+while [ -z "${runner_name}" ]; do
+  echo Finding the runner... 1>&2
+  sleep 1
+  runner_name=$(kubectl get runner --output=jsonpath="{.items[*].metadata.name}")
+done
 
-if [ ${repo_runnerset_passed} == true ] || [ ${repo_runnerset_passed} == "skipped" ] && \
-   [ ${repo_runnerdeployment_passed} == true ] || [ ${repo_runnerdeployment_passed} == "skipped" ]; then
-  echo "INFO : All tests passed or skipped"
-  echo "RunnerSet Repo Test Status : ${repo_runnerset_passed}"
-  echo "RunnerDeployment Repo Test Status : ${repo_runnerdeployment_passed}"
-else
-  echo "ERROR : Some tests failed"
-  echo "RunnerSet Repo Test Status : ${repo_runnerset_passed}"
-  echo "RunnerDeployment Repo Test Status : ${repo_runnerdeployment_passed}"
-  exit 1
-fi
+echo Found runner ${runner_name}.
+
+pod_name=
+
+while [ -z "${pod_name}" ]; do
+  echo Finding the runner pod... 1>&2
+  sleep 1
+  pod_name=$(kubectl get pod --output=jsonpath="{.items[*].metadata.name}" | grep ${runner_name})
+done
+
+echo Found pod ${pod_name}.
+
+echo Waiting for pod ${runner_name} to become ready... 1>&2
+
+kubectl wait pod/${runner_name} --for condition=ready --timeout 180s
+
+echo All tests passed. 1>&2

acceptance/deploy.sh

@@ -4,128 +4,39 @@ set -e
 
 tpe=${ACCEPTANCE_TEST_SECRET_TYPE}
 
-VALUES_FILE=${VALUES_FILE:-$(dirname $0)/values.yaml}
-
-kubectl delete secret -n actions-runner-system controller-manager || :
-
 if [ "${tpe}" == "token" ]; then
-  if ! kubectl get secret controller-manager -n actions-runner-system >/dev/null; then
-    kubectl create secret generic controller-manager \
-      -n actions-runner-system \
-      --from-literal=github_token=${GITHUB_TOKEN:?GITHUB_TOKEN must not be empty}
-  fi
+  kubectl create secret generic controller-manager \
+	  -n actions-runner-system \
+	  --from-literal=github_token=${GITHUB_TOKEN:?GITHUB_TOKEN must not be empty}
 elif [ "${tpe}" == "app" ]; then
   kubectl create secret generic controller-manager \
     -n actions-runner-system \
     --from-literal=github_app_id=${APP_ID:?must not be empty} \
-    --from-literal=github_app_installation_id=${APP_INSTALLATION_ID:?must not be empty} \
-    --from-file=github_app_private_key=${APP_PRIVATE_KEY_FILE:?must not be empty}
+    --from-literal=github_app_installation_id=${INSTALLATION_ID:?must not be empty} \
+    --from-file=github_app_private_key=${PRIVATE_KEY_FILE_PATH:?must not be empty}
 else
   echo "ACCEPTANCE_TEST_SECRET_TYPE must be set to either \"token\" or \"app\"" 1>&2
   exit 1
 fi
 
-if [ -n "${WEBHOOK_GITHUB_TOKEN}" ]; then
-  kubectl -n actions-runner-system delete secret \
-      github-webhook-server || :
-  kubectl -n actions-runner-system create secret generic \
-      github-webhook-server \
-      --from-literal=github_token=${WEBHOOK_GITHUB_TOKEN:?WEBHOOK_GITHUB_TOKEN must not be empty}
-else
-  echo 'Skipped deploying secret "github-webhook-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
   helm upgrade --install actions-runner-controller \
     charts/actions-runner-controller \
     -n actions-runner-system \
     --create-namespace \
-    --set syncPeriod=${SYNC_PERIOD} \
-    --set authSecret.create=false \
-    --set image.repository=${NAME} \
-    --set image.tag=${VERSION} \
-    --set podAnnotations.test-id=${TEST_ID} \
-    --set githubWebhookServer.podAnnotations.test-id=${TEST_ID} \
-    -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`
-  # errors
-  kubectl create -f charts/actions-runner-controller/crds || kubectl replace -f charts/actions-runner-controller/crds
-  # This wait fails due to timeout when it's already in crashloopback and this update doesn't change the image tag.
-  # That's why we add `|| :`. With that we prevent stopping the script in case of timeout and
-  # proceed to delete (possibly in crashloopback and/or running with outdated image) pods so that they are recreated by K8s.
-  kubectl -n actions-runner-system wait deploy/actions-runner-controller --for condition=available --timeout 60s || :
+    --set syncPeriod=5m
+  kubectl -n actions-runner-system wait deploy/actions-runner-controller --for condition=available
 else
   kubectl apply \
     -n actions-runner-system \
     -f release/actions-runner-controller.yaml
-  kubectl -n actions-runner-system wait deploy/controller-manager --for condition=available --timeout 120s || :
+  kubectl -n actions-runner-system wait deploy/controller-manager --for condition=available --timeout 60s
 fi
 
-# Restart all ARC pods
-kubectl -n actions-runner-system delete po -l app.kubernetes.io/name=actions-runner-controller
-
-echo Waiting for all ARC pods to be up and running after restart
-
-kubectl -n actions-runner-system wait deploy/actions-runner-controller --for condition=available --timeout 120s
-
 # Adhocly wait for some time until actions-runner-controller's admission webhook gets ready
 sleep 20
 
-RUNNER_LABEL=${RUNNER_LABEL:-self-hosted}
-
-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 apply -f -
-  else
-    echo 'Deploying runnerdeployment and hra. Set USE_RUNNERSET if you want to deploy runnerset instead.'
-    cat acceptance/testdata/runnerdeploy.envsubst.yaml | TEST_ENTERPRISE= TEST_ORG= RUNNER_MIN_REPLICAS=${REPO_RUNNER_MIN_REPLICAS} NAME=repo-runnerdeploy envsubst | kubectl apply -f -
-  fi
-else
-  echo 'Skipped deploying runnerdeployment and hra. Set TEST_REPO to "yourorg/yourrepo" to deploy.'
-fi
-
-if [ -n "${TEST_ORG}" ]; then
-  if [ "${USE_RUNNERSET}" != "false" ]; then
-    cat acceptance/testdata/runnerset.envsubst.yaml | TEST_ENTERPRISE= TEST_REPO= RUNNER_MIN_REPLICAS=${ORG_RUNNER_MIN_REPLICAS} NAME=org-runnerset envsubst | kubectl apply -f -
-  else
-    cat acceptance/testdata/runnerdeploy.envsubst.yaml | TEST_ENTERPRISE= TEST_REPO= RUNNER_MIN_REPLICAS=${ORG_RUNNER_MIN_REPLICAS} NAME=org-runnerdeploy envsubst | kubectl apply -f -
-  fi
-
-  if [ -n "${TEST_ORG_GROUP}" ]; then
-    if [ "${USE_RUNNERSET}" != "false" ]; then
-      cat acceptance/testdata/runnerset.envsubst.yaml | TEST_ENTERPRISE= TEST_REPO= RUNNER_MIN_REPLICAS=${ORG_RUNNER_MIN_REPLICAS} TEST_GROUP=${TEST_ORG_GROUP} NAME=orggroup-runnerset envsubst | kubectl apply -f -
-    else
-      cat acceptance/testdata/runnerdeploy.envsubst.yaml | TEST_ENTERPRISE= TEST_REPO= RUNNER_MIN_REPLICAS=${ORG_RUNNER_MIN_REPLICAS} TEST_GROUP=${TEST_ORG_GROUP} NAME=orggroup-runnerdeploy envsubst | kubectl apply -f -
-    fi
-  else
-    echo 'Skipped deploying enterprise runnerdeployment. Set TEST_ORG_GROUP to deploy.'
-  fi
-else
-  echo 'Skipped deploying organizational runnerdeployment. Set TEST_ORG to deploy.'
-fi
-
-if [ -n "${TEST_ENTERPRISE}" ]; then
-  if [ "${USE_RUNNERSET}" != "false" ]; then
-    cat acceptance/testdata/runnerset.envsubst.yaml | TEST_ORG= TEST_REPO= RUNNER_MIN_REPLICAS=${ENTERPRISE_RUNNER_MIN_REPLICAS} NAME=enterprise-runnerset envsubst | kubectl apply -f -
-  else
-    cat acceptance/testdata/runnerdeploy.envsubst.yaml | TEST_ORG= TEST_REPO= RUNNER_MIN_REPLICAS=${ENTERPRISE_RUNNER_MIN_REPLICAS} NAME=enterprise-runnerdeploy envsubst | kubectl apply -f -
-  fi
-
-  if [ -n "${TEST_ENTERPRISE_GROUP}" ]; then
-    if [ "${USE_RUNNERSET}" != "false" ]; then
-      cat acceptance/testdata/runnerset.envsubst.yaml | TEST_ORG= TEST_REPO= RUNNER_MIN_REPLICAS=${ENTERPRISE_RUNNER_MIN_REPLICAS} TEST_GROUP=${TEST_ENTERPRISE_GROUP} NAME=enterprisegroup-runnerset envsubst | kubectl apply -f -
-    else
-      cat acceptance/testdata/runnerdeploy.envsubst.yaml | TEST_ORG= TEST_REPO= RUNNER_MIN_REPLICAS=${ENTERPRISE_RUNNER_MIN_REPLICAS} TEST_GROUP=${TEST_ENTERPRISE_GROUP} NAME=enterprisegroup-runnerdeploy envsubst | kubectl apply -f -
-    fi
-  else
-    echo 'Skipped deploying enterprise runnerdeployment. Set TEST_ENTERPRISE_GROUP to deploy.'
-  fi
-else
-  echo 'Skipped deploying enterprise runnerdeployment. Set TEST_ENTERPRISE to deploy.'
-fi
+kubectl apply \
+  -f acceptance/testdata/runnerdeploy.yaml

acceptance/kind.yaml

@@ -1,10 +0,0 @@
-apiVersion: kind.x-k8s.io/v1alpha4
-kind: Cluster
-nodes:
-- role: control-plane
-  extraPortMappings:
-  - containerPort: 31000
-    hostPort: 31000
-    listenAddress: "0.0.0.0"
-    protocol: tcp
-#- role: worker

acceptance/pipelines/eks-integration-tests.yaml

@@ -1,36 +0,0 @@
-name: EKS Integration Tests
-
-on:
-  workflow_dispatch:
-
-env:
-  IRSA_ROLE_ARN:
-  ASSUME_ROLE_ARN: 
-  AWS_REGION: 
-
-jobs:
-  assume-role-in-runner-test:
-    runs-on: ['self-hosted', 'Linux']
-    steps:
-      - name: Test aws-actions/configure-aws-credentials Action
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-region: ${{ env.AWS_REGION }}
-          role-to-assume: ${{ env.ASSUME_ROLE_ARN }}
-          role-duration-seconds: 900
-  assume-role-in-container-test:
-    runs-on: ['self-hosted', 'Linux']
-    container: 
-      image: amazon/aws-cli
-      env:
-        AWS_WEB_IDENTITY_TOKEN_FILE: /var/run/secrets/eks.amazonaws.com/serviceaccount/token
-        AWS_ROLE_ARN: ${{ env.IRSA_ROLE_ARN }}
-      volumes:
-        - /var/run/secrets/eks.amazonaws.com/serviceaccount/token:/var/run/secrets/eks.amazonaws.com/serviceaccount/token
-    steps:
-      - name: Test aws-actions/configure-aws-credentials Action in container
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-region: ${{ env.AWS_REGION }}
-          role-to-assume: ${{ env.ASSUME_ROLE_ARN }}
-          role-duration-seconds: 900

acceptance/pipelines/runner-integration-tests.yaml

@@ -1,83 +0,0 @@
-name: Runner Integration Tests
-
-on:
-  workflow_dispatch:
-
-env:
-  ImageOS: ubuntu18 # Used by ruby/setup-ruby action | Update me for the runner OS version you are testing against
-
-jobs:
-  run-step-in-container-test:
-    runs-on: ['self-hosted', 'Linux']
-    container: 
-      image: alpine
-    steps:
-      - name: Test we are working in the container
-        run: |
-          if [[ $(sed -n '2p' < /etc/os-release | cut -d "=" -f2) != "alpine" ]]; then
-              echo "::error ::Failed OS detection test, could not match /etc/os-release with alpine. Are we really running in the container?"
-              echo "/etc/os-release below:"
-              cat /etc/os-release
-              exit 1
-          fi
-  setup-python-test:
-    runs-on: ['self-hosted', 'Linux']
-    steps:
-      - name: Print native Python environment
-        run: |
-          which python
-          python --version
-      - uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - name: Test actions/setup-python works
-        run: |
-          VERSION=$(python --version 2>&1 | cut -d ' ' -f2 | cut -d '.' -f1-2)
-          if [[ $VERSION != '3.9' ]]; then
-            echo "Python version detected : $(python --version 2>&1)"
-            echo "::error ::Detected python failed setup version test, could not match version with version specified in the setup action"
-            exit 1
-          else
-            echo "Python version detected : $(python --version 2>&1)"
-          fi
-  setup-node-test:
-    runs-on: ['self-hosted', 'Linux']
-    steps:
-      - uses: actions/setup-node@v2
-        with:
-          node-version: '12'
-      - name: Test actions/setup-node works 
-        run: |
-          VERSION=$(node --version | cut -c 2- | cut -d '.' -f1)
-          if [[ $VERSION != '12' ]]; then
-            echo "Node version detected : $(node --version 2>&1)"
-            echo "::error ::Detected node failed setup version test, could not match version with version specified in the setup action"
-            exit 1
-          else
-            echo "Node version detected : $(node --version 2>&1)"
-          fi
-  setup-ruby-test:
-    runs-on: ['self-hosted', 'Linux']
-    steps:
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0
-          bundler-cache: true
-      - name: Test ruby/setup-ruby works 
-        run: |
-          VERSION=$(ruby --version | cut -d ' ' -f2 | cut -d '.' -f1-2)
-          if [[ $VERSION != '3.0' ]]; then
-              echo "Ruby version detected : $(ruby --version 2>&1)"
-              echo "::error ::Detected ruby failed setup version test, could not match version with version specified in the setup action"
-              exit 1
-          else
-              echo "Ruby version detected : $(ruby --version 2>&1)"
-          fi
-  python-shell-test:
-    runs-on: ['self-hosted', 'Linux']
-    steps:      
-      - name: Test Python shell works
-        run: |
-          import os
-          print(os.environ['PATH'])
-        shell: python

acceptance/testdata/runnerdeploy.envsubst.yaml

@@ -1,61 +0,0 @@
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerDeployment
-metadata:
-  name: ${NAME}
-spec:
-#  replicas: 1
-  template:
-    spec:
-      enterprise: ${TEST_ENTERPRISE}
-      group: ${TEST_GROUP}
-      organization: ${TEST_ORG}
-      repository: ${TEST_REPO}
-
-      #
-      # Custom runner image
-      #
-      image: ${RUNNER_NAME}:${RUNNER_TAG}
-      imagePullPolicy: IfNotPresent
-
-      ephemeral: ${TEST_EPHEMERAL}
-
-      #
-      # dockerd within runner container
-      #
-      ## Replace `mumoshu/actions-runner-dind:dev` with your dind image
-      #dockerdWithinRunnerContainer: true
-      #image: mumoshu/actions-runner-dind:dev
-      dockerdWithinRunnerContainer: ${RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER}
-
-      #
-      # Set the MTU used by dockerd-managed network interfaces (including docker-build-ubuntu)
-      #
-      #dockerMTU: 1450
-
-      #Runner group
-      # labels:
-      # - "mylabel 1"
-      # - "mylabel 2"
-      labels:
-      - "${RUNNER_LABEL}"
-
-      #
-      # Non-standard working directory
-      #
-      # workDir: "/"
----
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: HorizontalRunnerAutoscaler
-metadata:
-  name: ${NAME}
-spec:
-  scaleTargetRef:
-    name: ${NAME}
-  scaleUpTriggers:
-  - githubEvent:
-      workflowJob: {}
-    amount: 1
-    duration: "10m"
-  minReplicas: ${RUNNER_MIN_REPLICAS}
-  maxReplicas: 10
-  scaleDownDelaySecondsAfterScaleOut: ${RUNNER_SCALE_DOWN_DELAY_SECONDS_AFTER_SCALE_OUT}

acceptance/testdata/runnerdeploy.yaml

@@ -0,0 +1,9 @@
+apiVersion: actions.summerwind.dev/v1alpha1
+kind: RunnerDeployment
+metadata:
+  name: example-runnerdeploy
+spec:
+#  replicas: 1
+  template:
+    spec:
+      repository: mumoshu/actions-runner-controller-ci

acceptance/testdata/runnerset.envsubst.yaml

@@ -1,253 +0,0 @@
----
-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}
-# In kind environments, the provider writes:
-#   /var/lib/docker/volumes/KIND_NODE_CONTAINER_VOL_ID/_data/local-path-provisioner/PV_NAME
-# It can be hundreds of gigabytes depending on what you cache in the test workflow. Beware to not encounter `no space left on device` errors!
-# If you did encounter no space errorrs try:
-#   docker system prune
-#   docker buildx prune #=> frees up /var/lib/docker/volumes/buildx_buildkit_container-builder0_state
-#   sudo rm -rf /var/lib/docker/volumes/KIND_NODE_CONTAINER_VOL_ID/_data/local-path-provisioner #=> frees up local-path-provisioner's data
-provisioner: rancher.io/local-path
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: ${NAME}-var-lib-docker
-  labels:
-    content: ${NAME}-var-lib-docker
-provisioner: rancher.io/local-path
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: ${NAME}-cache
-  labels:
-    content: ${NAME}-cache
-provisioner: rancher.io/local-path
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: ${NAME}-runner-tool-cache
-  labels:
-    content: ${NAME}-runner-tool-cache
-provisioner: rancher.io/local-path
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
----
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: RunnerSet
-metadata:
-  name: ${NAME}
-spec:
-  # MANDATORY because it is based on StatefulSet: Results in a below error when omitted:
-  #   missing required field "selector" in dev.summerwind.actions.v1alpha1.RunnerSet.spec
-  selector:
-    matchLabels:
-      app: ${NAME}
-
-  # MANDATORY because it is based on StatefulSet: Results in a below error when omitted:
-  # missing required field "serviceName" in dev.summerwind.actions.v1alpha1.RunnerSet.spec]
-  serviceName: ${NAME}
-
-  #replicas: 1
-
-  # From my limited testing, `ephemeral: true` is more reliable.
-  # Seomtimes, updating already deployed runners from `ephemeral: false` to `ephemeral: true` seems to
-  # result in queued jobs hanging forever.
-  ephemeral: ${TEST_EPHEMERAL}
-
-  enterprise: ${TEST_ENTERPRISE}
-  group: ${TEST_GROUP}
-  organization: ${TEST_ORG}
-  repository: ${TEST_REPO}
-
-  #
-  # Custom runner image
-  #
-  image: ${RUNNER_NAME}:${RUNNER_TAG}
-
-  #
-  # dockerd within runner container
-  #
-  ## Replace `mumoshu/actions-runner-dind:dev` with your dind image
-  #dockerdWithinRunnerContainer: true
-  dockerdWithinRunnerContainer: ${RUNNER_DOCKERD_WITHIN_RUNNER_CONTAINER}
-
-  #
-  # Set the MTU used by dockerd-managed network interfaces (including docker-build-ubuntu)
-  #
-  #dockerMTU: 1450
-  #Runner group
-  # labels:
-  # - "mylabel 1"
-  # - "mylabel 2"
-  labels:
-  - "${RUNNER_LABEL}"
-  #
-  # Non-standard working directory
-  #
-  # workDir: "/"
-  template:
-    metadata:
-      labels:
-        app: ${NAME}
-    spec:
-      containers:
-      - name: runner
-        imagePullPolicy: IfNotPresent
-        env:
-        - name: RUNNER_FEATURE_FLAG_EPHEMERAL
-          value: "${RUNNER_FEATURE_FLAG_EPHEMERAL}"
-        - name: GOMODCACHE
-          value: "/home/runner/.cache/go-mod"
-        # PV-backed runner work dir
-        volumeMounts:
-        - name: work
-          mountPath: /runner/_work
-        # Cache docker image layers, in case dockerdWithinRunnerContainer=true
-        - name: var-lib-docker
-          mountPath: /var/lib/docker
-        # Cache go modules and builds
-        # - name: gocache
-        #   # Run `goenv | grep GOCACHE` to verify the path is correct for your env
-        #   mountPath: /home/runner/.cache/go-build
-        # - name: gomodcache
-        #   # Run `goenv | grep GOMODCACHE` to verify the path is correct for your env
-        #   # mountPath: /home/runner/go/pkg/mod
-        - name: cache
-          # go: could not create module cache: stat /home/runner/.cache/go-mod: permission denied
-          mountPath: "/home/runner/.cache"
-        - name: runner-tool-cache
-          # This corresponds to our runner image's default setting of RUNNER_TOOL_CACHE=/opt/hostedtoolcache.
-          #
-          # In case you customize the envvar in both runner and docker containers of the runner pod spec,
-          # You'd need to change this mountPath accordingly.
-          #
-          # The tool cache directory is defined in actions/toolkit's tool-cache module:
-          # https://github.com/actions/toolkit/blob/2f164000dcd42fb08287824a3bc3030dbed33687/packages/tool-cache/src/tool-cache.ts#L621-L638
-          #
-          # Many setup-* actions like setup-go utilizes the tool-cache module to download and cache installed binaries:
-          # 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"
-      volumes:
-      - name: work
-        ephemeral:
-          volumeClaimTemplate:
-            spec:
-              accessModes:
-              - ReadWriteOnce
-              storageClassName: "${NAME}-runner-work-dir"
-              resources:
-                requests:
-                  storage: 10Gi
-  volumeClaimTemplates:
-  - metadata:
-      name: vol1
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Mi
-      storageClassName: ${NAME}
-      ## Dunno which provider supports auto-provisioning with selector.
-      ## At least the rancher local path provider stopped with:
-      ##  waiting for a volume to be created, either by external provisioner "rancher.io/local-path" or manually created by system administrator
-      # selector:
-      #    matchLabels:
-      #      runnerset-volume-id: ${NAME}-vol1
-  - metadata:
-      name: vol2
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Mi
-      storageClassName: ${NAME}
-      # selector:
-      #    matchLabels:
-      #      runnerset-volume-id: ${NAME}-vol2
-  - metadata:
-      name: var-lib-docker
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Mi
-      storageClassName: ${NAME}-var-lib-docker
-  - metadata:
-      name: cache
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Mi
-      storageClassName: ${NAME}-cache
-  - metadata:
-      name: runner-tool-cache
-      # It turns out labels doesn't distinguish PVs across PVCs and the
-      # end result is PVs are reused by wrong PVCs.
-      # The correct way seems to be to differentiate storage class per pvc template.
-      # labels:
-      #   id: runner-tool-cache
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Mi
-      storageClassName: ${NAME}-runner-tool-cache
----
-apiVersion: actions.summerwind.dev/v1alpha1
-kind: HorizontalRunnerAutoscaler
-metadata:
-  name: ${NAME}
-spec:
-  scaleTargetRef:
-    kind: RunnerSet
-    name: ${NAME}
-  scaleUpTriggers:
-  - githubEvent:
-      workflowJob: {}
-    amount: 1
-    duration: "10m"
-  minReplicas: ${RUNNER_MIN_REPLICAS}
-  maxReplicas: 10
-  scaleDownDelaySecondsAfterScaleOut: ${RUNNER_SCALE_DOWN_DELAY_SECONDS_AFTER_SCALE_OUT}

acceptance/values.yaml

@@ -1,23 +0,0 @@
-# Set actions-runner-controller settings for testing
-logLevel: "-4"
-githubWebhookServer:
-  logLevel: "-4"
-  enabled: true
-  labels: {}
-  replicaCount: 1
-  syncPeriod: 10m
-  useRunnerGroupsVisibility: true
-  secret:
-    enabled: true
-    # create: true
-    name: "github-webhook-server"
-    ### GitHub Webhook Configuration
-    #github_webhook_secret_token: ""
-  service:
-    type: NodePort
-    ports:
-      - port: 80
-        targetPort: http
-        protocol: TCP
-        name: http
-        nodePort: 31000

api/v1alpha1/horizontalrunnerautoscaler_types.go

@@ -29,7 +29,7 @@ type HorizontalRunnerAutoscalerSpec struct {
 	// +optional
 	MinReplicas *int `json:"minReplicas,omitempty"`
 
-	// MaxReplicas is the maximum number of replicas the deployment is allowed to scale
+	// MinReplicas is the maximum number of replicas the deployment is allowed to scale
 	// +optional
 	MaxReplicas *int `json:"maxReplicas,omitempty"`
 
@@ -41,90 +41,9 @@ type HorizontalRunnerAutoscalerSpec struct {
 	// Metrics is the collection of various metric targets to calculate desired number of runners
 	// +optional
 	Metrics []MetricSpec `json:"metrics,omitempty"`
-
-	// ScaleUpTriggers is an experimental feature to increase the desired replicas by 1
-	// on each webhook requested received by the webhookBasedAutoscaler.
-	//
-	// This feature requires you to also enable and deploy the webhookBasedAutoscaler onto your cluster.
-	//
-	// Note that the added runners remain until the next sync period at least,
-	// and they may or may not be used by GitHub Actions depending on the timing.
-	// They are intended to be used to gain "resource slack" immediately after you
-	// receive a webhook from GitHub, so that you can loosely expect MinReplicas runners to be always available.
-	ScaleUpTriggers []ScaleUpTrigger `json:"scaleUpTriggers,omitempty"`
-
-	CapacityReservations []CapacityReservation `json:"capacityReservations,omitempty" patchStrategy:"merge" patchMergeKey:"name"`
-
-	// 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.
-	// +optional
-	ScheduledOverrides []ScheduledOverride `json:"scheduledOverrides,omitempty"`
-}
-
-type ScaleUpTrigger struct {
-	GitHubEvent *GitHubEventScaleUpTriggerSpec `json:"githubEvent,omitempty"`
-	Amount      int                            `json:"amount,omitempty"`
-	Duration    metav1.Duration                `json:"duration,omitempty"`
-}
-
-type GitHubEventScaleUpTriggerSpec struct {
-	CheckRun    *CheckRunSpec    `json:"checkRun,omitempty"`
-	PullRequest *PullRequestSpec `json:"pullRequest,omitempty"`
-	Push        *PushSpec        `json:"push,omitempty"`
-	WorkflowJob *WorkflowJobSpec `json:"workflowJob,omitempty"`
-}
-
-// https://docs.github.com/en/actions/reference/events-that-trigger-workflows#check_run
-type CheckRunSpec struct {
-	// One of: created, rerequested, or completed
-	Types  []string `json:"types,omitempty"`
-	Status string   `json:"status,omitempty"`
-
-	// Names is a list of GitHub Actions glob patterns.
-	// Any check_run event whose name matches one of patterns in the list can trigger autoscaling.
-	// Note that check_run name seem to equal to the job name you've defined in your actions workflow yaml file.
-	// So it is very likely that you can utilize this to trigger depending on the job.
-	Names []string `json:"names,omitempty"`
-
-	// Repositories is a list of GitHub repositories.
-	// Any check_run event whose repository matches one of repositories in the list can trigger autoscaling.
-	Repositories []string `json:"repositories,omitempty"`
-}
-
-// https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_job
-type WorkflowJobSpec struct {
-}
-
-// https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request
-type PullRequestSpec struct {
-	Types    []string `json:"types,omitempty"`
-	Branches []string `json:"branches,omitempty"`
-}
-
-// PushSpec is the condition for triggering scale-up on push event
-// Also see https://docs.github.com/en/actions/reference/events-that-trigger-workflows#push
-type PushSpec struct {
-}
-
-// CapacityReservation specifies the number of replicas temporarily added
-// to the scale target until ExpirationTime.
-type CapacityReservation struct {
-	Name           string      `json:"name,omitempty"`
-	ExpirationTime metav1.Time `json:"expirationTime,omitempty"`
-	Replicas       int         `json:"replicas,omitempty"`
-
-	// +optional
-	EffectiveTime metav1.Time `json:"effectiveTime,omitempty"`
 }
 
 type ScaleTargetRef struct {
-	// Kind is the type of resource being referenced
-	// +optional
-	// +kubebuilder:validation:Enum=RunnerDeployment;RunnerSet
-	Kind string `json:"kind,omitempty"`
-
-	// Name is the name of resource being referenced
 	Name string `json:"name,omitempty"`
 }
 
@@ -157,50 +76,6 @@ type MetricSpec struct {
 	// to determine how many pods should be removed.
 	// +optional
 	ScaleDownFactor string `json:"scaleDownFactor,omitempty"`
-
-	// ScaleUpAdjustment is the number of runners added on scale-up.
-	// You can only specify either ScaleUpFactor or ScaleUpAdjustment.
-	// +optional
-	ScaleUpAdjustment int `json:"scaleUpAdjustment,omitempty"`
-
-	// ScaleDownAdjustment is the number of runners removed on scale-down.
-	// You can only specify either ScaleDownFactor or ScaleDownAdjustment.
-	// +optional
-	ScaleDownAdjustment int `json:"scaleDownAdjustment,omitempty"`
-}
-
-// 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.
-type ScheduledOverride struct {
-	// StartTime is the time at which the first override starts.
-	StartTime metav1.Time `json:"startTime"`
-
-	// EndTime is the time at which the first override ends.
-	EndTime metav1.Time `json:"endTime"`
-
-	// MinReplicas is the number of runners while overriding.
-	// If omitted, it doesn't override minReplicas.
-	// +optional
-	// +nullable
-	// +kubebuilder:validation:Minimum=0
-	MinReplicas *int `json:"minReplicas,omitempty"`
-
-	// +optional
-	RecurrenceRule RecurrenceRule `json:"recurrenceRule,omitempty"`
-}
-
-type RecurrenceRule struct {
-	// Frequency is the name of a predefined interval of each recurrence.
-	// The valid values are "Daily", "Weekly", "Monthly", and "Yearly".
-	// If empty, the corresponding override happens only once.
-	// +optional
-	// +kubebuilder:validation:Enum=Daily;Weekly;Monthly;Yearly
-	Frequency string `json:"frequency,omitempty"`
-
-	// UntilTime is the time of the final recurrence.
-	// If empty, the schedule recurs forever.
-	// +optional
-	UntilTime metav1.Time `json:"untilTime,omitempty"`
 }
 
 type HorizontalRunnerAutoscalerStatus struct {
@@ -215,33 +90,14 @@ type HorizontalRunnerAutoscalerStatus struct {
 	DesiredReplicas *int `json:"desiredReplicas,omitempty"`
 
 	// +optional
-	// +nullable
 	LastSuccessfulScaleOutTime *metav1.Time `json:"lastSuccessfulScaleOutTime,omitempty"`
-
-	// +optional
-	CacheEntries []CacheEntry `json:"cacheEntries,omitempty"`
-
-	// ScheduledOverridesSummary is the summary of active and upcoming scheduled overrides to be shown in e.g. a column of a `kubectl get hra` output
-	// for observability.
-	// +optional
-	ScheduledOverridesSummary *string `json:"scheduledOverridesSummary,omitempty"`
-}
-
-const CacheEntryKeyDesiredReplicas = "desiredReplicas"
-
-type CacheEntry struct {
-	Key            string      `json:"key,omitempty"`
-	Value          int         `json:"value,omitempty"`
-	ExpirationTime metav1.Time `json:"expirationTime,omitempty"`
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=hra
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".spec.minReplicas",name=Min,type=number
 // +kubebuilder:printcolumn:JSONPath=".spec.maxReplicas",name=Max,type=number
 // +kubebuilder:printcolumn:JSONPath=".status.desiredReplicas",name=Desired,type=number
-// +kubebuilder:printcolumn:JSONPath=".status.scheduledOverridesSummary",name=Schedule,type=string
 
 // HorizontalRunnerAutoscaler is the Schema for the horizontalrunnerautoscaler API
 type HorizontalRunnerAutoscaler struct {

api/v1alpha1/runner_types.go

@@ -19,23 +19,12 @@ package v1alpha1
 import (
 	"errors"
 
-	"k8s.io/apimachinery/pkg/api/resource"
-
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // RunnerSpec defines the desired state of Runner
 type RunnerSpec struct {
-	RunnerConfig  `json:",inline"`
-	RunnerPodSpec `json:",inline"`
-}
-
-type RunnerConfig struct {
-	// +optional
-	// +kubebuilder:validation:Pattern=`^[^/]+$`
-	Enterprise string `json:"enterprise,omitempty"`
-
 	// +optional
 	// +kubebuilder:validation:Pattern=`^[^/]+$`
 	Organization string `json:"organization,omitempty"`
@@ -51,129 +40,64 @@ type RunnerConfig struct {
 	Group string `json:"group,omitempty"`
 
 	// +optional
-	Ephemeral *bool `json:"ephemeral,omitempty"`
-
-	// +optional
-	Image string `json:"image"`
-
-	// +optional
-	WorkDir string `json:"workDir,omitempty"`
-
-	// +optional
-	DockerdWithinRunnerContainer *bool `json:"dockerdWithinRunnerContainer,omitempty"`
-	// +optional
-	DockerEnabled *bool `json:"dockerEnabled,omitempty"`
-	// +optional
-	DockerMTU *int64 `json:"dockerMTU,omitempty"`
-	// +optional
-	DockerRegistryMirror *string `json:"dockerRegistryMirror,omitempty"`
-	// +optional
-	VolumeSizeLimit *resource.Quantity `json:"volumeSizeLimit,omitempty"`
-	// +optional
-	VolumeStorageMedium *string `json:"volumeStorageMedium,omitempty"`
-}
-
-// RunnerPodSpec defines the desired pod spec fields of the runner pod
-type RunnerPodSpec struct {
+	Containers []corev1.Container `json:"containers,omitempty"`
 	// +optional
 	DockerdContainerResources corev1.ResourceRequirements `json:"dockerdContainerResources,omitempty"`
-
 	// +optional
-	DockerVolumeMounts []corev1.VolumeMount `json:"dockerVolumeMounts,omitempty"`
-
+	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 	// +optional
-	DockerEnv []corev1.EnvVar `json:"dockerEnv,omitempty"`
-
-	// +optional
-	Containers []corev1.Container `json:"containers,omitempty"`
-
-	// +optional
-	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
-
-	// +optional
-	Env []corev1.EnvVar `json:"env,omitempty"`
-
+	VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`
 	// +optional
 	EnvFrom []corev1.EnvFromSource `json:"envFrom,omitempty"`
 
 	// +optional
-	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
-
+	Image string `json:"image"`
 	// +optional
-	VolumeMounts []corev1.VolumeMount `json:"volumeMounts,omitempty"`
+	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
+	// +optional
+	Env []corev1.EnvVar `json:"env,omitempty"`
 
 	// +optional
 	Volumes []corev1.Volume `json:"volumes,omitempty"`
-
 	// +optional
-	EnableServiceLinks *bool `json:"enableServiceLinks,omitempty"`
+	WorkDir string `json:"workDir,omitempty"`
 
 	// +optional
 	InitContainers []corev1.Container `json:"initContainers,omitempty"`
-
-	// +optional
-	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
-
-	// +optional
-	ServiceAccountName string `json:"serviceAccountName,omitempty"`
-
-	// +optional
-	AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"`
-
 	// +optional
 	SidecarContainers []corev1.Container `json:"sidecarContainers,omitempty"`
-
+	// +optional
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// +optional
+	ServiceAccountName string `json:"serviceAccountName,omitempty"`
+	// +optional
+	AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty"`
 	// +optional
 	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
-
 	// +optional
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
-
 	// +optional
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
-
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
-
-	// +optional
-	TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
-
 	// +optional
 	EphemeralContainers []corev1.EphemeralContainer `json:"ephemeralContainers,omitempty"`
-
 	// +optional
-	HostAliases []corev1.HostAlias `json:"hostAliases,omitempty"`
-
+	TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
 	// +optional
-	TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
-
-	// RuntimeClassName is the container runtime configuration that containers should run under.
-	// More info: https://kubernetes.io/docs/concepts/containers/runtime-class
+	DockerdWithinRunnerContainer *bool `json:"dockerdWithinRunnerContainer,omitempty"`
 	// +optional
-	RuntimeClassName *string `json:"runtimeClassName,omitempty"`
-
-	// +optional
-	DnsConfig *corev1.PodDNSConfig `json:"dnsConfig,omitempty"`
+	DockerEnabled *bool `json:"dockerEnabled,omitempty"`
 }
 
 // ValidateRepository validates repository field.
 func (rs *RunnerSpec) ValidateRepository() error {
-	// Enterprise, Organization and repository are both exclusive.
-	foundCount := 0
-	if len(rs.Organization) > 0 {
-		foundCount += 1
+	// Organization and repository are both exclusive.
+	if len(rs.Organization) == 0 && len(rs.Repository) == 0 {
+		return errors.New("Spec needs organization or repository")
 	}
-	if len(rs.Repository) > 0 {
-		foundCount += 1
-	}
-	if len(rs.Enterprise) > 0 {
-		foundCount += 1
-	}
-	if foundCount == 0 {
-		return errors.New("Spec needs enterprise, organization or repository")
-	}
-	if foundCount > 1 {
-		return errors.New("Spec cannot have many fields defined enterprise, organization and repository")
+	if len(rs.Organization) > 0 && len(rs.Repository) > 0 {
+		return errors.New("Spec cannot have both organization and repository")
 	}
 
 	return nil
@@ -181,25 +105,14 @@ func (rs *RunnerSpec) ValidateRepository() error {
 
 // RunnerStatus defines the observed state of Runner
 type RunnerStatus struct {
-	// Turns true only if the runner pod is ready.
-	// +optional
-	Ready bool `json:"ready"`
-	// +optional
 	Registration RunnerStatusRegistration `json:"registration"`
-	// +optional
-	Phase string `json:"phase,omitempty"`
-	// +optional
-	Reason string `json:"reason,omitempty"`
-	// +optional
-	Message string `json:"message,omitempty"`
-	// +optional
-	// +nullable
-	LastRegistrationCheckTime *metav1.Time `json:"lastRegistrationCheckTime,omitempty"`
+	Phase        string                   `json:"phase"`
+	Reason       string                   `json:"reason"`
+	Message      string                   `json:"message"`
 }
 
 // RunnerStatusRegistration contains runner registration status
 type RunnerStatusRegistration struct {
-	Enterprise   string      `json:"enterprise,omitempty"`
 	Organization string      `json:"organization,omitempty"`
 	Repository   string      `json:"repository,omitempty"`
 	Labels       []string    `json:"labels,omitempty"`
@@ -209,12 +122,10 @@ type RunnerStatusRegistration struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +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.labels",name=Labels,type=string
 // +kubebuilder:printcolumn:JSONPath=".status.phase",name=Status,type=string
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // Runner is the Schema for the runners API
 type Runner struct {

api/v1alpha1/runner_webhook.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
@@ -34,7 +34,7 @@ func (r *Runner) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=mutate.runner.actions.summerwind.dev,sideEffects=None,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=mutate.runner.actions.summerwind.dev
 
 var _ webhook.Defaulter = &Runner{}
 
@@ -43,7 +43,7 @@ func (r *Runner) Default() {
 	// Nothing to do.
 }
 
-// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=validate.runner.actions.summerwind.dev,sideEffects=None,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=validate.runner.actions.summerwind.dev
 
 var _ webhook.Validator = &Runner{}
 

api/v1alpha1/runnerdeployment_types.go

@@ -25,63 +25,30 @@ const (
 	AutoscalingMetricTypePercentageRunnersBusy                        = "PercentageRunnersBusy"
 )
 
-// RunnerDeploymentSpec defines the desired state of RunnerDeployment
+// RunnerReplicaSetSpec defines the desired state of RunnerDeployment
 type RunnerDeploymentSpec struct {
 	// +optional
 	// +nullable
 	Replicas *int `json:"replicas,omitempty"`
 
-	// 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 RunnerRepicaSet(s) and used to prevent ephemeral runners from unnecessarily recreated.
-	//
-	// +optional
-	// +nullable
-	EffectiveTime *metav1.Time `json:"effectiveTime"`
-
-	// +optional
-	// +nullable
-	Selector *metav1.LabelSelector `json:"selector"`
-	Template RunnerTemplate        `json:"template"`
+	Template RunnerTemplate `json:"template"`
 }
 
 type RunnerDeploymentStatus struct {
-	// See K8s deployment controller code for reference
-	// https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/pkg/controller/deployment/sync.go#L487-L505
+	AvailableReplicas int `json:"availableReplicas"`
+	ReadyReplicas     int `json:"readyReplicas"`
 
-	// AvailableReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
-	// This corresponds to the sum of status.availableReplicas of all the runner replica sets.
-	// +optional
-	AvailableReplicas *int `json:"availableReplicas"`
-
-	// ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
-	// This corresponds to the sum of status.readyReplicas of all the runner replica sets.
-	// +optional
-	ReadyReplicas *int `json:"readyReplicas"`
-
-	// ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
-	// This corresponds to status.replicas of the runner replica set that has the desired template hash.
-	// +optional
-	UpdatedReplicas *int `json:"updatedReplicas"`
-
-	// DesiredReplicas is the total number of desired, non-terminated and latest pods to be set for the primary RunnerSet
+	// Replicas is the total number of desired, non-terminated and latest pods to be set for the primary RunnerSet
 	// This doesn't include outdated pods while upgrading the deployment and replacing the runnerset.
 	// +optional
-	DesiredReplicas *int `json:"desiredReplicas"`
-
-	// Replicas is the total number of replicas
-	// +optional
-	Replicas *int `json:"replicas"`
+	Replicas *int `json:"desiredReplicas,omitempty"`
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=rdeploy
 // +kubebuilder:subresource:status
 // +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
-// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Available,type=number
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
+// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Current,type=number
+// +kubebuilder:printcolumn:JSONPath=".status.readyReplicas",name=Ready,type=number
 
 // RunnerDeployment is the Schema for the runnerdeployments API
 type RunnerDeployment struct {

api/v1alpha1/runnerdeployment_webhook.go

@@ -21,12 +21,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 // log is for logging in this package.
-var runnerDeploymentLog = logf.Log.WithName("runnerdeployment-resource")
+var runenrDeploymentLog = logf.Log.WithName("runnerdeployment-resource")
 
 func (r *RunnerDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
@@ -34,7 +34,7 @@ func (r *RunnerDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runnerdeployment,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerdeployments,versions=v1alpha1,name=mutate.runnerdeployment.actions.summerwind.dev,sideEffects=None,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runnerdeployment,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerdeployments,versions=v1alpha1,name=mutate.runnerdeployment.actions.summerwind.dev
 
 var _ webhook.Defaulter = &RunnerDeployment{}
 
@@ -43,19 +43,19 @@ func (r *RunnerDeployment) Default() {
 	// Nothing to do.
 }
 
-// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runnerdeployment,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerdeployments,versions=v1alpha1,name=validate.runnerdeployment.actions.summerwind.dev,sideEffects=None,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runnerdeployment,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerdeployments,versions=v1alpha1,name=validate.runnerdeployment.actions.summerwind.dev
 
 var _ webhook.Validator = &RunnerDeployment{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *RunnerDeployment) ValidateCreate() error {
-	runnerDeploymentLog.Info("validate resource to be created", "name", r.Name)
+	runenrDeploymentLog.Info("validate resource to be created", "name", r.Name)
 	return r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
 func (r *RunnerDeployment) ValidateUpdate(old runtime.Object) error {
-	runnerDeploymentLog.Info("validate resource to be updated", "name", r.Name)
+	runenrDeploymentLog.Info("validate resource to be updated", "name", r.Name)
 	return r.Validate()
 }
 

api/v1alpha1/runnerreplicaset_types.go

@@ -26,35 +26,12 @@ type RunnerReplicaSetSpec struct {
 	// +nullable
 	Replicas *int `json:"replicas,omitempty"`
 
-	// EffectiveTime is the time the upstream controller requested to sync Replicas.
-	// It is usually populated by the webhook-based autoscaler via HRA and RunnerDeployment.
-	// The value is used to prevent runnerreplicaset controller from unnecessarily recreating ephemeral runners
-	// based on potentially outdated Replicas value.
-	//
-	// +optional
-	// +nullable
-	EffectiveTime *metav1.Time `json:"effectiveTime"`
-
-	// +optional
-	// +nullable
-	Selector *metav1.LabelSelector `json:"selector"`
-	Template RunnerTemplate        `json:"template"`
+	Template RunnerTemplate `json:"template"`
 }
 
 type RunnerReplicaSetStatus struct {
-	// See K8s replicaset controller code for reference
-	// https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/pkg/controller/replicaset/replica_set_utils.go#L101-L106
-
-	// Replicas is the number of runners that are created and still being managed by this runner replica set.
-	// +optional
-	Replicas *int `json:"replicas"`
-
-	// ReadyReplicas is the number of runners that are created and Runnning.
-	ReadyReplicas *int `json:"readyReplicas"`
-
-	// AvailableReplicas is the number of runners that are created and Runnning.
-	// This is currently same as ReadyReplicas but perserved for future use.
-	AvailableReplicas *int `json:"availableReplicas"`
+	AvailableReplicas int `json:"availableReplicas"`
+	ReadyReplicas     int `json:"readyReplicas"`
 }
 
 type RunnerTemplate struct {
@@ -64,12 +41,10 @@ type RunnerTemplate struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:shortName=rrs
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".spec.replicas",name=Desired,type=number
-// +kubebuilder:printcolumn:JSONPath=".status.replicas",name=Current,type=number
+// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Current,type=number
 // +kubebuilder:printcolumn:JSONPath=".status.readyReplicas",name=Ready,type=number
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // RunnerReplicaSet is the Schema for the runnerreplicasets API
 type RunnerReplicaSet struct {

api/v1alpha1/runnerreplicaset_webhook.go

@@ -21,7 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
@@ -34,7 +34,7 @@ func (r *RunnerReplicaSet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=mutate.runnerreplicaset.actions.summerwind.dev,sideEffects=None,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=mutate.runnerreplicaset.actions.summerwind.dev
 
 var _ webhook.Defaulter = &RunnerReplicaSet{}
 
@@ -43,7 +43,7 @@ func (r *RunnerReplicaSet) Default() {
 	// Nothing to do.
 }
 
-// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=validate.runnerreplicaset.actions.summerwind.dev,sideEffects=None,admissionReviewVersions=v1beta1
+// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=validate.runnerreplicaset.actions.summerwind.dev
 
 var _ webhook.Validator = &RunnerReplicaSet{}
 

api/v1alpha1/runnerset_types.go

@@ -1,96 +0,0 @@
-/*
-Copyright 2021 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 (
-	appsv1 "k8s.io/api/apps/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// RunnerSetSpec defines the desired state of RunnerSet
-type RunnerSetSpec struct {
-	RunnerConfig `json:",inline"`
-
-	// EffectiveTime is the time the upstream controller requested to sync Replicas.
-	// It is usually populated by the webhook-based autoscaler via HRA.
-	// It is used to prevent ephemeral runners from unnecessarily recreated.
-	//
-	// +optional
-	// +nullable
-	EffectiveTime *metav1.Time `json:"effectiveTime,omitempty"`
-
-	appsv1.StatefulSetSpec `json:",inline"`
-}
-
-type RunnerSetStatus struct {
-	// See K8s deployment controller code for reference
-	// https://github.com/kubernetes/kubernetes/blob/ea0764452222146c47ec826977f49d7001b0ea8c/pkg/controller/deployment/sync.go#L487-L505
-
-	// AvailableReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
-	// This corresponds to the sum of status.availableReplicas of all the runner replica sets.
-	// +optional
-	CurrentReplicas *int `json:"availableReplicas"`
-
-	// ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
-	// This corresponds to the sum of status.readyReplicas of all the runner replica sets.
-	// +optional
-	ReadyReplicas *int `json:"readyReplicas"`
-
-	// ReadyReplicas is the total number of available runners which have been successfully registered to GitHub and still running.
-	// This corresponds to status.replicas of the runner replica set that has the desired template hash.
-	// +optional
-	UpdatedReplicas *int `json:"updatedReplicas"`
-
-	// DesiredReplicas is the total number of desired, non-terminated and latest pods to be set for the primary RunnerSet
-	// This doesn't include outdated pods while upgrading the deployment and replacing the runnerset.
-	// +optional
-	DesiredReplicas *int `json:"desiredReplicas"`
-
-	// Replicas is the total number of replicas
-	// +optional
-	Replicas *int `json:"replicas"`
-}
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +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
-// +kubebuilder:printcolumn:JSONPath=".status.availableReplicas",name=Available,type=number
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
-
-// RunnerSet is the Schema for the runnersets API
-type RunnerSet struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   RunnerSetSpec   `json:"spec,omitempty"`
-	Status RunnerSetStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// RunnerList contains a list of Runner
-type RunnerSetList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []RunnerSet `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&RunnerSet{}, &RunnerSetList{})
-}

api/v1alpha1/zz_generated.deepcopy.go

@@ -1,4 +1,3 @@
-//go:build !ignore_autogenerated
 // +build !ignore_autogenerated
 
 /*
@@ -23,108 +22,9 @@ package v1alpha1
 
 import (
 	"k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CacheEntry) DeepCopyInto(out *CacheEntry) {
-	*out = *in
-	in.ExpirationTime.DeepCopyInto(&out.ExpirationTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CacheEntry.
-func (in *CacheEntry) DeepCopy() *CacheEntry {
-	if in == nil {
-		return nil
-	}
-	out := new(CacheEntry)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CapacityReservation) DeepCopyInto(out *CapacityReservation) {
-	*out = *in
-	in.ExpirationTime.DeepCopyInto(&out.ExpirationTime)
-	in.EffectiveTime.DeepCopyInto(&out.EffectiveTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CapacityReservation.
-func (in *CapacityReservation) DeepCopy() *CapacityReservation {
-	if in == nil {
-		return nil
-	}
-	out := new(CapacityReservation)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CheckRunSpec) DeepCopyInto(out *CheckRunSpec) {
-	*out = *in
-	if in.Types != nil {
-		in, out := &in.Types, &out.Types
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Names != nil {
-		in, out := &in.Names, &out.Names
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Repositories != nil {
-		in, out := &in.Repositories, &out.Repositories
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CheckRunSpec.
-func (in *CheckRunSpec) DeepCopy() *CheckRunSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(CheckRunSpec)
-	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
-	if in.CheckRun != nil {
-		in, out := &in.CheckRun, &out.CheckRun
-		*out = new(CheckRunSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.PullRequest != nil {
-		in, out := &in.PullRequest, &out.PullRequest
-		*out = new(PullRequestSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Push != nil {
-		in, out := &in.Push, &out.Push
-		*out = new(PushSpec)
-		**out = **in
-	}
-	if in.WorkflowJob != nil {
-		in, out := &in.WorkflowJob, &out.WorkflowJob
-		*out = new(WorkflowJobSpec)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitHubEventScaleUpTriggerSpec.
-func (in *GitHubEventScaleUpTriggerSpec) DeepCopy() *GitHubEventScaleUpTriggerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(GitHubEventScaleUpTriggerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HorizontalRunnerAutoscaler) DeepCopyInto(out *HorizontalRunnerAutoscaler) {
 	*out = *in
@@ -210,27 +110,6 @@ func (in *HorizontalRunnerAutoscalerSpec) DeepCopyInto(out *HorizontalRunnerAuto
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.ScaleUpTriggers != nil {
-		in, out := &in.ScaleUpTriggers, &out.ScaleUpTriggers
-		*out = make([]ScaleUpTrigger, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.CapacityReservations != nil {
-		in, out := &in.CapacityReservations, &out.CapacityReservations
-		*out = make([]CapacityReservation, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ScheduledOverrides != nil {
-		in, out := &in.ScheduledOverrides, &out.ScheduledOverrides
-		*out = make([]ScheduledOverride, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HorizontalRunnerAutoscalerSpec.
@@ -255,18 +134,6 @@ func (in *HorizontalRunnerAutoscalerStatus) DeepCopyInto(out *HorizontalRunnerAu
 		in, out := &in.LastSuccessfulScaleOutTime, &out.LastSuccessfulScaleOutTime
 		*out = (*in).DeepCopy()
 	}
-	if in.CacheEntries != nil {
-		in, out := &in.CacheEntries, &out.CacheEntries
-		*out = make([]CacheEntry, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ScheduledOverridesSummary != nil {
-		in, out := &in.ScheduledOverridesSummary, &out.ScheduledOverridesSummary
-		*out = new(string)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HorizontalRunnerAutoscalerStatus.
@@ -299,62 +166,6 @@ func (in *MetricSpec) DeepCopy() *MetricSpec {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PullRequestSpec) DeepCopyInto(out *PullRequestSpec) {
-	*out = *in
-	if in.Types != nil {
-		in, out := &in.Types, &out.Types
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Branches != nil {
-		in, out := &in.Branches, &out.Branches
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PullRequestSpec.
-func (in *PullRequestSpec) DeepCopy() *PullRequestSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(PullRequestSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *PushSpec) DeepCopyInto(out *PushSpec) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PushSpec.
-func (in *PushSpec) DeepCopy() *PushSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(PushSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RecurrenceRule) DeepCopyInto(out *RecurrenceRule) {
-	*out = *in
-	in.UntilTime.DeepCopyInto(&out.UntilTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RecurrenceRule.
-func (in *RecurrenceRule) DeepCopy() *RecurrenceRule {
-	if in == nil {
-		return nil
-	}
-	out := new(RecurrenceRule)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Runner) DeepCopyInto(out *Runner) {
 	*out = *in
@@ -382,61 +193,6 @@ func (in *Runner) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RunnerConfig) DeepCopyInto(out *RunnerConfig) {
-	*out = *in
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.Ephemeral != nil {
-		in, out := &in.Ephemeral, &out.Ephemeral
-		*out = new(bool)
-		**out = **in
-	}
-	if in.DockerdWithinRunnerContainer != nil {
-		in, out := &in.DockerdWithinRunnerContainer, &out.DockerdWithinRunnerContainer
-		*out = new(bool)
-		**out = **in
-	}
-	if in.DockerEnabled != nil {
-		in, out := &in.DockerEnabled, &out.DockerEnabled
-		*out = new(bool)
-		**out = **in
-	}
-	if in.DockerMTU != nil {
-		in, out := &in.DockerMTU, &out.DockerMTU
-		*out = new(int64)
-		**out = **in
-	}
-	if in.DockerRegistryMirror != nil {
-		in, out := &in.DockerRegistryMirror, &out.DockerRegistryMirror
-		*out = new(string)
-		**out = **in
-	}
-	if in.VolumeSizeLimit != nil {
-		in, out := &in.VolumeSizeLimit, &out.VolumeSizeLimit
-		x := (*in).DeepCopy()
-		*out = &x
-	}
-	if in.VolumeStorageMedium != nil {
-		in, out := &in.VolumeStorageMedium, &out.VolumeStorageMedium
-		*out = new(string)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerConfig.
-func (in *RunnerConfig) DeepCopy() *RunnerConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(RunnerConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RunnerDeployment) DeepCopyInto(out *RunnerDeployment) {
 	*out = *in
@@ -504,15 +260,6 @@ func (in *RunnerDeploymentSpec) DeepCopyInto(out *RunnerDeploymentSpec) {
 		*out = new(int)
 		**out = **in
 	}
-	if in.EffectiveTime != nil {
-		in, out := &in.EffectiveTime, &out.EffectiveTime
-		*out = (*in).DeepCopy()
-	}
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = new(metav1.LabelSelector)
-		(*in).DeepCopyInto(*out)
-	}
 	in.Template.DeepCopyInto(&out.Template)
 }
 
@@ -529,26 +276,6 @@ func (in *RunnerDeploymentSpec) DeepCopy() *RunnerDeploymentSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RunnerDeploymentStatus) DeepCopyInto(out *RunnerDeploymentStatus) {
 	*out = *in
-	if in.AvailableReplicas != nil {
-		in, out := &in.AvailableReplicas, &out.AvailableReplicas
-		*out = new(int)
-		**out = **in
-	}
-	if in.ReadyReplicas != nil {
-		in, out := &in.ReadyReplicas, &out.ReadyReplicas
-		*out = new(int)
-		**out = **in
-	}
-	if in.UpdatedReplicas != nil {
-		in, out := &in.UpdatedReplicas, &out.UpdatedReplicas
-		*out = new(int)
-		**out = **in
-	}
-	if in.DesiredReplicas != nil {
-		in, out := &in.DesiredReplicas, &out.DesiredReplicas
-		*out = new(int)
-		**out = **in
-	}
 	if in.Replicas != nil {
 		in, out := &in.Replicas, &out.Replicas
 		*out = new(int)
@@ -598,168 +325,13 @@ func (in *RunnerList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RunnerPodSpec) DeepCopyInto(out *RunnerPodSpec) {
-	*out = *in
-	in.DockerdContainerResources.DeepCopyInto(&out.DockerdContainerResources)
-	if in.DockerVolumeMounts != nil {
-		in, out := &in.DockerVolumeMounts, &out.DockerVolumeMounts
-		*out = make([]v1.VolumeMount, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.DockerEnv != nil {
-		in, out := &in.DockerEnv, &out.DockerEnv
-		*out = make([]v1.EnvVar, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Containers != nil {
-		in, out := &in.Containers, &out.Containers
-		*out = make([]v1.Container, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Env != nil {
-		in, out := &in.Env, &out.Env
-		*out = make([]v1.EnvVar, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.EnvFrom != nil {
-		in, out := &in.EnvFrom, &out.EnvFrom
-		*out = make([]v1.EnvFromSource, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	in.Resources.DeepCopyInto(&out.Resources)
-	if in.VolumeMounts != nil {
-		in, out := &in.VolumeMounts, &out.VolumeMounts
-		*out = make([]v1.VolumeMount, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.Volumes != nil {
-		in, out := &in.Volumes, &out.Volumes
-		*out = make([]v1.Volume, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.EnableServiceLinks != nil {
-		in, out := &in.EnableServiceLinks, &out.EnableServiceLinks
-		*out = new(bool)
-		**out = **in
-	}
-	if in.InitContainers != nil {
-		in, out := &in.InitContainers, &out.InitContainers
-		*out = make([]v1.Container, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.NodeSelector != nil {
-		in, out := &in.NodeSelector, &out.NodeSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.AutomountServiceAccountToken != nil {
-		in, out := &in.AutomountServiceAccountToken, &out.AutomountServiceAccountToken
-		*out = new(bool)
-		**out = **in
-	}
-	if in.SidecarContainers != nil {
-		in, out := &in.SidecarContainers, &out.SidecarContainers
-		*out = make([]v1.Container, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.SecurityContext != nil {
-		in, out := &in.SecurityContext, &out.SecurityContext
-		*out = new(v1.PodSecurityContext)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ImagePullSecrets != nil {
-		in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
-		*out = make([]v1.LocalObjectReference, len(*in))
-		copy(*out, *in)
-	}
-	if in.Affinity != nil {
-		in, out := &in.Affinity, &out.Affinity
-		*out = new(v1.Affinity)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.Tolerations != nil {
-		in, out := &in.Tolerations, &out.Tolerations
-		*out = make([]v1.Toleration, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.TerminationGracePeriodSeconds != nil {
-		in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	}
-	if in.EphemeralContainers != nil {
-		in, out := &in.EphemeralContainers, &out.EphemeralContainers
-		*out = make([]v1.EphemeralContainer, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.HostAliases != nil {
-		in, out := &in.HostAliases, &out.HostAliases
-		*out = make([]v1.HostAlias, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.TopologySpreadConstraints != nil {
-		in, out := &in.TopologySpreadConstraints, &out.TopologySpreadConstraints
-		*out = make([]v1.TopologySpreadConstraint, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.RuntimeClassName != nil {
-		in, out := &in.RuntimeClassName, &out.RuntimeClassName
-		*out = new(string)
-		**out = **in
-	}
-	if in.DnsConfig != nil {
-		in, out := &in.DnsConfig, &out.DnsConfig
-		*out = new(v1.PodDNSConfig)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerPodSpec.
-func (in *RunnerPodSpec) DeepCopy() *RunnerPodSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(RunnerPodSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RunnerReplicaSet) DeepCopyInto(out *RunnerReplicaSet) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
+	out.Status = in.Status
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerReplicaSet.
@@ -820,15 +392,6 @@ func (in *RunnerReplicaSetSpec) DeepCopyInto(out *RunnerReplicaSetSpec) {
 		*out = new(int)
 		**out = **in
 	}
-	if in.EffectiveTime != nil {
-		in, out := &in.EffectiveTime, &out.EffectiveTime
-		*out = (*in).DeepCopy()
-	}
-	if in.Selector != nil {
-		in, out := &in.Selector, &out.Selector
-		*out = new(metav1.LabelSelector)
-		(*in).DeepCopyInto(*out)
-	}
 	in.Template.DeepCopyInto(&out.Template)
 }
 
@@ -845,21 +408,6 @@ func (in *RunnerReplicaSetSpec) DeepCopy() *RunnerReplicaSetSpec {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *RunnerReplicaSetStatus) DeepCopyInto(out *RunnerReplicaSetStatus) {
 	*out = *in
-	if in.Replicas != nil {
-		in, out := &in.Replicas, &out.Replicas
-		*out = new(int)
-		**out = **in
-	}
-	if in.ReadyReplicas != nil {
-		in, out := &in.ReadyReplicas, &out.ReadyReplicas
-		*out = new(int)
-		**out = **in
-	}
-	if in.AvailableReplicas != nil {
-		in, out := &in.AvailableReplicas, &out.AvailableReplicas
-		*out = new(int)
-		**out = **in
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerReplicaSetStatus.
@@ -873,130 +421,120 @@ func (in *RunnerReplicaSetStatus) DeepCopy() *RunnerReplicaSetStatus {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RunnerSet) DeepCopyInto(out *RunnerSet) {
+func (in *RunnerSpec) DeepCopyInto(out *RunnerSpec) {
 	*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 RunnerSet.
-func (in *RunnerSet) DeepCopy() *RunnerSet {
-	if in == nil {
-		return nil
+	if in.Labels != nil {
+		in, out := &in.Labels, &out.Labels
+		*out = make([]string, len(*in))
+		copy(*out, *in)
 	}
-	out := new(RunnerSet)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RunnerSet) 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 *RunnerSetList) DeepCopyInto(out *RunnerSetList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]RunnerSet, len(*in))
+	if in.Containers != nil {
+		in, out := &in.Containers, &out.Containers
+		*out = make([]v1.Container, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerSetList.
-func (in *RunnerSetList) DeepCopy() *RunnerSetList {
-	if in == nil {
-		return nil
+	in.DockerdContainerResources.DeepCopyInto(&out.DockerdContainerResources)
+	in.Resources.DeepCopyInto(&out.Resources)
+	if in.VolumeMounts != nil {
+		in, out := &in.VolumeMounts, &out.VolumeMounts
+		*out = make([]v1.VolumeMount, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
-	out := new(RunnerSetList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *RunnerSetList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
+	if in.EnvFrom != nil {
+		in, out := &in.EnvFrom, &out.EnvFrom
+		*out = make([]v1.EnvFromSource, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RunnerSetSpec) DeepCopyInto(out *RunnerSetSpec) {
-	*out = *in
-	in.RunnerConfig.DeepCopyInto(&out.RunnerConfig)
-	if in.EffectiveTime != nil {
-		in, out := &in.EffectiveTime, &out.EffectiveTime
-		*out = (*in).DeepCopy()
+	if in.Env != nil {
+		in, out := &in.Env, &out.Env
+		*out = make([]v1.EnvVar, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
-	in.StatefulSetSpec.DeepCopyInto(&out.StatefulSetSpec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerSetSpec.
-func (in *RunnerSetSpec) DeepCopy() *RunnerSetSpec {
-	if in == nil {
-		return nil
+	if in.Volumes != nil {
+		in, out := &in.Volumes, &out.Volumes
+		*out = make([]v1.Volume, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
 	}
-	out := new(RunnerSetSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RunnerSetStatus) DeepCopyInto(out *RunnerSetStatus) {
-	*out = *in
-	if in.CurrentReplicas != nil {
-		in, out := &in.CurrentReplicas, &out.CurrentReplicas
-		*out = new(int)
+	if in.InitContainers != nil {
+		in, out := &in.InitContainers, &out.InitContainers
+		*out = make([]v1.Container, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.SidecarContainers != nil {
+		in, out := &in.SidecarContainers, &out.SidecarContainers
+		*out = make([]v1.Container, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.NodeSelector != nil {
+		in, out := &in.NodeSelector, &out.NodeSelector
+		*out = make(map[string]string, len(*in))
+		for key, val := range *in {
+			(*out)[key] = val
+		}
+	}
+	if in.AutomountServiceAccountToken != nil {
+		in, out := &in.AutomountServiceAccountToken, &out.AutomountServiceAccountToken
+		*out = new(bool)
 		**out = **in
 	}
-	if in.ReadyReplicas != nil {
-		in, out := &in.ReadyReplicas, &out.ReadyReplicas
-		*out = new(int)
+	if in.SecurityContext != nil {
+		in, out := &in.SecurityContext, &out.SecurityContext
+		*out = new(v1.PodSecurityContext)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.ImagePullSecrets != nil {
+		in, out := &in.ImagePullSecrets, &out.ImagePullSecrets
+		*out = make([]v1.LocalObjectReference, len(*in))
+		copy(*out, *in)
+	}
+	if in.Affinity != nil {
+		in, out := &in.Affinity, &out.Affinity
+		*out = new(v1.Affinity)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Tolerations != nil {
+		in, out := &in.Tolerations, &out.Tolerations
+		*out = make([]v1.Toleration, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.EphemeralContainers != nil {
+		in, out := &in.EphemeralContainers, &out.EphemeralContainers
+		*out = make([]v1.EphemeralContainer, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	if in.TerminationGracePeriodSeconds != nil {
+		in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds
+		*out = new(int64)
 		**out = **in
 	}
-	if in.UpdatedReplicas != nil {
-		in, out := &in.UpdatedReplicas, &out.UpdatedReplicas
-		*out = new(int)
+	if in.DockerdWithinRunnerContainer != nil {
+		in, out := &in.DockerdWithinRunnerContainer, &out.DockerdWithinRunnerContainer
+		*out = new(bool)
 		**out = **in
 	}
-	if in.DesiredReplicas != nil {
-		in, out := &in.DesiredReplicas, &out.DesiredReplicas
-		*out = new(int)
+	if in.DockerEnabled != nil {
+		in, out := &in.DockerEnabled, &out.DockerEnabled
+		*out = new(bool)
 		**out = **in
 	}
-	if in.Replicas != nil {
-		in, out := &in.Replicas, &out.Replicas
-		*out = new(int)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerSetStatus.
-func (in *RunnerSetStatus) DeepCopy() *RunnerSetStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(RunnerSetStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RunnerSpec) DeepCopyInto(out *RunnerSpec) {
-	*out = *in
-	in.RunnerConfig.DeepCopyInto(&out.RunnerConfig)
-	in.RunnerPodSpec.DeepCopyInto(&out.RunnerPodSpec)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerSpec.
@@ -1013,10 +551,6 @@ func (in *RunnerSpec) DeepCopy() *RunnerSpec {
 func (in *RunnerStatus) DeepCopyInto(out *RunnerStatus) {
 	*out = *in
 	in.Registration.DeepCopyInto(&out.Registration)
-	if in.LastRegistrationCheckTime != nil {
-		in, out := &in.LastRegistrationCheckTime, &out.LastRegistrationCheckTime
-		*out = (*in).DeepCopy()
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RunnerStatus.
@@ -1081,62 +615,3 @@ func (in *ScaleTargetRef) DeepCopy() *ScaleTargetRef {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ScaleUpTrigger) DeepCopyInto(out *ScaleUpTrigger) {
-	*out = *in
-	if in.GitHubEvent != nil {
-		in, out := &in.GitHubEvent, &out.GitHubEvent
-		*out = new(GitHubEventScaleUpTriggerSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	out.Duration = in.Duration
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScaleUpTrigger.
-func (in *ScaleUpTrigger) DeepCopy() *ScaleUpTrigger {
-	if in == nil {
-		return nil
-	}
-	out := new(ScaleUpTrigger)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ScheduledOverride) DeepCopyInto(out *ScheduledOverride) {
-	*out = *in
-	in.StartTime.DeepCopyInto(&out.StartTime)
-	in.EndTime.DeepCopyInto(&out.EndTime)
-	if in.MinReplicas != nil {
-		in, out := &in.MinReplicas, &out.MinReplicas
-		*out = new(int)
-		**out = **in
-	}
-	in.RecurrenceRule.DeepCopyInto(&out.RecurrenceRule)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScheduledOverride.
-func (in *ScheduledOverride) DeepCopy() *ScheduledOverride {
-	if in == nil {
-		return nil
-	}
-	out := new(ScheduledOverride)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *WorkflowJobSpec) DeepCopyInto(out *WorkflowJobSpec) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new WorkflowJobSpec.
-func (in *WorkflowJobSpec) DeepCopy() *WorkflowJobSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(WorkflowJobSpec)
-	in.DeepCopyInto(out)
-	return out
-}

artifacthub-repo.yml

@@ -0,0 +1,4 @@
+repositoryID: 6e120248-b034-45e5-b16c-6015ecfa7c6c
+owners:
+- name: mumoshu
+  email: ykuoka@gmail.com

charts/.ci/ct-config.yaml

@@ -1,5 +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/.ci/lint-config.yaml

@@ -1,6 +0,0 @@
-rules:
-  # One blank line is OK
-  empty-lines: 
-    max-start: 1
-    max-end: 1
-    max: 1

charts/.ci/scripts/local-ct-lint.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run --rm -it -w /repo -v $(pwd):/repo quay.io/helmpack/chart-testing ct lint --all --config charts/.ci/ct-config.yaml

charts/.ci/scripts/local-kube-score.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-
-for chart in `ls charts`;
-do
-helm template --values charts/$chart/ci/ci-values.yaml charts/$chart | kube-score score - \
-    --ignore-test pod-networkpolicy \
-    --ignore-test deployment-has-poddisruptionbudget \
-    --ignore-test deployment-has-host-podantiaffinity \
-    --ignore-test pod-probes \
-    --ignore-test container-image-tag \
-    --enable-optional-test container-security-context-privileged \
-    --enable-optional-test container-security-context-readonlyrootfilesystem \
-    --ignore-test container-security-context
-done

charts/actions-runner-controller/.helmignore

@@ -21,5 +21,3 @@
 .idea/
 *.tmproj
 .vscode/
-# Docs
-docs/

charts/actions-runner-controller/Chart.yaml

@@ -15,16 +15,9 @@ 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.19.1
+version: 0.1.0
 
-# Used as the default manager tag value when no tag property is provided in the values.yaml
-appVersion: 0.24.1
-
-home: https://github.com/actions-runner-controller/actions-runner-controller
-
-sources:
-  - https://github.com/actions-runner-controller/actions-runner-controller
-
-maintainers:
-  - name: actions-runner-controller
-    url: https://github.com/actions-runner-controller
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: 0.11.2

charts/actions-runner-controller/README.md

@@ -1,111 +0,0 @@
-## Docs
-
-All additional docs are kept in the `docs/` folder, this README is solely for documenting the values.yaml keys and values
-
-## 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-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 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                                                                     |                                                                      |
-| `githubURL`                                              | Override GitHub URL to be used for GitHub API calls                                                                        |                                                                      |
-| `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                                                                              |                                                                      |
-| `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                                                                |
-| `authSecret.name`                                        | Set the name of the auth secret                                                                                            | controller-manager                                                   |
-| `authSecret.annotations`                                 | Set annotations for the auth Secret                                                                                        |                                                                      |
-| `authSecret.github_app_id`                               | The ID of your GitHub App. **This can't be set at the same time as `authSecret.github_token`**                             |                                                                      |
-| `authSecret.github_app_installation_id`                  | The ID of your GitHub App installation. **This can't be set at the same time as `authSecret.github_token`**                |                                                                      |
-| `authSecret.github_app_private_key`                      | The multiline string of your GitHub App's private key. **This can't be set at the same time as `authSecret.github_token`** |                                                                      |
-| `authSecret.github_token`                                | Your chosen GitHub PAT token. **This can't be set at the same time as the `authSecret.github_app_*`**                      |                                                                      |
-| `authSecret.github_basicauth_username`                     | Username for GitHub basic auth to use instead of PAT or GitHub APP in case it's running behind a proxy API                 |                                                                      |
-| `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                                                                |
-| `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`                                 | 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.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	                                                                                        |                                                                      |
-| `nameOverride`                                           | Override the resource name prefix	                                                                                        |                                                                      |
-| `serviceAccount.annotations`                              | Set annotations to the service account                                                                                     |                                                                      |
-| `serviceAccount.create`                                  | Deploy the controller pod under a service account                                                                          | true                                                                 |
-| `podAnnotations`                                         | Set annotations for the controller pod                                                                                     |                                                                      |
-| `podLabels`                                              | Set labels for the controller pod                                                                                          |                                                                      |
-| `serviceAccount.name`                                    | Set the name of the service account                                                                                        |                                                                      |
-| `securityContext`                                        | Set the security context for each container in the controller pod                                                          |                                                                      |
-| `podSecurityContext`                                     | Set the security context to controller pod                                                                                 |                                                                      |
-| `service.annotations`                                    | Set annotations for the provisioned webhook service resource                                                               |                                                                      |
-| `service.port`                                           | Set controller service ports                                                                                                |                                                                      |
-| `service.type`                                           | Set controller service type                                                                                               |                                                                      |
-| `topologySpreadConstraints`                              | Set the controller pod topologySpreadConstraints                                                                           |                                                                      |
-| `nodeSelector`                                           | Set the controller pod nodeSelector                                                                                        |                                                                      |
-| `resources`                                              | Set the controller pod resources                                                                                           |                                                                      |
-| `affinity`                                               | Set the controller pod affinity rules                                                                                      |                                                                      |
-| `podDisruptionBudget.enabled`                            | Enables a PDB to ensure HA of controller pods                                                                              |      false                                                           |
-| `podDisruptionBudget.minAvailable`                       | Minimum number of pods that must be available after eviction                                                               |                                                                      |
-| `podDisruptionBudget.maxUnavailable`                     | Maximum number of pods that can be unavailable after eviction. Kubernetes 1.7+ required.                                   |                                                                      |
-| `tolerations`                                            | Set the controller pod tolerations                                                                                         |                                                                      |
-| `env`                                                    | Set environment variables for the controller container                                                                     |                                                                      |
-| `priorityClassName`                                      | Set the controller pod priorityClassName                                                                                   |                                                                      |
-| `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                                                                 |
-| `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.replicaCount`                       | Set the number of webhook server pods                                                                                      | 1                                                                    |
-| `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.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                                                |
-| `githubWebhookServer.secret.github_webhook_secret_token` | Set the webhook secret token value                                                                                         |                                                                      |
-| `githubWebhookServer.imagePullSecrets`                   | Specifies the secret to be used when pulling the githubWebhookServer pod containers                                        |                                                                      |
-| `githubWebhookServer.nameOverride`                        | Override the resource name prefix	                                                                                        |                                                                      |
-| `githubWebhookServer.fullnameOverride`                    | Override the full resource names	                                                                                        |                                                                      |
-| `githubWebhookServer.serviceAccount.create`              | Deploy the githubWebhookServer under a service account                                                                     | true                                                                 |
-| `githubWebhookServer.serviceAccount.annotations`         | Set annotations for the service account                                                                                    |                                                                      |
-| `githubWebhookServer.serviceAccount.name`                | Set the service account name                                                                                               |                                                                      |
-| `githubWebhookServer.podAnnotations`                     | Set annotations for the githubWebhookServer pod                                                                            |                                                                      |
-| `githubWebhookServer.podLabels`                          | Set labels for the githubWebhookServer pod                                                                                 |                                                                      |
-| `githubWebhookServer.podSecurityContext`                 | Set the security context to githubWebhookServer pod                                                                        |                                                                      |
-| `githubWebhookServer.securityContext`                    | Set the security context for each container in the githubWebhookServer pod                                                 |                                                                      |
-| `githubWebhookServer.resources`                          | Set the githubWebhookServer pod resources                                                                                  |                                                                      |
-| `githubWebhookServer.topologySpreadConstraints`          | Set the githubWebhookServer pod topologySpreadConstraints                                                                  |                                                                      |
-| `githubWebhookServer.nodeSelector`                       | Set the githubWebhookServer pod nodeSelector                                                                               |                                                                      |
-| `githubWebhookServer.tolerations`                        | Set the githubWebhookServer pod tolerations                                                                                |                                                                      |
-| `githubWebhookServer.affinity`                           | Set the githubWebhookServer pod affinity rules                                                                             |                                                                      |
-| `githubWebhookServer.priorityClassName`                  | Set the githubWebhookServer pod priorityClassName                                                                          |                                                                      |
-| `githubWebhookServer.service.type`                       | Set githubWebhookServer service type                                                                                       |                                                                      |
-| `githubWebhookServer.service.ports`                      | Set githubWebhookServer service ports                                                                                      | `[{"port":80, "targetPort:"http", "protocol":"TCP", "name":"http"}]` |
-| `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": []}]`                     |
-| `githubWebhookServer.ingress.tls`                        | Set tls configuration for ingress                                                                                          |                                                                      |
-| `githubWebhookServer.ingress.ingressClassName`           | Set ingress class name                                                                                                     |                                                                      |
-| `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.                                   |                                                                      |

charts/actions-runner-controller/ci/ci-values.yaml

@@ -1,30 +0,0 @@
-# This file sets some opinionated values for kube-score to use
-# when parsing the chart
-image:
-  pullPolicy: Always
-
-podSecurityContext:
-  fsGroup: 2000
-
-securityContext: 
-  capabilities:
-    drop:
-    - ALL
-  readOnlyRootFilesystem: true
-  runAsNonRoot: true
-  runAsUser: 2000
-
-resources: 
-  limits:
-    cpu: 100m
-    memory: 128Mi
-  requests:
-    cpu: 100m
-    memory: 128Mi  
-
-authSecret:
-  create: false
-
-# Set the following to true to create a dummy secret, allowing the manager pod to start
-# This is only useful in CI
-createDummySecret: true

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

@@ -1,246 +1,133 @@
-apiVersion: apiextensions.k8s.io/v1
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: horizontalrunnerautoscalers.actions.summerwind.dev
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.minReplicas
+    name: Min
+    type: number
+  - JSONPath: .spec.maxReplicas
+    name: Max
+    type: number
+  - JSONPath: .status.desiredReplicas
+    name: Desired
+    type: number
   group: actions.summerwind.dev
   names:
     kind: HorizontalRunnerAutoscaler
     listKind: HorizontalRunnerAutoscalerList
     plural: horizontalrunnerautoscalers
-    shortNames:
-      - hra
     singular: horizontalrunnerautoscaler
   scope: Namespaced
-  versions:
-    - additionalPrinterColumns:
-        - jsonPath: .spec.minReplicas
-          name: Min
-          type: number
-        - jsonPath: .spec.maxReplicas
-          name: Max
-          type: number
-        - jsonPath: .status.desiredReplicas
-          name: Desired
-          type: number
-        - jsonPath: .status.scheduledOverridesSummary
-          name: Schedule
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: HorizontalRunnerAutoscaler is the Schema for the horizontalrunnerautoscaler
+        API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
-      name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: HorizontalRunnerAutoscaler is the Schema for the horizontalrunnerautoscaler API
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: HorizontalRunnerAutoscalerSpec defines the desired state of
+            HorizontalRunnerAutoscaler
           properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: HorizontalRunnerAutoscalerSpec defines the desired state of HorizontalRunnerAutoscaler
-              properties:
-                capacityReservations:
-                  items:
-                    description: CapacityReservation specifies the number of replicas temporarily added to the scale target until ExpirationTime.
-                    properties:
-                      effectiveTime:
-                        format: date-time
-                        type: string
-                      expirationTime:
-                        format: date-time
-                        type: string
-                      name:
-                        type: string
-                      replicas:
-                        type: integer
-                    type: object
-                  type: array
-                maxReplicas:
-                  description: MaxReplicas is the maximum number of replicas the deployment is allowed to scale
-                  type: integer
-                metrics:
-                  description: Metrics is the collection of various metric targets to calculate desired number of runners
-                  items:
-                    properties:
-                      repositoryNames:
-                        description: RepositoryNames is the list of repository names to be used for calculating the metric. For example, a repository name is the REPO part of `github.com/USER/REPO`.
-                        items:
-                          type: string
-                        type: array
-                      scaleDownAdjustment:
-                        description: ScaleDownAdjustment is the number of runners removed on scale-down. You can only specify either ScaleDownFactor or ScaleDownAdjustment.
-                        type: integer
-                      scaleDownFactor:
-                        description: ScaleDownFactor is the multiplicative factor applied to the current number of runners used to determine how many pods should be removed.
-                        type: string
-                      scaleDownThreshold:
-                        description: ScaleDownThreshold is the percentage of busy runners less than which will trigger the hpa to scale the runners down.
-                        type: string
-                      scaleUpAdjustment:
-                        description: ScaleUpAdjustment is the number of runners added on scale-up. You can only specify either ScaleUpFactor or ScaleUpAdjustment.
-                        type: integer
-                      scaleUpFactor:
-                        description: ScaleUpFactor is the multiplicative factor applied to the current number of runners used to determine how many pods should be added.
-                        type: string
-                      scaleUpThreshold:
-                        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. The only supported Type is TotalNumberOfQueuedAndInProgressWorkflowRuns
-                        type: string
-                    type: object
-                  type: array
-                minReplicas:
-                  description: MinReplicas is the minimum number of replicas the deployment is allowed to scale
-                  type: integer
-                scaleDownDelaySecondsAfterScaleOut:
-                  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 sis the reference to scaled resource like RunnerDeployment
-                  properties:
-                    kind:
-                      description: Kind is the type of resource being referenced
-                      enum:
-                        - RunnerDeployment
-                        - RunnerSet
+            maxReplicas:
+              description: MinReplicas is the maximum number of replicas the deployment
+                is allowed to scale
+              type: integer
+            metrics:
+              description: Metrics is the collection of various metric targets to
+                calculate desired number of runners
+              items:
+                properties:
+                  repositoryNames:
+                    description: RepositoryNames is the list of repository names to
+                      be used for calculating the metric. For example, a repository
+                      name is the REPO part of `github.com/USER/REPO`.
+                    items:
                       type: string
-                    name:
-                      description: Name is the name of resource being referenced
-                      type: string
-                  type: object
-                scaleUpTriggers:
-                  description: "ScaleUpTriggers is an experimental feature to increase the desired replicas by 1 on each webhook requested received by the webhookBasedAutoscaler. \n This feature requires you to also enable and deploy the webhookBasedAutoscaler onto your cluster. \n Note that the added runners remain until the next sync period at least, and they may or may not be used by GitHub Actions depending on the timing. They are intended to be used to gain \"resource slack\" immediately after you receive a webhook from GitHub, so that you can loosely expect MinReplicas runners to be always available."
-                  items:
-                    properties:
-                      amount:
-                        type: integer
-                      duration:
-                        type: string
-                      githubEvent:
-                        properties:
-                          checkRun:
-                            description: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#check_run
-                            properties:
-                              names:
-                                description: Names is a list of GitHub Actions glob patterns. Any check_run event whose name matches one of patterns in the list can trigger autoscaling. Note that check_run name seem to equal to the job name you've defined in your actions workflow yaml file. So it is very likely that you can utilize this to trigger depending on the job.
-                                items:
-                                  type: string
-                                type: array
-                              repositories:
-                                description: Repositories is a list of GitHub repositories. Any check_run event whose repository matches one of repositories in the list can trigger autoscaling.
-                                items:
-                                  type: string
-                                type: array
-                              status:
-                                type: string
-                              types:
-                                description: 'One of: created, rerequested, or completed'
-                                items:
-                                  type: string
-                                type: array
-                            type: object
-                          pullRequest:
-                            description: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request
-                            properties:
-                              branches:
-                                items:
-                                  type: string
-                                type: array
-                              types:
-                                items:
-                                  type: string
-                                type: array
-                            type: object
-                          push:
-                            description: PushSpec is the condition for triggering scale-up on push event Also see https://docs.github.com/en/actions/reference/events-that-trigger-workflows#push
-                            type: object
-                          workflowJob:
-                            description: https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_job
-                            type: object
-                        type: object
-                    type: object
-                  type: array
-                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 correspoding override happens every day, week, month, or year.
-                    properties:
-                      endTime:
-                        description: EndTime is the time at which the first override ends.
-                        format: date-time
-                        type: string
-                      minReplicas:
-                        description: MinReplicas is the number of runners while overriding. If omitted, it doesn't override minReplicas.
-                        minimum: 0
-                        nullable: true
-                        type: integer
-                      recurrenceRule:
-                        properties:
-                          frequency:
-                            description: Frequency is the name of a predefined interval of each recurrence. The valid values are "Daily", "Weekly", "Monthly", and "Yearly". If empty, the corresponding override happens only once.
-                            enum:
-                              - Daily
-                              - Weekly
-                              - Monthly
-                              - Yearly
-                            type: string
-                          untilTime:
-                            description: UntilTime is the time of the final recurrence. If empty, the schedule recurs forever.
-                            format: date-time
-                            type: string
-                        type: object
-                      startTime:
-                        description: StartTime is the time at which the first override starts.
-                        format: date-time
-                        type: string
-                    required:
-                      - endTime
-                      - startTime
-                    type: object
-                  type: array
-              type: object
-            status:
+                    type: array
+                  scaleDownFactor:
+                    description: ScaleDownFactor is the multiplicative factor applied
+                      to the current number of runners used to determine how many
+                      pods should be removed.
+                    type: string
+                  scaleDownThreshold:
+                    description: ScaleDownThreshold is the percentage of busy runners
+                      less than which will trigger the hpa to scale the runners down.
+                    type: string
+                  scaleUpFactor:
+                    description: ScaleUpFactor is the multiplicative factor applied
+                      to the current number of runners used to determine how many
+                      pods should be added.
+                    type: string
+                  scaleUpThreshold:
+                    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.
+                      The only supported Type is TotalNumberOfQueuedAndInProgressWorkflowRuns
+                    type: string
+                type: object
+              type: array
+            minReplicas:
+              description: MinReplicas is the minimum number of replicas the deployment
+                is allowed to scale
+              type: integer
+            scaleDownDelaySecondsAfterScaleOut:
+              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 sis the reference to scaled resource like
+                RunnerDeployment
               properties:
-                cacheEntries:
-                  items:
-                    properties:
-                      expirationTime:
-                        format: date-time
-                        type: string
-                      key:
-                        type: string
-                      value:
-                        type: integer
-                    type: object
-                  type: array
-                desiredReplicas:
-                  description: DesiredReplicas is the total number of desired, non-terminated and latest pods to be set for the primary RunnerSet This doesn't include outdated pods while upgrading the deployment and replacing the runnerset.
-                  type: integer
-                lastSuccessfulScaleOutTime:
-                  format: date-time
-                  nullable: true
-                  type: string
-                observedGeneration:
-                  description: ObservedGeneration is the most recent generation observed for the target. It corresponds to e.g. RunnerDeployment's generation, which is updated on mutation by the API Server.
-                  format: int64
-                  type: integer
-                scheduledOverridesSummary:
-                  description: ScheduledOverridesSummary is the summary of active and upcoming scheduled overrides to be shown in e.g. a column of a `kubectl get hra` output for observability.
+                name:
                   type: string
               type: object
           type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
-  preserveUnknownFields: false
+        status:
+          properties:
+            desiredReplicas:
+              description: DesiredReplicas is the total number of desired, non-terminated
+                and latest pods to be set for the primary RunnerSet This doesn't include
+                outdated pods while upgrading the deployment and replacing the runnerset.
+              type: integer
+            lastSuccessfulScaleOutTime:
+              format: date-time
+              type: string
+            observedGeneration:
+              description: ObservedGeneration is the most recent generation observed
+                for the target. It corresponds to e.g. RunnerDeployment's generation,
+                which is updated on mutation by the API Server.
+              format: int64
+              type: integer
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""

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

@@ -1,44 +0,0 @@
-## Upgrading
-
-This project makes extensive use of CRDs to provide much of its functionality. Helm unfortunately does not support [managing](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) CRDs by design:
-
-_The full breakdown as to how they came to this decision and why they have taken the approach they have for dealing with CRDs can be found in [Helm Improvement Proposal 11](https://github.com/helm/community/blob/main/hips/hip-0011.md)_
-
-```
-There is no support at this time for upgrading or deleting CRDs using Helm. This was an explicit decision after much 
-community discussion due to the danger for unintentional data loss. Furthermore, there is currently no community 
-consensus around how to handle CRDs and their lifecycle. As this evolves, Helm will add support for those use cases.
-```
-
-Helm will do an initial install of CRDs but it will not touch them afterwards (update or delete).
-
-Additionally, because the project leverages CRDs so extensively you **MUST** run the matching controller app container with its matching CRDs i.e. always redeploy your CRDs if you are changing the app version.
-
-Due to the above you can't just do a `helm upgrade` to release the latest version of the chart, the best practice steps are recorded below:
-
-## Steps
-
-1. Upgrade CRDs, this isn't optional, the CRDs you are using must be those that correspond with the version of the controller you are installing
-
-```shell
-# REMEMBER TO UPDATE THE CHART_VERSION TO RELEVANT CHART VERISON!!!!
-CHART_VERSION=0.18.0
-
-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/
-```
-
-2. Upgrade the Helm release
-
-```shell
-# helm repo [command]
-helm repo update
-
-# helm upgrade [RELEASE] [CHART] [flags]
-helm upgrade actions-runner-controller \
-  actions-runner-controller/actions-runner-controller \
-  --install \
-  --namespace actions-runner-system \
-  --version ${CHART_VERSION}
-```

charts/actions-runner-controller/templates/NOTES.txt

@@ -1,8 +1,8 @@
 1. Get the application URL by running these commands:
-{{- if .Values.githubWebhookServer.ingress.enabled }}
-{{- range $host := .Values.githubWebhookServer.ingress.hosts }}
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
-  http{{ if $.Values.githubWebhookServer.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}

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

@@ -1,64 +0,0 @@
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "actions-runner-controller-github-webhook-server.name" -}}
-{{- default .Chart.Name .Values.githubWebhookServer.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{- define "actions-runner-controller-github-webhook-server.instance" -}}
-{{- printf "%s-%s" .Release.Name "github-webhook-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-github-webhook-server.fullname" -}}
-{{- if .Values.githubWebhookServer.fullnameOverride }}
-{{- .Values.githubWebhookServer.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.githubWebhookServer.nameOverride }}
-{{- $instance := include "actions-runner-controller-github-webhook-server.instance" . }}
-{{- if contains $name $instance }}
-{{- $instance | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s-%s" .Release.Name $name "github-webhook-server" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "actions-runner-controller-github-webhook-server.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "actions-runner-controller-github-webhook-server.name" . }}
-app.kubernetes.io/instance: {{ include "actions-runner-controller-github-webhook-server.instance" . }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "actions-runner-controller-github-webhook-server.serviceAccountName" -}}
-{{- if .Values.githubWebhookServer.serviceAccount.create }}
-{{- default (include "actions-runner-controller-github-webhook-server.fullname" .) .Values.githubWebhookServer.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.githubWebhookServer.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{- define "actions-runner-controller-github-webhook-server.secretName" -}}
-{{- default (include "actions-runner-controller-github-webhook-server.fullname" .) .Values.githubWebhookServer.secret.name }}
-{{- end }}
-
-{{- define "actions-runner-controller-github-webhook-server.roleName" -}}
-{{- include "actions-runner-controller-github-webhook-server.fullname" . }}
-{{- end }}
-
-{{- define "actions-runner-controller-github-webhook-server.serviceMonitorName" -}}
-{{- include "actions-runner-controller-github-webhook-server.fullname" . | trunc 47 }}-service-monitor
-{{- end }}
-
-{{- define "actions-runner-controller-github-webhook-server.pdbName" -}}
-{{- include "actions-runner-controller-github-webhook-server.fullname" . | trunc 59 }}-pdb
-{{- end }}

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

@@ -64,14 +64,6 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
-{{- define "actions-runner-controller.secretName" -}}
-{{- default (include "actions-runner-controller.fullname" .) .Values.authSecret.name -}}
-{{- end }}
-
-{{- define "actions-runner-controller.githubWebhookServerSecretName" -}}
-{{- default (include "actions-runner-controller.fullname" .) .Values.githubWebhookServer.secret.name -}}
-{{- end }}
-
 {{- define "actions-runner-controller.leaderElectionRoleName" -}}
 {{- include "actions-runner-controller.fullname" . }}-leader-election
 {{- end }}
@@ -93,15 +85,11 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "actions-runner-controller.webhookServiceName" -}}
-{{- include "actions-runner-controller.fullname" . | trunc 55 }}-webhook
+{{- include "actions-runner-controller.fullname" . }}-webhook
 {{- end }}
 
-{{- define "actions-runner-controller.metricsServiceName" -}}
-{{- include "actions-runner-controller.fullname" . | trunc 47 }}-metrics-service
-{{- end }}
-
-{{- define "actions-runner-controller.serviceMonitorName" -}}
-{{- include "actions-runner-controller.fullname" . | trunc 47 }}-service-monitor
+{{- define "actions-runner-controller.authProxyServiceName" -}}
+{{- include "actions-runner-controller.fullname" . }}-controller-manager-metrics-service
 {{- end }}
 
 {{- define "actions-runner-controller.selfsignedIssuerName" -}}
@@ -111,7 +99,3 @@ Create the name of the service account to use
 {{- define "actions-runner-controller.servingCertName" -}}
 {{- include "actions-runner-controller.fullname" . }}-serving-cert
 {{- end }}
-
-{{- define "actions-runner-controller.pdbName" -}}
-{{- include "actions-runner-controller.fullname" . | trunc 59 }}-pdb
-{{- end }}

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

@@ -1,4 +1,3 @@
-{{- if .Values.metrics.proxy.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -12,4 +11,3 @@ rules:
   resources:
   - subjectaccessreviews
   verbs: ["create"]
-{{- end }}

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

@@ -1,4 +1,3 @@
-{{- if .Values.metrics.proxy.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -11,4 +10,3 @@ subjects:
 - kind: ServiceAccount
   name: {{ include "actions-runner-controller.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
-{{- end }}

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

@@ -0,0 +1,14 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    {{- include "actions-runner-controller.labels" . | nindent 4 }}
+  name: {{ include "actions-runner-controller.authProxyServiceName" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  ports:
+  - name: https
+    port: 8443
+    targetPort: https
+  selector:
+    {{- include "actions-runner-controller.selectorLabels" . | nindent 4 }}

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

@@ -1,4 +1,3 @@
-{{- if .Values.certManagerEnabled }}
 # The following manifests contain a self-signed issuer CR and a certificate CR.
 # More document can be found at https://docs.cert-manager.io
 # WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for breaking changes
@@ -6,7 +5,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ include "actions-runner-controller.selfsignedIssuerName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Namespace }}
 spec:
   selfSigned: {}
 ---
@@ -14,7 +13,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ include "actions-runner-controller.servingCertName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Namespace }}
 spec:
   dnsNames:
   - {{ include "actions-runner-controller.webhookServiceName" . }}.{{ .Release.Namespace }}.svc
@@ -22,5 +21,4 @@ spec:
   issuerRef:
     kind: Issuer
     name: {{ include "actions-runner-controller.selfsignedIssuerName" . }}
-  secretName: {{ include "actions-runner-controller.servingCertName" . }}
-{{- end }}
+  secretName: webhook-server-cert # this secret will not be prefixed, since it's not managed by kustomize

charts/actions-runner-controller/templates/ci-secret.yaml

@@ -1,14 +0,0 @@
-# This template only exists to facilitate CI testing of the chart, since
-# a secret is expected to be found in the namespace by the controller manager
-{{ if .Values.createDummySecret -}}
-apiVersion: v1
-data:
-  github_token: dGVzdA==
-kind: Secret
-metadata:
-  name: controller-manager
-  {{- if .Values.authSecret.annotations }}
-  annotations:
-    {{ toYaml .Values.authSecret.annotations | nindent 4 }}
-  {{- end }}
-{{- end }}

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

@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  name: {{ include "actions-runner-controller.metricsServiceName" . }}
-  namespace: {{ .Release.Namespace }}
-  {{- with .Values.metrics.serviceAnnotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  ports:
-  - name: metrics-port
-    port: {{ .Values.metrics.port }}
-    targetPort: metrics-port
-  selector:
-    {{- include "actions-runner-controller.selectorLabels" . | nindent 4 }}

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

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

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

@@ -1,19 +0,0 @@
-{{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  name: {{ include "actions-runner-controller.pdbName" . }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  {{- if .Values.podDisruptionBudget.minAvailable }}
-  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
-  {{- end  }}
-  {{- if .Values.podDisruptionBudget.maxUnavailable }}
-  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
-  {{- end  }}
-  selector:
-    matchLabels:
-      {{- include "actions-runner-controller.selectorLabels" . | nindent 6 }}
-{{- end -}}

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

@@ -6,7 +6,6 @@ metadata:
   labels:
     {{- include "actions-runner-controller.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       {{- include "actions-runner-controller.selectorLabels" . | nindent 6 }}
@@ -14,14 +13,10 @@ spec:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
-        kubectl.kubernetes.io/default-logs-container: "manager"
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
         {{- include "actions-runner-controller.selectorLabels" . | nindent 8 }}
-      {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -35,156 +30,68 @@ spec:
       {{- end }}
       containers:
       - args:
-        {{- $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 }}"
-        {{- if .Values.enableLeaderElection }}
+        - "--metrics-addr=127.0.0.1:8080"
         - "--enable-leader-election"
-        {{- end }}
-        {{- if .Values.leaderElectionId }}
-        - "--leader-election-id={{ .Values.leaderElectionId }}"
-        {{- end }}
-        - "--port={{ .Values.webhookPort }}"
         - "--sync-period={{ .Values.syncPeriod }}"
-        - "--default-scale-down-delay={{ .Values.defaultScaleDownDelay }}"
         - "--docker-image={{ .Values.image.dindSidecarRepositoryAndTag }}"
-        - "--runner-image={{ .Values.image.actionsRunnerRepositoryAndTag }}"
-        {{- range .Values.image.actionsRunnerImagePullSecrets }}
-        - "--runner-image-pull-secret={{ . }}"
-        {{- end }}
-        {{- if .Values.dockerRegistryMirror }}
-        - "--docker-registry-mirror={{ .Values.dockerRegistryMirror }}"
-        {{- end }}
-        {{- 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 }}
         command:
         - "/manager"
         env:
-        {{- 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.authSecret.enabled }}
         - name: GITHUB_TOKEN
           valueFrom:
             secretKeyRef:
               key: github_token
-              name: {{ include "actions-runner-controller.secretName" . }}
+              name: controller-manager
               optional: true
         - name: GITHUB_APP_ID
           valueFrom:
             secretKeyRef:
               key: github_app_id
-              name: {{ include "actions-runner-controller.secretName" . }}
+              name: controller-manager
               optional: true
         - name: GITHUB_APP_INSTALLATION_ID
           valueFrom:
             secretKeyRef:
               key: github_app_installation_id
-              name: {{ include "actions-runner-controller.secretName" . }}
+              name: controller-manager
               optional: true
         - name: GITHUB_APP_PRIVATE_KEY
-          valueFrom:
-            secretKeyRef:
-              key: github_app_private_key
-              name: {{ include "actions-runner-controller.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 }}
-        {{- range $key, $val := .Values.env }}
-        - name: {{ $key }}
-          value: {{ $val | quote }}
-        {{- end }}
+          value: /etc/actions-runner-controller/github_app_private_key
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (cat "v" .Chart.AppVersion | replace " " "") }}"
         name: manager
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
-        - containerPort: {{ .Values.webhookPort }}
+        - containerPort: 9443
           name: webhook-server
           protocol: TCP
-        {{- if not .Values.metrics.proxy.enabled }}
-        - containerPort: {{ .Values.metrics.port }}
-          name: metrics-port
-          protocol: TCP
-        {{- end }}
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
         volumeMounts:
-        {{- if .Values.authSecret.enabled }}
         - mountPath: "/etc/actions-runner-controller"
-          name: secret
+          name: controller-manager
           readOnly: true
-        {{- end }}
-        - mountPath: /tmp
-          name: tmp
         - mountPath: /tmp/k8s-webhook-server/serving-certs
           name: cert
           readOnly: true
-        {{- if .Values.additionalVolumeMounts }}
-          {{- toYaml .Values.additionalVolumeMounts | nindent 8 }} 
-        {{- end }}
-      {{- if .Values.metrics.proxy.enabled }}
       - args:
-        - "--secure-listen-address=0.0.0.0:{{ .Values.metrics.port }}"
+        - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"
         - "--logtostderr=true"
         - "--v=10"
-        image: "{{ .Values.metrics.proxy.image.repository }}:{{ .Values.metrics.proxy.image.tag }}"
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
         name: kube-rbac-proxy
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
-        - containerPort: {{ .Values.metrics.port }}
-          name: metrics-port
-        resources:
-          {{- toYaml .Values.resources | nindent 12 }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-      {{- end }}
+        - containerPort: 8443
+          name: https
       terminationGracePeriodSeconds: 10
       volumes:
-      {{- if .Values.authSecret.enabled }}
-      - name: secret
+      - name: controller-manager
         secret:
-          secretName: {{ include "actions-runner-controller.secretName" . }}
-      {{- end }}
+          secretName: controller-manager
       - name: cert
         secret:
           defaultMode: 420
-          secretName: {{ include "actions-runner-controller.servingCertName" . }}
-      - name: tmp
-        emptyDir: {}
-      {{- if .Values.additionalVolumes }}
-        {{- toYaml .Values.additionalVolumes | nindent 6}}
-      {{- end }}
+          secretName: webhook-server-cert
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -197,10 +104,3 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.hostNetwork }}
-      hostNetwork: {{ .Values.hostNetwork }}
-      {{- end }}

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

@@ -1,163 +0,0 @@
-{{- if .Values.githubWebhookServer.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "actions-runner-controller-github-webhook-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.githubWebhookServer.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.githubWebhookServer.podAnnotations }}
-      annotations:
-        kubectl.kubernetes.io/default-logs-container: "github-webhook-server"
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 8 }}
-      {{- with .Values.githubWebhookServer.podLabels }}
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-    spec:
-      {{- with .Values.githubWebhookServer.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "actions-runner-controller-github-webhook-server.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.githubWebhookServer.podSecurityContext | nindent 8 }}
-      {{- with .Values.githubWebhookServer.priorityClassName }}
-      priorityClassName: "{{ . }}"
-      {{- end }}
-      containers:
-      - args:
-        {{- $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 }}
-        {{- if .Values.scope.singleNamespace }}
-        - "--watch-namespace={{ default .Release.Namespace .Values.scope.watchNamespace }}"
-        {{- end }}
-        {{- if .Values.runnerGithubURL  }}
-        - "--runner-github-url={{ .Values.runnerGithubURL }}"
-        {{- end }}
-        command:
-        - "/github-webhook-server"
-        env:
-        - name: GITHUB_WEBHOOK_SECRET_TOKEN
-          valueFrom:
-            secretKeyRef:
-              key: github_webhook_secret_token
-              name: {{ include "actions-runner-controller-github-webhook-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 and .Values.githubWebhookServer.useRunnerGroupsVisibility .Values.githubWebhookServer.secret.enabled }}
-        - name: GITHUB_TOKEN
-          valueFrom:
-            secretKeyRef:
-              key: github_token
-              name: {{ include "actions-runner-controller.githubWebhookServerSecretName" . }}
-              optional: true
-        - name: GITHUB_APP_ID
-          valueFrom:
-            secretKeyRef:
-              key: github_app_id
-              name: {{ include "actions-runner-controller.githubWebhookServerSecretName" . }}
-              optional: true
-        - name: GITHUB_APP_INSTALLATION_ID
-          valueFrom:
-            secretKeyRef:
-              key: github_app_installation_id
-              name: {{ include "actions-runner-controller.githubWebhookServerSecretName" . }}
-              optional: true
-        - name: GITHUB_APP_PRIVATE_KEY
-          valueFrom:
-            secretKeyRef:
-              key: github_app_private_key
-              name: {{ include "actions-runner-controller.githubWebhookServerSecretName" . }}
-              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 }}
-        {{- range $key, $val := .Values.githubWebhookServer.env }}
-        - name: {{ $key }}
-          value: {{ $val | quote }}
-        {{- end }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag  | default (cat "v" .Chart.AppVersion | replace " " "") }}"
-        name: github-webhook-server
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        ports:
-        - containerPort: 8000
-          name: http
-          protocol: TCP
-        {{- if not .Values.metrics.proxy.enabled }}
-        - containerPort: {{ .Values.metrics.port }}
-          name: metrics-port
-          protocol: TCP
-        {{- end }}
-        resources:
-          {{- toYaml .Values.githubWebhookServer.resources | nindent 12 }}
-        securityContext:
-          {{- toYaml .Values.githubWebhookServer.securityContext | nindent 12 }}
-      {{- if .Values.metrics.proxy.enabled }}
-      - args:
-        - "--secure-listen-address=0.0.0.0:{{ .Values.metrics.port }}"
-        - "--upstream=http://127.0.0.1:8080/"
-        - "--logtostderr=true"
-        - "--v=10"
-        image: "{{ .Values.metrics.proxy.image.repository }}:{{ .Values.metrics.proxy.image.tag }}"
-        name: kube-rbac-proxy
-        imagePullPolicy: {{ .Values.image.pullPolicy }}
-        ports:
-        - containerPort: {{ .Values.metrics.port }}
-          name: metrics-port
-        resources:
-          {{- toYaml .Values.resources | nindent 12 }}
-        securityContext:
-          {{- toYaml .Values.securityContext | nindent 12 }}
-      {{- end }}
-      terminationGracePeriodSeconds: 10
-      {{- with .Values.githubWebhookServer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.githubWebhookServer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.githubWebhookServer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.githubWebhookServer.topologySpreadConstraints }}
-      topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}

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

@@ -1,60 +0,0 @@
-{{- 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" }}
-apiVersion: networking.k8s.io/v1
-{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  {{- with .Values.githubWebhookServer.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.githubWebhookServer.ingress.tls }}
-  tls:
-    {{- range .Values.githubWebhookServer.ingress.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
-  {{- with .Values.githubWebhookServer.ingress.ingressClassName }}
-  ingressClassName: {{ . }}
-  {{- end }}
-  rules:
-    {{- range .Values.githubWebhookServer.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-          {{- if .extraPaths }}
-          {{- toYaml .extraPaths | nindent 10 }}
-          {{- end }}
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-            pathType: {{ .pathType }}
-            {{- end }}
-            backend:
-              {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }}
-              service:
-               name: {{ $fullName }}
-               port:
-                 number: {{ $svcPort }}
-              {{- else }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- end }}
-          {{- end }}
-    {{- end }}
-  {{- end }}

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

@@ -1,19 +0,0 @@
-{{- if .Values.githubWebhookServer.podDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
-kind: PodDisruptionBudget
-metadata:
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  name: {{ include "actions-runner-controller-github-webhook-server.pdbName" . }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  {{- if .Values.githubWebhookServer.podDisruptionBudget.minAvailable }}
-  minAvailable: {{ .Values.githubWebhookServer.podDisruptionBudget.minAvailable }}
-  {{- end  }}
-  {{- if .Values.githubWebhookServer.podDisruptionBudget.maxUnavailable }}
-  maxUnavailable: {{ .Values.githubWebhookServer.podDisruptionBudget.maxUnavailable }}
-  {{- end  }}
-  selector:
-    matchLabels:
-      {{- include "actions-runner-controller-github-webhook-server.selectorLabels" . | nindent 6 }}
-{{- end -}}

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

@@ -1,90 +0,0 @@
-{{- if .Values.githubWebhookServer.enabled }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  creationTimestamp: null
-  name: {{ include "actions-runner-controller-github-webhook-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/githubwebhook.role_binding.yaml

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

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

@@ -1,16 +0,0 @@
-{{- if .Values.githubWebhookServer.enabled }}
-{{- if .Values.githubWebhookServer.secret.create }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "actions-runner-controller-github-webhook-server.secretName" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-type: Opaque
-data:
-{{- if .Values.githubWebhookServer.secret.github_webhook_secret_token }}
-  github_webhook_secret_token: {{ .Values.githubWebhookServer.secret.github_webhook_secret_token | toString | b64enc }}
-{{- end }}
-{{- end }}
-{{- end }}

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

@@ -1,26 +0,0 @@
-{{- if .Values.githubWebhookServer.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "actions-runner-controller-github-webhook-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "actions-runner-controller.labels" . | nindent 4 }}
-{{- if .Values.githubWebhookServer.service.annotations }}
-  annotations:
-    {{ toYaml .Values.githubWebhookServer.service.annotations | nindent 4 }}
-{{- end }}
-spec:
-  type: {{ .Values.githubWebhookServer.service.type }}
-  ports:
-    {{ range $_, $port := .Values.githubWebhookServer.service.ports -}}
-    - {{ $port | toYaml | nindent 6 }}
-    {{- end }}
-    {{- 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 }}
-{{- end }}

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

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

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

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

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

@@ -132,62 +132,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnersets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnersets/finalizers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.summerwind.dev
-  resources:
-  - runnersets/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - "apps"
-  resources:
-  - statefulsets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - "apps"
-  resources:
-  - statefulsets/finalizers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -195,37 +139,6 @@ rules:
   verbs:
   - create
   - patch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumeclaims
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - persistentvolumes
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-  - get
-  - list
-  - update
 - apiGroups:
   - ""
   resources:

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

@@ -1,32 +1,14 @@
-{{- if .Values.authSecret.create }}
+{{- if or .Values.authSecret.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "actions-runner-controller.secretName" . }}
+  name: controller-manager
   namespace: {{ .Release.Namespace }}
-  {{- if .Values.authSecret.annotations }}
-  annotations:
-    {{ toYaml .Values.authSecret.annotations | nindent 4 }}
-  {{- end }}
   labels:
     {{- include "actions-runner-controller.labels" . | nindent 4 }}
 type: Opaque
 data:
-{{- if .Values.authSecret.github_app_id }}
-  # Keep this as a string as strings integrate better with things like AWS Parameter Store, see PR #882 for an example
-  github_app_id: {{ .Values.authSecret.github_app_id | toString | b64enc }}
-{{- end }}
-{{- if .Values.authSecret.github_app_installation_id }}
-  # Keep this as a string as strings integrate better with things like AWS Parameter Store, see PR #882 for an example
-  github_app_installation_id: {{ .Values.authSecret.github_app_installation_id | toString | b64enc }}
-{{- end }}
-{{- if .Values.authSecret.github_app_private_key }}
-  github_app_private_key: {{ .Values.authSecret.github_app_private_key | toString | b64enc }}
-{{- end }}
-{{- if .Values.authSecret.github_token }}
-  github_token: {{ .Values.authSecret.github_token | toString | b64enc }}
-{{- end }}
-{{- if .Values.authSecret.github_basicauth_password }}
-  github_basicauth_password: {{ .Values.authSecret.github_basicauth_password | toString | b64enc }}
-{{- end }}
-{{- end }}
+{{- range $k, $v := .Values.authSecret }}
+  {{ $k }}: {{ $v | toString | b64enc }}
+{{- end }} 
+{{- end }}

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

@@ -1,26 +1,15 @@
 
 ---
-apiVersion: admissionregistration.k8s.io/v1
+apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
   creationTimestamp: null
   name: {{ include "actions-runner-controller.fullname" . }}-mutating-webhook-configuration
-  {{- if .Values.certManagerEnabled }}
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "actions-runner-controller.servingCertName" . }}
-  {{- end }}
 webhooks:
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ quote .Values.admissionWebHooks.caBundle }}
-    {{- end }}
+- clientConfig:
+    caBundle: Cg==
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
       namespace: {{ .Release.Namespace }}
@@ -37,18 +26,8 @@ webhooks:
     - UPDATE
     resources:
     - runners
-  sideEffects: None
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ .Values.admissionWebHooks.caBundle }}
-    {{- end }}
+- clientConfig:
+    caBundle: Cg==
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
       namespace: {{ .Release.Namespace }}
@@ -65,18 +44,8 @@ webhooks:
     - UPDATE
     resources:
     - runnerdeployments
-  sideEffects: None
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ .Values.admissionWebHooks.caBundle }}
-    {{- end }}
+- clientConfig:
+    caBundle: Cg==
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
       namespace: {{ .Release.Namespace }}
@@ -93,59 +62,18 @@ webhooks:
     - UPDATE
     resources:
     - runnerreplicasets
-  sideEffects: None
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ .Values.admissionWebHooks.caBundle }}
-    {{- end }}
-    service:
-      name: {{ include "actions-runner-controller.webhookServiceName" . }}
-      namespace: {{ .Release.Namespace }}
-      path: /mutate-runner-set-pod
-  failurePolicy: Fail
-  name: mutate-runner-pod.webhook.actions.summerwind.dev
-  rules:
-  - apiGroups:
-    - ""
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    resources:
-    - pods
-  sideEffects: None
-  objectSelector:
-    matchLabels:
-      "actions-runner-controller/inject-registration-token": "true"
+
 ---
-apiVersion: admissionregistration.k8s.io/v1
+apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
   creationTimestamp: null
   name: {{ include "actions-runner-controller.fullname" . }}-validating-webhook-configuration
-  {{- if .Values.certManagerEnabled }}
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "actions-runner-controller.servingCertName" . }}
-  {{- end }}
 webhooks:
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ .Values.admissionWebHooks.caBundle }}
-    {{- end }}
+- clientConfig:
+    caBundle: Cg==
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
       namespace: {{ .Release.Namespace }}
@@ -162,18 +90,8 @@ webhooks:
     - UPDATE
     resources:
     - runners
-  sideEffects: None
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ .Values.admissionWebHooks.caBundle }}
-    {{- end }}
+- clientConfig:
+    caBundle: Cg==
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
       namespace: {{ .Release.Namespace }}
@@ -190,18 +108,8 @@ webhooks:
     - UPDATE
     resources:
     - runnerdeployments
-  sideEffects: None
-- admissionReviewVersions:
-  - v1beta1
-  {{- if .Values.scope.singleNamespace }}
-  namespaceSelector:
-    matchLabels:
-      name: {{ default .Release.Namespace .Values.scope.watchNamespace }}
-  {{- end }}
-  clientConfig:
-    {{- if .Values.admissionWebHooks.caBundle }}
-    caBundle: {{ .Values.admissionWebHooks.caBundle }}
-    {{- end }}
+- clientConfig:
+    caBundle: Cg==
     service:
       name: {{ include "actions-runner-controller.webhookServiceName" . }}
       namespace: {{ .Release.Namespace }}
@@ -218,4 +126,3 @@ webhooks:
     - UPDATE
     resources:
     - runnerreplicasets
-  sideEffects: None

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

@@ -5,15 +5,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "actions-runner-controller.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
     - port: 443
-      targetPort: {{ .Values.webhookPort }}
+      targetPort: 9443
       protocol: TCP
       name: https
   selector:

charts/actions-runner-controller/values.yaml

@@ -6,62 +6,25 @@ labels: {}
 
 replicaCount: 1
 
-webhookPort: 9443
-syncPeriod: 1m
-defaultScaleDownDelay: 10m
-
-enableLeaderElection: true
-# Specifies the controller id for leader election.
-# 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
-
-# Override GitHub URLs in case of using proxy APIs
-#githubURL: ""
-#githubUploadURL: ""
-#runnerGithubURL: ""
+syncPeriod: 10m
 
 # Only 1 authentication method can be deployed at a time
 # Uncomment the configuration you are applying and fill in the details
-#
-# If authSecret.enabled=true these values are inherited to actions-runner-controller's controller-manager container's env.
-#
-# 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-runner-controller/actions-runner-controller/pull/937 for more details.
 authSecret:
-  enabled: true
-  create: false
-  name: "controller-manager"
-  annotations: {}
+  enabled: false
   ### 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: ""
-  ### Basic auth for github API proxy
-  #github_basicauth_username: ""
-  #github_basicauth_password: ""
 
-dockerRegistryMirror: ""
 image:
-  repository: "summerwind/actions-runner-controller"
-  actionsRunnerRepositoryAndTag: "summerwind/actions-runner:latest"
+  repository: summerwind/actions-runner-controller
+  # Overrides the manager image tag whose default is the chart appVersion if the tag key is commented out
+  tag: "latest"
   dindSidecarRepositoryAndTag: "docker:dind"
   pullPolicy: IfNotPresent
-  # The default image-pull secrets name for self-hosted runner container.
-  # It's added to spec.ImagePullSecrets of self-hosted runner pods.
-  actionsRunnerImagePullSecrets: []
 
 imagePullSecrets: []
 nameOverride: ""
@@ -78,14 +41,10 @@ serviceAccount:
 
 podAnnotations: {}
 
-podLabels: {}
-
-podSecurityContext:
-  {}
+podSecurityContext: {}
   # fsGroup: 2000
 
-securityContext:
-  {}
+securityContext: {}
   # capabilities:
   #   drop:
   #   - ALL
@@ -93,26 +52,24 @@ securityContext:
   # runAsNonRoot: true
   # runAsUser: 1000
 
-# Webhook service resource
 service:
   type: ClusterIP
   port: 443
+
+ingress:
+  enabled: false
   annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
 
-# Metrics service resource
-metrics:
-  serviceAnnotations: {}
-  serviceMonitor: false
-  serviceMonitorLabels: {}
-  port: 8443
-  proxy:
-    enabled: true
-    image:
-      repository: quay.io/brancz/kube-rbac-proxy
-      tag: v0.12.0
-
-resources:
-  {}
+resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -124,127 +81,20 @@ resources:
   #   cpu: 100m
   #   memory: 128Mi
 
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
 nodeSelector: {}
 
 tolerations: []
 
 affinity: {}
 
-# Only one of minAvailable or maxUnavailable can be set
-podDisruptionBudget:
-  enabled: false
-  # minAvailable: 1
-  # maxUnavailable: 3
-
 # Leverage a PriorityClass to ensure your pods survive resource shortages
 # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
 # PriorityClass: system-cluster-critical
 priorityClassName: ""
-
-env:
-  {}
-  # http_proxy: "proxy.com:8080"
-  # https_proxy: "proxy.com:8080"
-  # no_proxy: ""
-
-## 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
-additionalVolumes: []
-
-## specify where the additional volumes are mounted in the manager container
-additionalVolumeMounts: []
-
-scope:
-  # If true, the controller will only watch custom resources in a single namespace
-  singleNamespace: false
-  # If `scope.singleNamespace=true`, the controller will only watch custom resources in this namespace
-  # The default value is "", which means the namespace of the controller
-  watchNamespace: ""
-
-certManagerEnabled: true
-
-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-runner-controller/actions-runner-controller/issues/1005#issuecomment-993097155
-#hostNetwork: true
-
-githubWebhookServer:
-  enabled: false
-  replicaCount: 1
-  syncPeriod: 10m
-  useRunnerGroupsVisibility: false
-  secret:
-    enabled: false
-    create: false
-    name: "github-webhook-server"
-    ### GitHub Webhook Configuration
-    github_webhook_secret_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
-  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
-
-  # Only one of minAvailable or maxUnavailable can be set
-  podDisruptionBudget:
-    enabled: false
-    # minAvailable: 1
-    # maxUnavailable: 3

cmd/githubwebhookserver/main.go

@@ -1,222 +0,0 @@
-/*
-Copyright 2021 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 main
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"net/http"
-	"os"
-	"sync"
-	"time"
-
-	actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
-	"github.com/actions-runner-controller/actions-runner-controller/controllers"
-	"github.com/actions-runner-controller/actions-runner-controller/github"
-	"github.com/actions-runner-controller/actions-runner-controller/logging"
-	"github.com/kelseyhightower/envconfig"
-	"k8s.io/apimachinery/pkg/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	_ "k8s.io/client-go/plugin/pkg/client/auth/exec"
-	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
-	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
-	ctrl "sigs.k8s.io/controller-runtime"
-	// +kubebuilder:scaffold:imports
-)
-
-var (
-	scheme   = runtime.NewScheme()
-	setupLog = ctrl.Log.WithName("setup")
-)
-
-const (
-	webhookSecretTokenEnvName = "GITHUB_WEBHOOK_SECRET_TOKEN"
-)
-
-func init() {
-	_ = clientgoscheme.AddToScheme(scheme)
-
-	_ = actionsv1alpha1.AddToScheme(scheme)
-	// +kubebuilder:scaffold:scheme
-}
-
-func main() {
-	var (
-		err error
-
-		webhookAddr string
-		metricsAddr string
-
-		// The secret token of the GitHub Webhook. See https://docs.github.com/en/developers/webhooks-and-events/securing-your-webhooks
-		webhookSecretToken    string
-		webhookSecretTokenEnv string
-
-		watchNamespace string
-
-		enableLeaderElection bool
-		syncPeriod           time.Duration
-		logLevel             string
-
-		ghClient *github.Client
-	)
-
-	var c github.Config
-	err = envconfig.Process("github", &c)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error: processing environment variables: %v\n", err)
-		os.Exit(1)
-	}
-
-	webhookSecretTokenEnv = os.Getenv(webhookSecretTokenEnvName)
-
-	flag.StringVar(&webhookAddr, "webhook-addr", ":8000", "The address the metric endpoint binds to.")
-	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
-	flag.StringVar(&watchNamespace, "watch-namespace", "", "The namespace to watch for HorizontalRunnerAutoscaler's to scale on Webhook. Set to empty for letting it watch for all namespaces.")
-	flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
-		"Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager.")
-	flag.DurationVar(&syncPeriod, "sync-period", 10*time.Minute, "Determines the minimum frequency at which K8s resources managed by this controller are reconciled. When you use autoscaling, set to a lower value like 10 minute, because this corresponds to the minimum time to react on demand change")
-	flag.StringVar(&logLevel, "log-level", logging.LogLevelDebug, `The verbosity of the logging. Valid values are "debug", "info", "warn", "error". Defaults to "debug".`)
-	flag.StringVar(&webhookSecretToken, "github-webhook-secret-token", "", "The personal access token of GitHub.")
-	flag.StringVar(&c.Token, "github-token", c.Token, "The personal access token of GitHub.")
-	flag.Int64Var(&c.AppID, "github-app-id", c.AppID, "The application ID of GitHub App.")
-	flag.Int64Var(&c.AppInstallationID, "github-app-installation-id", c.AppInstallationID, "The installation ID of GitHub App.")
-	flag.StringVar(&c.AppPrivateKey, "github-app-private-key", c.AppPrivateKey, "The path of a private key file to authenticate as a GitHub App")
-	flag.StringVar(&c.URL, "github-url", c.URL, "GitHub URL to be used for GitHub API calls")
-	flag.StringVar(&c.UploadURL, "github-upload-url", c.UploadURL, "GitHub Upload URL to be used for GitHub API calls")
-	flag.StringVar(&c.BasicauthUsername, "github-basicauth-username", c.BasicauthUsername, "Username for GitHub basic auth to use instead of PAT or GitHub APP in case it's running behind a proxy API")
-	flag.StringVar(&c.BasicauthPassword, "github-basicauth-password", c.BasicauthPassword, "Password for GitHub basic auth to use instead of PAT or GitHub APP in case it's running behind a proxy API")
-	flag.StringVar(&c.RunnerGitHubURL, "runner-github-url", c.RunnerGitHubURL, "GitHub URL to be used by runners during registration")
-
-	flag.Parse()
-
-	if webhookSecretToken == "" && webhookSecretTokenEnv != "" {
-		setupLog.Info(fmt.Sprintf("Using the value from %s for -github-webhook-secret-token", webhookSecretTokenEnvName))
-		webhookSecretToken = webhookSecretTokenEnv
-	}
-
-	if webhookSecretToken == "" {
-		setupLog.Info(fmt.Sprintf("-github-webhook-secret-token and %s are missing or empty. Create one following https://docs.github.com/en/developers/webhooks-and-events/securing-your-webhooks and specify it via the flag or the envvar", webhookSecretTokenEnvName))
-	}
-
-	if watchNamespace == "" {
-		setupLog.Info("-watch-namespace is empty. HorizontalRunnerAutoscalers in all the namespaces are watched, cached, and considered as scale targets.")
-	} else {
-		setupLog.Info("-watch-namespace is %q. Only HorizontalRunnerAutoscalers in %q are watched, cached, and considered as scale targets.")
-	}
-
-	logger := logging.NewLogger(logLevel)
-
-	ctrl.SetLogger(logger)
-
-	// In order to support runner groups with custom visibility (selected repositories), we need to perform some GitHub API calls.
-	// Let the user define if they want to opt-in supporting this option by providing the proper GitHub authentication parameters
-	// Without an opt-in, runner groups with custom visibility won't be supported to save API calls
-	// That is, all runner groups managed by ARC are assumed to be visible to any repositories,
-	// which is wrong when you have one or more non-default runner groups in your organization or enterprise.
-	if len(c.Token) > 0 || (c.AppID > 0 && c.AppInstallationID > 0 && c.AppPrivateKey != "") || (len(c.BasicauthUsername) > 0 && len(c.BasicauthPassword) > 0) {
-		c.Log = &logger
-
-		ghClient, err = c.NewClient()
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error: Client creation failed.", err)
-			setupLog.Error(err, "unable to create controller", "controller", "Runner")
-			os.Exit(1)
-		}
-	} else {
-		setupLog.Info("GitHub client is not initialized. Runner groups with custom visibility are not supported. If needed, please provide GitHub authentication. This will incur in extra GitHub API calls")
-	}
-
-	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:             scheme,
-		SyncPeriod:         &syncPeriod,
-		LeaderElection:     enableLeaderElection,
-		Namespace:          watchNamespace,
-		MetricsBindAddress: metricsAddr,
-		Port:               9443,
-	})
-	if err != nil {
-		setupLog.Error(err, "unable to start manager")
-		os.Exit(1)
-	}
-
-	hraGitHubWebhook := &controllers.HorizontalRunnerAutoscalerGitHubWebhook{
-		Name:           "webhookbasedautoscaler",
-		Client:         mgr.GetClient(),
-		Log:            ctrl.Log.WithName("controllers").WithName("webhookbasedautoscaler"),
-		Recorder:       nil,
-		Scheme:         mgr.GetScheme(),
-		SecretKeyBytes: []byte(webhookSecretToken),
-		Namespace:      watchNamespace,
-		GitHubClient:   ghClient,
-	}
-
-	if err = hraGitHubWebhook.SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "webhookbasedautoscaler")
-		os.Exit(1)
-	}
-
-	var wg sync.WaitGroup
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	wg.Add(1)
-	go func() {
-		defer cancel()
-		defer wg.Done()
-
-		setupLog.Info("starting webhook server")
-		if err := mgr.Start(ctx); err != nil {
-			setupLog.Error(err, "problem running manager")
-			os.Exit(1)
-		}
-	}()
-
-	mux := http.NewServeMux()
-	mux.HandleFunc("/", hraGitHubWebhook.Handle)
-
-	srv := http.Server{
-		Addr:    webhookAddr,
-		Handler: mux,
-	}
-
-	wg.Add(1)
-	go func() {
-		defer cancel()
-		defer wg.Done()
-
-		go func() {
-			<-ctx.Done()
-
-			srv.Shutdown(context.Background())
-		}()
-
-		if err := srv.ListenAndServe(); err != nil {
-			if !errors.Is(err, http.ErrServerClosed) {
-				setupLog.Error(err, "problem running http server")
-			}
-		}
-	}()
-
-	go func() {
-		<-ctrl.SetupSignalHandler().Done()
-		cancel()
-	}()
-
-	wg.Wait()
-}

config/crd/bases/actions.summerwind.dev_horizontalrunnerautoscalers.yaml

@@ -1,246 +1,133 @@
-apiVersion: apiextensions.k8s.io/v1
+
+---
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.7.0
+    controller-gen.kubebuilder.io/version: v0.3.0
   creationTimestamp: null
   name: horizontalrunnerautoscalers.actions.summerwind.dev
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .spec.minReplicas
+    name: Min
+    type: number
+  - JSONPath: .spec.maxReplicas
+    name: Max
+    type: number
+  - JSONPath: .status.desiredReplicas
+    name: Desired
+    type: number
   group: actions.summerwind.dev
   names:
     kind: HorizontalRunnerAutoscaler
     listKind: HorizontalRunnerAutoscalerList
     plural: horizontalrunnerautoscalers
-    shortNames:
-      - hra
     singular: horizontalrunnerautoscaler
   scope: Namespaced
-  versions:
-    - additionalPrinterColumns:
-        - jsonPath: .spec.minReplicas
-          name: Min
-          type: number
-        - jsonPath: .spec.maxReplicas
-          name: Max
-          type: number
-        - jsonPath: .status.desiredReplicas
-          name: Desired
-          type: number
-        - jsonPath: .status.scheduledOverridesSummary
-          name: Schedule
+  subresources:
+    status: {}
+  validation:
+    openAPIV3Schema:
+      description: HorizontalRunnerAutoscaler is the Schema for the horizontalrunnerautoscaler
+        API
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
-      name: v1alpha1
-      schema:
-        openAPIV3Schema:
-          description: HorizontalRunnerAutoscaler is the Schema for the horizontalrunnerautoscaler API
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: HorizontalRunnerAutoscalerSpec defines the desired state of
+            HorizontalRunnerAutoscaler
           properties:
-            apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-              type: string
-            kind:
-              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-              type: string
-            metadata:
-              type: object
-            spec:
-              description: HorizontalRunnerAutoscalerSpec defines the desired state of HorizontalRunnerAutoscaler
-              properties:
-                capacityReservations:
-                  items:
-                    description: CapacityReservation specifies the number of replicas temporarily added to the scale target until ExpirationTime.
-                    properties:
-                      effectiveTime:
-                        format: date-time
-                        type: string
-                      expirationTime:
-                        format: date-time
-                        type: string
-                      name:
-                        type: string
-                      replicas:
-                        type: integer
-                    type: object
-                  type: array
-                maxReplicas:
-                  description: MaxReplicas is the maximum number of replicas the deployment is allowed to scale
-                  type: integer
-                metrics:
-                  description: Metrics is the collection of various metric targets to calculate desired number of runners
-                  items:
-                    properties:
-                      repositoryNames:
-                        description: RepositoryNames is the list of repository names to be used for calculating the metric. For example, a repository name is the REPO part of `github.com/USER/REPO`.
-                        items:
-                          type: string
-                        type: array
-                      scaleDownAdjustment:
-                        description: ScaleDownAdjustment is the number of runners removed on scale-down. You can only specify either ScaleDownFactor or ScaleDownAdjustment.
-                        type: integer
-                      scaleDownFactor:
-                        description: ScaleDownFactor is the multiplicative factor applied to the current number of runners used to determine how many pods should be removed.
-                        type: string
-                      scaleDownThreshold:
-                        description: ScaleDownThreshold is the percentage of busy runners less than which will trigger the hpa to scale the runners down.
-                        type: string
-                      scaleUpAdjustment:
-                        description: ScaleUpAdjustment is the number of runners added on scale-up. You can only specify either ScaleUpFactor or ScaleUpAdjustment.
-                        type: integer
-                      scaleUpFactor:
-                        description: ScaleUpFactor is the multiplicative factor applied to the current number of runners used to determine how many pods should be added.
-                        type: string
-                      scaleUpThreshold:
-                        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. The only supported Type is TotalNumberOfQueuedAndInProgressWorkflowRuns
-                        type: string
-                    type: object
-                  type: array
-                minReplicas:
-                  description: MinReplicas is the minimum number of replicas the deployment is allowed to scale
-                  type: integer
-                scaleDownDelaySecondsAfterScaleOut:
-                  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 sis the reference to scaled resource like RunnerDeployment
-                  properties:
-                    kind:
-                      description: Kind is the type of resource being referenced
-                      enum:
-                        - RunnerDeployment
-                        - RunnerSet
+            maxReplicas:
+              description: MinReplicas is the maximum number of replicas the deployment
+                is allowed to scale
+              type: integer
+            metrics:
+              description: Metrics is the collection of various metric targets to
+                calculate desired number of runners
+              items:
+                properties:
+                  repositoryNames:
+                    description: RepositoryNames is the list of repository names to
+                      be used for calculating the metric. For example, a repository
+                      name is the REPO part of `github.com/USER/REPO`.
+                    items:
                       type: string
-                    name:
-                      description: Name is the name of resource being referenced
-                      type: string
-                  type: object
-                scaleUpTriggers:
-                  description: "ScaleUpTriggers is an experimental feature to increase the desired replicas by 1 on each webhook requested received by the webhookBasedAutoscaler. \n This feature requires you to also enable and deploy the webhookBasedAutoscaler onto your cluster. \n Note that the added runners remain until the next sync period at least, and they may or may not be used by GitHub Actions depending on the timing. They are intended to be used to gain \"resource slack\" immediately after you receive a webhook from GitHub, so that you can loosely expect MinReplicas runners to be always available."
-                  items:
-                    properties:
-                      amount:
-                        type: integer
-                      duration:
-                        type: string
-                      githubEvent:
-                        properties:
-                          checkRun:
-                            description: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#check_run
-                            properties:
-                              names:
-                                description: Names is a list of GitHub Actions glob patterns. Any check_run event whose name matches one of patterns in the list can trigger autoscaling. Note that check_run name seem to equal to the job name you've defined in your actions workflow yaml file. So it is very likely that you can utilize this to trigger depending on the job.
-                                items:
-                                  type: string
-                                type: array
-                              repositories:
-                                description: Repositories is a list of GitHub repositories. Any check_run event whose repository matches one of repositories in the list can trigger autoscaling.
-                                items:
-                                  type: string
-                                type: array
-                              status:
-                                type: string
-                              types:
-                                description: 'One of: created, rerequested, or completed'
-                                items:
-                                  type: string
-                                type: array
-                            type: object
-                          pullRequest:
-                            description: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request
-                            properties:
-                              branches:
-                                items:
-                                  type: string
-                                type: array
-                              types:
-                                items:
-                                  type: string
-                                type: array
-                            type: object
-                          push:
-                            description: PushSpec is the condition for triggering scale-up on push event Also see https://docs.github.com/en/actions/reference/events-that-trigger-workflows#push
-                            type: object
-                          workflowJob:
-                            description: https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#workflow_job
-                            type: object
-                        type: object
-                    type: object
-                  type: array
-                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 correspoding override happens every day, week, month, or year.
-                    properties:
-                      endTime:
-                        description: EndTime is the time at which the first override ends.
-                        format: date-time
-                        type: string
-                      minReplicas:
-                        description: MinReplicas is the number of runners while overriding. If omitted, it doesn't override minReplicas.
-                        minimum: 0
-                        nullable: true
-                        type: integer
-                      recurrenceRule:
-                        properties:
-                          frequency:
-                            description: Frequency is the name of a predefined interval of each recurrence. The valid values are "Daily", "Weekly", "Monthly", and "Yearly". If empty, the corresponding override happens only once.
-                            enum:
-                              - Daily
-                              - Weekly
-                              - Monthly
-                              - Yearly
-                            type: string
-                          untilTime:
-                            description: UntilTime is the time of the final recurrence. If empty, the schedule recurs forever.
-                            format: date-time
-                            type: string
-                        type: object
-                      startTime:
-                        description: StartTime is the time at which the first override starts.
-                        format: date-time
-                        type: string
-                    required:
-                      - endTime
-                      - startTime
-                    type: object
-                  type: array
-              type: object
-            status:
+                    type: array
+                  scaleDownFactor:
+                    description: ScaleDownFactor is the multiplicative factor applied
+                      to the current number of runners used to determine how many
+                      pods should be removed.
+                    type: string
+                  scaleDownThreshold:
+                    description: ScaleDownThreshold is the percentage of busy runners
+                      less than which will trigger the hpa to scale the runners down.
+                    type: string
+                  scaleUpFactor:
+                    description: ScaleUpFactor is the multiplicative factor applied
+                      to the current number of runners used to determine how many
+                      pods should be added.
+                    type: string
+                  scaleUpThreshold:
+                    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.
+                      The only supported Type is TotalNumberOfQueuedAndInProgressWorkflowRuns
+                    type: string
+                type: object
+              type: array
+            minReplicas:
+              description: MinReplicas is the minimum number of replicas the deployment
+                is allowed to scale
+              type: integer
+            scaleDownDelaySecondsAfterScaleOut:
+              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 sis the reference to scaled resource like
+                RunnerDeployment
               properties:
-                cacheEntries:
-                  items:
-                    properties:
-                      expirationTime:
-                        format: date-time
-                        type: string
-                      key:
-                        type: string
-                      value:
-                        type: integer
-                    type: object
-                  type: array
-                desiredReplicas:
-                  description: DesiredReplicas is the total number of desired, non-terminated and latest pods to be set for the primary RunnerSet This doesn't include outdated pods while upgrading the deployment and replacing the runnerset.
-                  type: integer
-                lastSuccessfulScaleOutTime:
-                  format: date-time
-                  nullable: true
-                  type: string
-                observedGeneration:
-                  description: ObservedGeneration is the most recent generation observed for the target. It corresponds to e.g. RunnerDeployment's generation, which is updated on mutation by the API Server.
-                  format: int64
-                  type: integer
-                scheduledOverridesSummary:
-                  description: ScheduledOverridesSummary is the summary of active and upcoming scheduled overrides to be shown in e.g. a column of a `kubectl get hra` output for observability.
+                name:
                   type: string
               type: object
           type: object
-      served: true
-      storage: true
-      subresources:
-        status: {}
-  preserveUnknownFields: false
+        status:
+          properties:
+            desiredReplicas:
+              description: DesiredReplicas is the total number of desired, non-terminated
+                and latest pods to be set for the primary RunnerSet This doesn't include
+                outdated pods while upgrading the deployment and replacing the runnerset.
+              type: integer
+            lastSuccessfulScaleOutTime:
+              format: date-time
+              type: string
+            observedGeneration:
+              description: ObservedGeneration is the most recent generation observed
+                for the target. It corresponds to e.g. RunnerDeployment's generation,
+                which is updated on mutation by the API Server.
+              format: int64
+              type: integer
+          type: object
+      type: object
+  version: v1alpha1
+  versions:
+  - name: v1alpha1
+    served: true
+    storage: true
 status:
   acceptedNames:
     kind: ""

config/crd/kustomization.yaml

@@ -6,7 +6,6 @@ resources:
 - bases/actions.summerwind.dev_runnerreplicasets.yaml
 - bases/actions.summerwind.dev_runnerdeployments.yaml
 - bases/actions.summerwind.dev_horizontalrunnerautoscalers.yaml
-- bases/actions.summerwind.dev_runnersets.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

config/crd/patches/cainjection_in_runners.yaml

@@ -1,6 +1,6 @@
 # The following patch adds a directive for certmanager to inject CA into the CRD
 # CRD conversion requires k8s 1.13 or later.
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:

config/crd/patches/webhook_in_runners.yaml

@@ -1,19 +1,17 @@
 # The following patch enables conversion webhook for CRD
 # CRD conversion requires k8s 1.13 or later.
-apiVersion: apiextensions.k8s.io/v1
+apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   name: runners.actions.summerwind.dev
 spec:
   conversion:
     strategy: Webhook
-    webhook:
-      conversionReviewVersions: ["v1","v1beta1"]
-      clientConfig:
-        # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-        # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-        caBundle: Cg==
-        service:
-          namespace: system
-          name: webhook-service
-          path: /convert
+    webhookClientConfig:
+      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
+      caBundle: Cg==
+      service:
+        namespace: system
+        name: webhook-service
+        path: /convert

config/default/gh-webhook-server-auth-proxy-patch.yaml

@@ -1,23 +0,0 @@
-# This patch injects an HTTP proxy sidecar container that performs RBAC
-# authorization against the Kubernetes API using SubjectAccessReviews.
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: github-webhook-server
-spec:
-  template:
-    spec:
-      containers:
-        - name: kube-rbac-proxy
-          image: quay.io/brancz/kube-rbac-proxy:v0.10.0
-          args:
-            - '--secure-listen-address=0.0.0.0:8443'
-            - '--upstream=http://127.0.0.1:8080/'
-            - '--logtostderr=true'
-            - '--v=10'
-          ports:
-            - containerPort: 8443
-              name: https
-        - name: github-webhook-server
-          args:
-            - '--metrics-addr=127.0.0.1:8080'

config/default/kustomization.yaml

@@ -20,22 +20,19 @@ bases:
 - ../webhook
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
 - ../certmanager
-# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
+# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. 
 #- ../prometheus
-# [GH_WEBHOOK_SERVER] To enable the GitHub webhook server, uncomment all sections with 'GH_WEBHOOK_SERVER'.
-#- ../github-webhook-server
 
 patchesStrategicMerge:
-# Protect the /metrics endpoint by putting it behind auth.
-# Only one of manager_auth_proxy_patch.yaml and
-# manager_prometheus_metrics_patch.yaml should be enabled.
+  # Protect the /metrics endpoint by putting it behind auth.
+  # Only one of manager_auth_proxy_patch.yaml and
+  # manager_prometheus_metrics_patch.yaml should be enabled.
 - manager_auth_proxy_patch.yaml
-
-# If you want your controller-manager to expose the /metrics
-# endpoint w/o any authn/z, uncomment the following line and
-# comment manager_auth_proxy_patch.yaml.
-# Only one of manager_auth_proxy_patch.yaml and
-# manager_prometheus_metrics_patch.yaml should be enabled.
+  # If you want your controller-manager to expose the /metrics
+  # endpoint w/o any authn/z, uncomment the following line and
+  # comment manager_auth_proxy_patch.yaml.
+  # Only one of manager_auth_proxy_patch.yaml and
+  # manager_prometheus_metrics_patch.yaml should be enabled.
 #- manager_prometheus_metrics_patch.yaml
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in crd/kustomization.yaml
@@ -46,10 +43,6 @@ patchesStrategicMerge:
 # 'CERTMANAGER' needs to be enabled to use ca injection
 - webhookcainjection_patch.yaml
 
-# [GH_WEBHOOK_SERVER] To enable the GitHub webhook server, uncomment all sections with 'GH_WEBHOOK_SERVER'.
-# Protect the GitHub webhook server metrics endpoint by putting it behind auth.
-# - gh-webhook-server-auth-proxy-patch.yaml
-
 # the following config is for teaching kustomize how to do var substitution
 vars:
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.

config/default/manager_auth_proxy_patch.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: quay.io/brancz/kube-rbac-proxy:v0.10.0
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"
@@ -23,3 +23,4 @@ spec:
         args:
         - "--metrics-addr=127.0.0.1:8080"
         - "--enable-leader-election"
+        - "--sync-period=10m"

config/default/webhookcainjection_patch.yaml

@@ -1,13 +1,13 @@
 # This patch add annotation to admission webhook config and
 # the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize.
-apiVersion: admissionregistration.k8s.io/v1
+apiVersion: admissionregistration.k8s.io/v1beta1
 kind: MutatingWebhookConfiguration
 metadata:
   name: mutating-webhook-configuration
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
 ---
-apiVersion: admissionregistration.k8s.io/v1
+apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration
 metadata:
   name: validating-webhook-configuration