remove mirror secret

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

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

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

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

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

@@ -0,0 +1,47 @@
+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
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get Short SHA
+      id: vars
+      run: |
+        echo "sha_short=${GITHUB_SHA::7}" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        version: latest
+
+    - name: Login to DockerHub
+      if: ${{ github.event_name == 'release' || github.event_name == 'push' && github.ref == 'refs/heads/master' && inputs.password != ''  }}
+      uses: docker/login-action@v3
+      with:
+        username: ${{ inputs.username }}
+        password: ${{ inputs.password }}
+
+    - name: Login to GitHub Container Registry
+      if: ${{ github.event_name == 'release' || github.event_name == 'push' && github.ref == 'refs/heads/master' && inputs.ghcr_password != ''  }}
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ inputs.ghcr_username }}
+        password: ${{ inputs.ghcr_password }}

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

@@ -5,18 +5,18 @@ name: Publish ARC Helm Charts
 on:
   push:
     branches:
-      - master
+    - master
     paths:
-      - "charts/**"
-      - ".github/workflows/arc-publish-chart.yaml"
-      - "!charts/actions-runner-controller/docs/**"
-      - "!charts/gha-runner-scale-set-controller/**"
-      - "!charts/gha-runner-scale-set/**"
-      - "!**.md"
+    - 'charts/**'
+    - '.github/workflows/arc-publish-chart.yaml'
+    - '!charts/actions-runner-controller/docs/**'
+    - '!charts/gha-runner-scale-set-controller/**'
+    - '!charts/gha-runner-scale-set/**'
+    - '!**.md'
   workflow_dispatch:
     inputs:
       force:
-        description: "Force publish even if the chart version is not bumped"
+        description: 'Force publish even if the chart version is not bumped'
         type: boolean
         required: true
         default: false
@@ -39,86 +39,86 @@ jobs:
     outputs:
       publish-chart: ${{ steps.publish-chart-step.outputs.publish }}
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
 
-      - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
-        with:
-          version: ${{ env.HELM_VERSION }}
+    - name: Set up Helm
+      uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
+      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: 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
+    - 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@v6
-        with:
-          python-version: "3.11"
+    # python is a requirement for the chart-testing action below (supports yamllint among other tests)
+    - uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
 
-      - name: Set up chart-testing
-        uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f
+    - name: Set up chart-testing
+      uses: helm/chart-testing-action@v2.6.0
 
-      - name: Run chart-testing (list-changed)
-        id: list-changed
-        run: |
-          changed=$(ct list-changed --config charts/.ci/ct-config.yaml)
-          if [[ -n "$changed" ]]; then
-            echo "changed=true" >> $GITHUB_OUTPUT
-          fi
+    - name: Run chart-testing (list-changed)
+      id: list-changed
+      run: |
+        changed=$(ct list-changed --config charts/.ci/ct-config.yaml)
+        if [[ -n "$changed" ]]; then
+          echo "changed=true" >> $GITHUB_OUTPUT
+        fi
 
-      - name: Run chart-testing (lint)
-        run: |
-          ct lint --config charts/.ci/ct-config.yaml
+    - name: 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@ef37e7f390d99f746eb8b610417061a60e82a6cc
+    - name: Create kind cluster
+      if: steps.list-changed.outputs.changed == 'true'
+      uses: helm/kind-action@v1.4.0
 
-      # We need cert-manager already installed in the cluster because we assume the CRDs exist
-      - name: Install cert-manager
-        if: steps.list-changed.outputs.changed == 'true'
-        run: |
-          helm repo add jetstack https://charts.jetstack.io --force-update
-          helm install cert-manager jetstack/cert-manager --set installCRDs=true --wait
+    # 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
+    - name: Run chart-testing (install)
+      if: steps.list-changed.outputs.changed == 'true'
+      run: ct install --config charts/.ci/ct-config.yaml
 
-      # WARNING: This relies on the latest release being at the top of the JSON from GitHub and a clean chart.yaml
-      - name: Check if Chart Publish is Needed
-        id: publish-chart-step
-        run: |
-          CHART_TEXT=$(curl -fs https://raw.githubusercontent.com/${{ github.repository }}/master/charts/actions-runner-controller/Chart.yaml)
-          NEW_CHART_VERSION=$(echo "$CHART_TEXT" | grep version: | cut -d ' ' -f 2)
-          RELEASE_LIST=$(curl -fs https://api.github.com/repos/${{ github.repository }}/releases  | jq .[].tag_name | grep actions-runner-controller | cut -d '"' -f 2 | cut -d '-' -f 4)
-          LATEST_RELEASED_CHART_VERSION=$(echo $RELEASE_LIST | cut -d ' ' -f 1)
+    # WARNING: This relies on the latest release being at the top of the JSON from GitHub and a clean chart.yaml
+    - name: Check if Chart Publish is Needed
+      id: publish-chart-step
+      run: |
+        CHART_TEXT=$(curl -fs https://raw.githubusercontent.com/${{ github.repository }}/master/charts/actions-runner-controller/Chart.yaml)
+        NEW_CHART_VERSION=$(echo "$CHART_TEXT" | grep version: | cut -d ' ' -f 2)
+        RELEASE_LIST=$(curl -fs https://api.github.com/repos/${{ github.repository }}/releases  | jq .[].tag_name | grep actions-runner-controller | cut -d '"' -f 2 | cut -d '-' -f 4)
+        LATEST_RELEASED_CHART_VERSION=$(echo $RELEASE_LIST | cut -d ' ' -f 1)
 
-          echo "CHART_VERSION_IN_MASTER=$NEW_CHART_VERSION" >> $GITHUB_ENV
-          echo "LATEST_CHART_VERSION=$LATEST_RELEASED_CHART_VERSION" >> $GITHUB_ENV
+        echo "CHART_VERSION_IN_MASTER=$NEW_CHART_VERSION" >> $GITHUB_ENV
+        echo "LATEST_CHART_VERSION=$LATEST_RELEASED_CHART_VERSION" >> $GITHUB_ENV
 
-          # Always publish if force is true
-          if [[ $NEW_CHART_VERSION != $LATEST_RELEASED_CHART_VERSION || "${{ inputs.force }}" == "true" ]]; then
-            echo "publish=true" >> $GITHUB_OUTPUT
-          else
-            echo "publish=false" >> $GITHUB_OUTPUT
-          fi
+        # Always publish if force is true
+        if [[ $NEW_CHART_VERSION != $LATEST_RELEASED_CHART_VERSION || "${{ inputs.force }}" == "true" ]]; then
+          echo "publish=true" >> $GITHUB_OUTPUT
+        else
+          echo "publish=false" >> $GITHUB_OUTPUT
+        fi
 
-      - name: Job summary
-        run: |
-          echo "Chart linting has been completed." >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-          echo "- chart version in master: ${{ env.CHART_VERSION_IN_MASTER }}" >> $GITHUB_STEP_SUMMARY
-          echo "- latest chart version: ${{ env.LATEST_CHART_VERSION }}" >> $GITHUB_STEP_SUMMARY
-          echo "- publish new chart: ${{ steps.publish-chart-step.outputs.publish }}" >> $GITHUB_STEP_SUMMARY
+    - name: Job summary
+      run: |
+        echo "Chart linting has been completed." >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "**Status:**" >> $GITHUB_STEP_SUMMARY
+        echo "- chart version in master: ${{ env.CHART_VERSION_IN_MASTER }}" >> $GITHUB_STEP_SUMMARY
+        echo "- latest chart version: ${{ env.LATEST_CHART_VERSION }}" >> $GITHUB_STEP_SUMMARY
+        echo "- publish new chart: ${{ steps.publish-chart-step.outputs.publish }}" >> $GITHUB_STEP_SUMMARY
 
   publish-chart:
     if: needs.lint-chart.outputs.publish-chart == 'true'
@@ -133,80 +133,80 @@ jobs:
       CHART_TARGET_BRANCH: master
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
+    - name: Checkout
+      uses: actions/checkout@v4
+      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: Configure Git
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
-      - name: Get Token
-        id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@d17e3a9a36850ea89f35db16c1067dd2b68ee343
-        with:
-          application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
-          application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
-          organization: ${{ env.CHART_TARGET_ORG }}
+    - name: Get Token
+      id: get_workflow_token
+      uses: peter-murray/workflow-application-token-action@dc0413987a085fa17d19df9e47d4677cf81ffef3
+      with:
+        application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
+        application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
+        organization: ${{ env.CHART_TARGET_ORG }}
 
-      - name: Install chart-releaser
-        uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f
-        with:
-          install_only: true
-          install_dir: ${{ github.workspace }}/bin
+    - name: Install chart-releaser
+      uses: helm/chart-releaser-action@v1.4.1
+      with:
+        install_only: true
+        install_dir: ${{ github.workspace }}/bin
 
-      - name: Package and upload release assets
-        run: |
-          cr package \
-            ${{ github.workspace }}/charts/actions-runner-controller/ \
-            --package-path .cr-release-packages
+    - name: Package and upload release assets
+      run: |
+        cr package \
+          ${{ github.workspace }}/charts/actions-runner-controller/ \
+          --package-path .cr-release-packages
 
-          cr upload \
-            --owner "$(echo ${{ github.repository }} | cut -d '/' -f 1)" \
-            --git-repo "$(echo ${{ github.repository }} | cut -d '/' -f 2)" \
-            --package-path .cr-release-packages \
-            --token ${{ secrets.GITHUB_TOKEN }}
+        cr upload \
+          --owner "$(echo ${{ github.repository }} | cut -d '/' -f 1)" \
+          --git-repo "$(echo ${{ github.repository }} | cut -d '/' -f 2)" \
+          --package-path .cr-release-packages \
+          --token ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Generate updated index.yaml
-        run: |
-          cr index \
-            --owner "$(echo ${{ github.repository }} | cut -d '/' -f 1)" \
-            --git-repo "$(echo ${{ github.repository }} | cut -d '/' -f 2)" \
-            --index-path ${{ github.workspace }}/index.yaml \
-            --token ${{ secrets.GITHUB_TOKEN }} \
-            --push \
-            --pages-branch 'gh-pages' \
-            --pages-index-path 'index.yaml'
+    - name: Generate updated index.yaml
+      run: |
+        cr index \
+          --owner "$(echo ${{ github.repository }} | cut -d '/' -f 1)" \
+          --git-repo "$(echo ${{ github.repository }} | cut -d '/' -f 2)" \
+          --index-path ${{ github.workspace }}/index.yaml \
+          --token ${{ secrets.GITHUB_TOKEN }} \
+          --push \
+          --pages-branch 'gh-pages' \
+          --pages-index-path 'index.yaml'
 
-      # Chart Release was never intended to publish to a different repo
-      # this workaround is intended to move the index.yaml to the target repo
-      # where the github pages are hosted
-      - name: Checkout target repository
-        uses: actions/checkout@v6
-        with:
-          repository: ${{ env.CHART_TARGET_ORG }}/${{ env.CHART_TARGET_REPO }}
-          path: ${{ env.CHART_TARGET_REPO }}
-          ref: ${{ env.CHART_TARGET_BRANCH }}
-          token: ${{ steps.get_workflow_token.outputs.token }}
+    # Chart Release was never intended to publish to a different repo
+    # this workaround is intended to move the index.yaml to the target repo
+    # where the github pages are hosted
+    - name: Checkout target repository
+      uses: actions/checkout@v4
+      with:
+        repository: ${{ env.CHART_TARGET_ORG }}/${{ env.CHART_TARGET_REPO }}
+        path: ${{ env.CHART_TARGET_REPO }}
+        ref: ${{ env.CHART_TARGET_BRANCH }}
+        token: ${{ steps.get_workflow_token.outputs.token }}
 
-      - name: Copy index.yaml
-        run: |
-          cp ${{ github.workspace }}/index.yaml ${{ env.CHART_TARGET_REPO }}/actions-runner-controller/index.yaml
+    - name: Copy index.yaml
+      run: |
+        cp ${{ github.workspace }}/index.yaml ${{ env.CHART_TARGET_REPO }}/actions-runner-controller/index.yaml
 
-      - name: Commit and push to target repository
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-          git add .
-          git commit -m "Update index.yaml"
-          git push
-        working-directory: ${{ github.workspace }}/${{ env.CHART_TARGET_REPO }}
+    - name: Commit and push to target repository
+      run: |
+        git config user.name "$GITHUB_ACTOR"
+        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+        git add .
+        git commit -m "Update index.yaml"
+        git push
+      working-directory: ${{ github.workspace }}/${{ env.CHART_TARGET_REPO }}
 
-      - name: Job summary
-        run: |
-          echo "New helm chart has been published" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Status:**" >> $GITHUB_STEP_SUMMARY
-          echo "- New [index.yaml](https://github.com/${{ env.CHART_TARGET_ORG }}/${{ env.CHART_TARGET_REPO }}/tree/master/actions-runner-controller) pushed" >> $GITHUB_STEP_SUMMARY
+    - name: Job summary
+      run: |
+        echo "New helm chart has been published" >> $GITHUB_STEP_SUMMARY
+        echo "" >> $GITHUB_STEP_SUMMARY
+        echo "**Status:**" >> $GITHUB_STEP_SUMMARY
+        echo "- New [index.yaml](https://github.com/${{ env.CHART_TARGET_ORG }}/${{ env.CHART_TARGET_REPO }}/tree/master/actions-runner-controller) pushed" >> $GITHUB_STEP_SUMMARY

.github/workflows/arc-publish.yaml

@@ -9,17 +9,17 @@ on:
   workflow_dispatch:
     inputs:
       release_tag_name:
-        description: "Tag name of the release to publish"
+        description: 'Tag name of the release to publish'
         required: true
       push_to_registries:
-        description: "Push images to registries"
+        description: 'Push images to registries'
         required: true
         type: boolean
         default: false
 
 permissions:
-  contents: write
-  packages: write
+ contents: write
+ packages: write
 
 env:
   TARGET_ORG: actions-runner-controller
@@ -39,15 +39,17 @@ jobs:
     if: ${{ !startsWith(github.event.inputs.release_tag_name, 'gha-runner-scale-set-') }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
-      - uses: actions/setup-go@v6
+      - uses: actions/setup-go@v5
         with:
-          go-version-file: "go.mod"
+          go-version-file: 'go.mod'
 
       - name: Install tools
         run: |
-
+          curl -L -O https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.2.0/kubebuilder_2.2.0_linux_amd64.tar.gz
+          tar zxvf kubebuilder_2.2.0_linux_amd64.tar.gz
+          sudo mv kubebuilder_2.2.0_linux_amd64 /usr/local/kubebuilder
           curl -s https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh | bash
           sudo mv kustomize /usr/local/bin
           curl -L -O https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz
@@ -71,7 +73,7 @@ jobs:
 
       - name: Get Token
         id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@d17e3a9a36850ea89f35db16c1067dd2b68ee343
+        uses: peter-murray/workflow-application-token-action@dc0413987a085fa17d19df9e47d4677cf81ffef3
         with:
           application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
           application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}

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

@@ -1,6 +1,4 @@
 name: Release ARC Runner Images
-permissions:
-  contents: read
 
 # Revert to https://github.com/actions-runner-controller/releases#releases
 # for details on why we use this approach
@@ -9,17 +7,17 @@ on:
   # are available to the workflow run
   push:
     branches:
-      - "master"
+      - 'master'
     paths:
-      - "runner/VERSION"
-      - ".github/workflows/arc-release-runners.yaml"
+      - 'runner/VERSION'
+      - '.github/workflows/arc-release-runners.yaml'
 
 env:
   # Safeguard to prevent pushing images to registeries after build
   PUSH_TO_REGISTRIES: true
   TARGET_ORG: actions-runner-controller
   TARGET_WORKFLOW: release-runners.yaml
-  DOCKER_VERSION: 28.0.4
+  DOCKER_VERSION: 24.0.7
 
 concurrency:
   group: ${{ github.workflow }}
@@ -30,7 +28,7 @@ jobs:
     name: Trigger Build and Push of Runner Images
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
       - name: Get runner version
         id: versions
         run: |
@@ -41,7 +39,7 @@ jobs:
 
       - name: Get Token
         id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@d17e3a9a36850ea89f35db16c1067dd2b68ee343
+        uses: peter-murray/workflow-application-token-action@dc0413987a085fa17d19df9e47d4677cf81ffef3
         with:
           application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
           application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}

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

@@ -1,9 +1,6 @@
 # This workflows polls releases from actions/runner and in case of a new one it
 # updates files containing runner version and opens a pull request.
 name: Runner Updates Check (Scheduled Job)
-permissions:
-  pull-requests: write
-  contents: write
 
 on:
   schedule:
@@ -24,7 +21,7 @@ jobs:
       container_hooks_current_version: ${{ steps.container_hooks_versions.outputs.container_hooks_current_version }}
       container_hooks_latest_version: ${{ steps.container_hooks_versions.outputs.container_hooks_latest_version }}
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: Get runner current and latest versions
         id: runner_versions
@@ -53,8 +50,6 @@ jobs:
   # it sets a PR name as output.
   check_pr:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     needs: check_versions
     if: needs.check_versions.outputs.runner_current_version != needs.check_versions.outputs.runner_latest_version || needs.check_versions.outputs.container_hooks_current_version != needs.check_versions.outputs.container_hooks_latest_version
     outputs:
@@ -69,7 +64,7 @@ jobs:
           echo "CONTAINER_HOOKS_CURRENT_VERSION=${{ needs.check_versions.outputs.container_hooks_current_version }}"
           echo "CONTAINER_HOOKS_LATEST_VERSION=${{ needs.check_versions.outputs.container_hooks_latest_version }}"
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: PR Name
         id: pr_name
@@ -124,7 +119,7 @@ jobs:
       PR_NAME: ${{ needs.check_pr.outputs.pr_name }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v4
 
       - name: New branch
         run: git checkout -b update-runner-"$(date +%Y-%m-%d)"

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

@@ -5,20 +5,20 @@ on:
     branches:
       - master
     paths:
-      - "charts/**"
-      - ".github/workflows/arc-validate-chart.yaml"
-      - "!charts/actions-runner-controller/docs/**"
-      - "!**.md"
-      - "!charts/gha-runner-scale-set-controller/**"
-      - "!charts/gha-runner-scale-set/**"
+      - 'charts/**'
+      - '.github/workflows/arc-validate-chart.yaml'
+      - '!charts/actions-runner-controller/docs/**'
+      - '!**.md'
+      - '!charts/gha-runner-scale-set-controller/**'
+      - '!charts/gha-runner-scale-set/**'
   push:
     paths:
-      - "charts/**"
-      - ".github/workflows/arc-validate-chart.yaml"
-      - "!charts/actions-runner-controller/docs/**"
-      - "!**.md"
-      - "!charts/gha-runner-scale-set-controller/**"
-      - "!charts/gha-runner-scale-set/**"
+      - 'charts/**'
+      - '.github/workflows/arc-validate-chart.yaml'
+      - '!charts/actions-runner-controller/docs/**'
+      - '!**.md'
+      - '!charts/gha-runner-scale-set-controller/**'
+      - '!charts/gha-runner-scale-set/**'
   workflow_dispatch:
 env:
   KUBE_SCORE_VERSION: 1.10.0
@@ -40,22 +40,39 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
+        # Using https://github.com/Azure/setup-helm/releases/tag/v4.2
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
         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@v6
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: '3.11'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f
+        uses: helm/chart-testing-action@v2.6.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -70,7 +87,7 @@ jobs:
           ct lint --config charts/.ci/ct-config.yaml
 
       - name: Create kind cluster
-        uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc
+        uses: helm/kind-action@v1.4.0
         if: steps.list-changed.outputs.changed == 'true'
 
       # We need cert-manager already installed in the cluster because we assume the CRDs exist

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

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

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

@@ -4,37 +4,27 @@ on:
   workflow_dispatch:
     inputs:
       ref:
-        description: "The branch, tag or SHA to cut a release from"
+        description: 'The branch, tag or SHA to cut a release from'
         required: false
         type: string
-        default: ""
+        default: ''
       release_tag_name:
-        description: "The name to tag the controller image with"
+        description: 'The name to tag the controller image with'
         required: true
         type: string
-        default: "canary"
+        default: 'canary'
       push_to_registries:
-        description: "Push images to registries"
+        description: 'Push images to registries'
         required: true
         type: boolean
         default: false
       publish_gha_runner_scale_set_controller_chart:
-        description: "Publish new helm chart for gha-runner-scale-set-controller"
-        required: true
-        type: boolean
-        default: false
-      publish_gha_runner_scale_set_controller_experimental_chart:
-        description: "Publish new helm chart for gha-runner-scale-set-controller-experimental"
+        description: 'Publish new helm chart for gha-runner-scale-set-controller'
         required: true
         type: boolean
         default: false
       publish_gha_runner_scale_set_chart:
-        description: "Publish new helm chart for gha-runner-scale-set"
-        required: true
-        type: boolean
-        default: false
-      publish_gha_runner_scale_set_experimental_chart:
-        description: "Publish new helm chart for gha-runner-scale-set-experimental"
+        description: 'Publish new helm chart for gha-runner-scale-set'
         required: true
         type: boolean
         default: false
@@ -55,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           # If inputs.ref is empty, it'll resolve to the default branch
           ref: ${{ inputs.ref }}
@@ -82,10 +72,10 @@ jobs:
           echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@v3
         with:
           # Pinning v0.9.1 for Buildx and BuildKit v0.10.6
           # BuildKit v0.11 which has a bug causing intermittent
@@ -94,14 +84,14 @@ jobs:
           driver-opts: image=moby/buildkit:v0.10.6
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build & push controller image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
+        uses: docker/build-push-action@v5
         with:
           file: Dockerfile
           platforms: linux/amd64,linux/arm64
@@ -110,6 +100,8 @@ jobs:
           tags: |
             ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/gha-runner-scale-set-controller:${{ inputs.release_tag_name }}
             ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/gha-runner-scale-set-controller:${{ inputs.release_tag_name }}-${{ steps.resolve_parameters.outputs.short_sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: Job summary
         run: |
@@ -129,7 +121,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           # If inputs.ref is empty, it'll resolve to the default branch
           ref: ${{ inputs.ref }}
@@ -148,7 +140,8 @@ jobs:
           echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
       - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
+        # Using https://github.com/Azure/setup-helm/releases/tag/v4.2
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
         with:
           version: ${{ env.HELM_VERSION }}
 
@@ -169,54 +162,6 @@ jobs:
           echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
           echo "- gha-runner-scale-set-controller Chart version: ${{ env.GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG }}" >> $GITHUB_STEP_SUMMARY
 
-  publish-helm-chart-gha-runner-scale-set-controller-experimental:
-    if: ${{ inputs.publish_gha_runner_scale_set_controller_experimental_chart == true }}
-    needs: build-push-image
-    name: Publish Helm chart for gha-runner-scale-set-controller-experimental
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          # If inputs.ref is empty, it'll resolve to the default branch
-          ref: ${{ inputs.ref }}
-
-      - name: Resolve parameters
-        id: resolve_parameters
-        run: |
-          resolvedRef="${{ inputs.ref }}"
-          if [ -z "$resolvedRef" ]
-          then
-            resolvedRef="${{ github.ref }}"
-          fi
-          echo "resolved_ref=$resolvedRef" >> $GITHUB_OUTPUT
-          echo "INFO: Resolving short SHA for $resolvedRef"
-          echo "short_sha=$(git rev-parse --short $resolvedRef)" >> $GITHUB_OUTPUT
-          echo "INFO: Normalizing repository name (lowercase)"
-          echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
-        with:
-          version: ${{ env.HELM_VERSION }}
-
-      - name: Publish new helm chart for gha-runner-scale-set-controller-experimental
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | helm registry login ghcr.io --username ${{ github.actor }} --password-stdin
-          GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG=$(cat charts/gha-runner-scale-set-controller-experimental/Chart.yaml | grep version: | cut -d " " -d '"' -f 2)
-          echo "GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG=${GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG}" >> $GITHUB_ENV
-          helm package charts/gha-runner-scale-set-controller-experimental/ --version="${GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG}"
-          helm push gha-runner-scale-set-controller-experimental-"${GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG}".tgz oci://ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/actions-runner-controller-charts
-
-      - name: Job summary
-        run: |
-          echo "New helm chart for gha-runner-scale-set-controller-experimental published successfully!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Ref: ${{ steps.resolve_parameters.outputs.resolved_ref }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- gha-runner-scale-set-controller-experimental Chart version: ${{ env.GHA_RUNNER_SCALE_SET_CONTROLLER_CHART_VERSION_TAG }}" >> $GITHUB_STEP_SUMMARY
-
   publish-helm-chart-gha-runner-scale-set:
     if: ${{ inputs.publish_gha_runner_scale_set_chart == true }}
     needs: build-push-image
@@ -224,7 +169,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           # If inputs.ref is empty, it'll resolve to the default branch
           ref: ${{ inputs.ref }}
@@ -243,7 +188,8 @@ jobs:
           echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
       - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
+        # Using https://github.com/Azure/setup-helm/releases/tag/v4.2
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
         with:
           version: ${{ env.HELM_VERSION }}
 
@@ -264,52 +210,3 @@ jobs:
           echo "- Ref: ${{ steps.resolve_parameters.outputs.resolvedRef }}" >> $GITHUB_STEP_SUMMARY
           echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
           echo "- gha-runner-scale-set Chart version: ${{ env.GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG }}" >> $GITHUB_STEP_SUMMARY
-
-  publish-helm-chart-gha-runner-scale-set-experimental:
-    if: ${{ inputs.publish_gha_runner_scale_set_experimental_chart == true }}
-    needs: build-push-image
-    name: Publish Helm chart for gha-runner-scale-set-experimental
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          # If inputs.ref is empty, it'll resolve to the default branch
-          ref: ${{ inputs.ref }}
-
-      - name: Resolve parameters
-        id: resolve_parameters
-        run: |
-          resolvedRef="${{ inputs.ref }}"
-          if [ -z "$resolvedRef" ]
-          then
-            resolvedRef="${{ github.ref }}"
-          fi
-          echo "resolved_ref=$resolvedRef" >> $GITHUB_OUTPUT
-          echo "INFO: Resolving short SHA for $resolvedRef"
-          echo "short_sha=$(git rev-parse --short $resolvedRef)" >> $GITHUB_OUTPUT
-          echo "INFO: Normalizing repository name (lowercase)"
-          echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
-
-      - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
-        with:
-          version: ${{ env.HELM_VERSION }}
-
-      - name: Publish new helm chart for gha-runner-scale-set-experimental
-        run: |
-          echo ${{ secrets.GITHUB_TOKEN }} | helm registry login ghcr.io --username ${{ github.actor }} --password-stdin
-
-          GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG=$(cat charts/gha-runner-scale-set-experimental/Chart.yaml | grep version: | cut -d " " -d '"' -f 2)
-          echo "GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG=${GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG}" >> $GITHUB_ENV
-          helm package charts/gha-runner-scale-set-experimental/ --version="${GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG}"
-          helm push gha-runner-scale-set-experimental-"${GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG}".tgz oci://ghcr.io/${{ steps.resolve_parameters.outputs.repository_owner }}/actions-runner-controller-charts
-
-      - name: Job summary
-        run: |
-          echo "New helm chart for gha-runner-scale-set-experimental published successfully!" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Parameters:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Ref: ${{ steps.resolve_parameters.outputs.resolved_ref }}" >> $GITHUB_STEP_SUMMARY
-          echo "- Short SHA: ${{ steps.resolve_parameters.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "- gha-runner-scale-set-experimental Chart version: ${{ env.GHA_RUNNER_SCALE_SET_CHART_VERSION_TAG }}" >> $GITHUB_STEP_SUMMARY

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

@@ -5,20 +5,20 @@ on:
     branches:
       - master
     paths:
-      - "charts/**"
-      - ".github/workflows/gha-validate-chart.yaml"
-      - "!charts/actions-runner-controller/**"
-      - "!**.md"
+      - 'charts/**'
+      - '.github/workflows/gha-validate-chart.yaml'
+      - '!charts/actions-runner-controller/**'
+      - '!**.md'
   push:
     paths:
-      - "charts/**"
-      - ".github/workflows/gha-validate-chart.yaml"
-      - "!charts/actions-runner-controller/**"
-      - "!**.md"
+      - 'charts/**'
+      - '.github/workflows/gha-validate-chart.yaml'
+      - '!charts/actions-runner-controller/**'
+      - '!**.md'
   workflow_dispatch:
 env:
   KUBE_SCORE_VERSION: 1.16.1
-  HELM_VERSION: v3.19.4
+  HELM_VERSION: v3.17.0
 
 permissions:
   contents: read
@@ -36,22 +36,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4
+        # Using https://github.com/Azure/setup-helm/releases/tag/v4.2
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
         with:
           version: ${{ env.HELM_VERSION }}
 
       # python is a requirement for the chart-testing action below (supports yamllint among other tests)
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: '3.11'
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f
+        uses: helm/chart-testing-action@v2.6.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -61,39 +62,19 @@ jobs:
           if [[ -n "$changed" ]]; then
             echo "changed=true" >> $GITHUB_OUTPUT
           fi
-          echo "changed_charts<<EOF" >> $GITHUB_OUTPUT
-          echo "$changed" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-      - name: Install helm-unittest
-        if: |
-          contains(steps.list-changed.outputs.changed_charts, 'charts/gha-runner-scale-set-controller-experimental') ||
-          contains(steps.list-changed.outputs.changed_charts, 'charts/gha-runner-scale-set-experimental')
-        run: |
-          helm plugin install https://github.com/helm-unittest/helm-unittest.git
-
-      - name: Run helm-unittest (gha-runner-scale-set-controller-experimental)
-        if: contains(steps.list-changed.outputs.changed_charts, 'charts/gha-runner-scale-set-controller-experimental')
-        run: |
-          helm unittest ./charts/gha-runner-scale-set-controller-experimental/
-
-      - name: Run helm-unittest (gha-runner-scale-set-experimental)
-        if: contains(steps.list-changed.outputs.changed_charts, 'charts/gha-runner-scale-set-experimental')
-        run: |
-          helm unittest ./charts/gha-runner-scale-set-experimental/
 
       - name: Run chart-testing (lint)
         run: |
           ct lint --config charts/.ci/ct-config-gha.yaml
 
       - name: Set up docker buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@v3
         if: steps.list-changed.outputs.changed == 'true'
         with:
           version: latest
 
       - name: Build controller image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
+        uses: docker/build-push-action@v5
         if: steps.list-changed.outputs.changed == 'true'
         with:
           file: Dockerfile
@@ -108,7 +89,7 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Create kind cluster
-        uses: helm/kind-action@ef37e7f390d99f746eb8b610417061a60e82a6cc
+        uses: helm/kind-action@v1.4.0
         if: steps.list-changed.outputs.changed == 'true'
         with:
           cluster_name: chart-testing
@@ -116,11 +97,11 @@ jobs:
       - name: Load image into cluster
         if: steps.list-changed.outputs.changed == 'true'
         run: |
-          export DOCKER_IMAGE_NAME=test-arc
-          export VERSION=dev
-          export IMG_RESULT=load
-          make docker-buildx
-          kind load docker-image test-arc:dev --name chart-testing
+            export DOCKER_IMAGE_NAME=test-arc
+            export VERSION=dev
+            export IMG_RESULT=load
+            make docker-buildx
+            kind load docker-image test-arc:dev --name chart-testing
 
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'
@@ -131,8 +112,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
           cache: false
@@ -140,7 +121,3 @@ jobs:
         run: go test ./charts/gha-runner-scale-set/...
       - name: Test gha-runner-scale-set-controller
         run: go test ./charts/gha-runner-scale-set-controller/...
-      - name: Test gha-runner-scale-set-experimental
-        run: go test ./charts/gha-runner-scale-set-experimental/...
-      - name: Test gha-runner-scale-set-controller-experimental
-        run: go test ./charts/gha-runner-scale-set-controller-experimental/...

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

@@ -7,30 +7,30 @@ on:
     branches:
       - master
     paths-ignore:
-      - "**.md"
-      - ".github/actions/**"
-      - ".github/ISSUE_TEMPLATE/**"
-      - ".github/workflows/e2e-test-dispatch-workflow.yaml"
-      - ".github/workflows/gha-e2e-tests.yaml"
-      - ".github/workflows/arc-publish.yaml"
-      - ".github/workflows/arc-publish-chart.yaml"
-      - ".github/workflows/gha-publish-chart.yaml"
-      - ".github/workflows/arc-release-runners.yaml"
-      - ".github/workflows/global-run-codeql.yaml"
-      - ".github/workflows/global-run-first-interaction.yaml"
-      - ".github/workflows/global-run-stale.yaml"
-      - ".github/workflows/arc-update-runners-scheduled.yaml"
-      - ".github/workflows/validate-arc.yaml"
-      - ".github/workflows/arc-validate-chart.yaml"
-      - ".github/workflows/gha-validate-chart.yaml"
-      - ".github/workflows/arc-validate-runners.yaml"
-      - ".github/dependabot.yml"
-      - ".github/RELEASE_NOTE_TEMPLATE.md"
-      - "runner/**"
-      - ".gitignore"
-      - "PROJECT"
-      - "LICENSE"
-      - "Makefile"
+      - '**.md'
+      - '.github/actions/**'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/workflows/e2e-test-dispatch-workflow.yaml'
+      - '.github/workflows/gha-e2e-tests.yaml'
+      - '.github/workflows/arc-publish.yaml'
+      - '.github/workflows/arc-publish-chart.yaml'
+      - '.github/workflows/gha-publish-chart.yaml'
+      - '.github/workflows/arc-release-runners.yaml'
+      - '.github/workflows/global-run-codeql.yaml'
+      - '.github/workflows/global-run-first-interaction.yaml'
+      - '.github/workflows/global-run-stale.yaml'
+      - '.github/workflows/arc-update-runners-scheduled.yaml'
+      - '.github/workflows/validate-arc.yaml'
+      - '.github/workflows/arc-validate-chart.yaml'
+      - '.github/workflows/gha-validate-chart.yaml'
+      - '.github/workflows/arc-validate-runners.yaml'
+      - '.github/dependabot.yml'
+      - '.github/RELEASE_NOTE_TEMPLATE.md'
+      - 'runner/**'
+      - '.gitignore'
+      - 'PROJECT'
+      - 'LICENSE'
+      - 'Makefile'
 
 # https://docs.github.com/en/rest/overview/permissions-required-for-github-apps
 permissions:
@@ -55,11 +55,11 @@ jobs:
       TARGET_REPO: actions-runner-controller
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get Token
         id: get_workflow_token
-        uses: peter-murray/workflow-application-token-action@d17e3a9a36850ea89f35db16c1067dd2b68ee343
+        uses: peter-murray/workflow-application-token-action@dc0413987a085fa17d19df9e47d4677cf81ffef3
         with:
           application_id: ${{ secrets.ACTIONS_ACCESS_APP_ID }}
           application_private_key: ${{ secrets.ACTIONS_ACCESS_PK }}
@@ -90,10 +90,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -110,16 +110,16 @@ jobs:
           echo "repository_owner=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@v3
         with:
           version: latest
 
       # Unstable builds - run at your own risk
       - name: Build and Push
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./Dockerfile

.github/workflows/global-run-codeql.yaml

@@ -25,20 +25,20 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v4
+        uses: github/codeql-action/init@v2
         with:
-          languages: go, actions
+          languages: go
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v4
+        uses: github/codeql-action/autobuild@v2
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v4
+        uses: github/codeql-action/analyze@v2

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

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

.github/workflows/global-run-stale.yaml

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

.github/workflows/go.yaml

@@ -4,16 +4,16 @@ on:
     branches:
       - master
     paths:
-      - ".github/workflows/go.yaml"
-      - "**.go"
-      - "go.mod"
-      - "go.sum"
+      - '.github/workflows/go.yaml'
+      - '**.go'
+      - 'go.mod'
+      - 'go.sum'
   pull_request:
     paths:
-      - ".github/workflows/go.yaml"
-      - "**.go"
-      - "go.mod"
-      - "go.sum"
+      - '.github/workflows/go.yaml'
+      - '**.go'
+      - 'go.mod'
+      - 'go.sum'
 
 permissions:
   contents: read
@@ -29,10 +29,10 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version-file: "go.mod"
+          go-version-file: 'go.mod'
           cache: false
       - name: fmt
         run: go fmt ./...
@@ -42,58 +42,47 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version-file: "go.mod"
+          go-version-file: 'go.mod'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20
+        uses: golangci/golangci-lint-action@v6
         with:
           only-new-issues: true
-          version: v2.11.2
+          version: v1.55.2
 
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version-file: "go.mod"
+          go-version-file: 'go.mod'
           cache: false
       - name: Generate
         run: make generate
       - name: Check diff
         run: git diff --exit-code
 
-  mocks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: "go.mod"
-          cache: false
-      - name: "Run mockery"
-        run: go tool github.com/vektra/mockery/v3
-      - name: Check diff
-        run: git diff --exit-code
-
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version-file: "go.mod"
+          go-version-file: 'go.mod'
       - run: make manifests
       - name: Check diff
         run: git diff --exit-code
-      - name: Setup envtest
+      - name: Install kubebuilder
         run: |
-          go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(go list -m -f '{{ .Version }}' sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $2, $3}')
-          ENVTEST_K8S_VERSION=$(go list -m -f '{{ .Version }}' k8s.io/api | awk -F'[v.]' '{printf "1.%d", $3}')
-          echo "KUBEBUILDER_ASSETS=$(setup-envtest use ${ENVTEST_K8S_VERSION} -p path)" >> $GITHUB_ENV
+          curl -D headers.txt -fsL "https://storage.googleapis.com/kubebuilder-tools/kubebuilder-tools-1.26.1-linux-amd64.tar.gz" -o kubebuilder-tools
+          echo "$(grep -i etag headers.txt -m 1 | cut -d'"' -f2) kubebuilder-tools" > sum
+          md5sum -c sum
+          tar -zvxf kubebuilder-tools
+          sudo mv kubebuilder /usr/local/
       - name: Run go tests
         run: |
           go test -short `go list ./... | grep -v ./test_e2e_arc`

.gitignore

@@ -34,5 +34,5 @@ bin
 # OS
 .DS_STORE
 
-
+/test-assets
 /.tools

.golangci.yaml

@@ -1,18 +1,19 @@
-version: "2"
 run:
-  timeout: 5m
-linters:
-  settings:
-    errcheck:
-      exclude-functions:
-        - (net/http.ResponseWriter).Write
-        - (*net/http.Server).Shutdown
-        - (*github.com/actions/actions-runner-controller/simulator.VisibleRunnerGroups).Add
-        - (*github.com/actions/actions-runner-controller/testing.Kind).Stop
-  exclusions:
-    presets:
-      - std-error-handling
-    rules:
-      - linters:
-          - staticcheck
-        text: "QF1008:"
+  timeout: 3m
+output:
+  formats:
+    - format: github-actions
+      path: stdout
+linters-settings:
+  errcheck:
+    exclude-functions:
+      - (net/http.ResponseWriter).Write
+      - (*net/http.Server).Shutdown
+      - (*github.com/actions/actions-runner-controller/simulator.VisibleRunnerGroups).Add
+      - (*github.com/actions/actions-runner-controller/testing.Kind).Stop
+issues:
+  exclude-rules:
+    - path: controllers/suite_test.go
+      linters:
+        - staticcheck
+      text: "SA1019"

.mockery.yaml

@@ -1,17 +0,0 @@
-all: false
-dir: "{{.InterfaceDir}}"
-filename: mocks_test.go
-force-file-write: true
-formatter: goimports
-log-level: info
-structname: "{{.Mock}}{{.InterfaceName}}"
-pkgname: "{{.SrcPackageName}}"
-recursive: false
-template: testify
-packages:
-  github.com/actions/actions-runner-controller/cmd/ghalistener/metrics:
-    config:
-      all: true
-  github.com/actions/actions-runner-controller/controllers/actions.github.com:
-    config:
-      all: true

CODEOWNERS

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

CONTRIBUTING.md

@@ -102,19 +102,22 @@ A set of example pipelines (./acceptance/pipelines) are provided in this reposit
 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 install `setup-envtest`, download the required envtest binaries (etcd, kube-apiserver, kubectl), and then run `go test`.
+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`, install the envtest binaries using `setup-envtest`:
+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
-go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
-export KUBEBUILDER_ASSETS=$(setup-envtest use -p path)
+sudo mkdir -p /usr/local/kubebuilder/bin
+make kube-apiserver etcd
+sudo mv test-assets/{etcd,kube-apiserver} /usr/local/kubebuilder/bin/
 go test -v -run TestAPIs github.com/actions/actions-runner-controller/controllers/actions.summerwind.net
 ```
 

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.26.1 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.24.0 as builder
 
 WORKDIR /workspace
 
@@ -30,17 +30,17 @@ ARG TARGETPLATFORM TARGETOS TARGETARCH TARGETVARIANT VERSION=dev COMMIT_SHA=dev
 # to avoid https://github.com/moby/buildkit/issues/2334
 # We can use docker layer cache so the build is fast enogh anyway
 # We also use per-platform GOCACHE for the same reason.
-ENV GOCACHE="/build/${TARGETPLATFORM}/root/.cache/go-build"
+ENV GOCACHE /build/${TARGETPLATFORM}/root/.cache/go-build
 
 # Build
 RUN --mount=target=. \
-    --mount=type=cache,mode=0777,target=${GOCACHE} \
-    export GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} && \
-    go build -trimpath -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=${VERSION}' -X 'github.com/actions/actions-runner-controller/build.CommitSHA=${COMMIT_SHA}'" -o /out/manager main.go && \
-    go build -trimpath -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=${VERSION}' -X 'github.com/actions/actions-runner-controller/build.CommitSHA=${COMMIT_SHA}'" -o /out/ghalistener ./cmd/ghalistener && \
-    go build -trimpath -ldflags="-s -w" -o /out/github-webhook-server ./cmd/githubwebhookserver && \
-    go build -trimpath -ldflags="-s -w" -o /out/actions-metrics-server ./cmd/actionsmetricsserver && \
-    go build -trimpath -ldflags="-s -w" -o /out/sleep ./cmd/sleep
+  --mount=type=cache,mode=0777,target=${GOCACHE} \
+  export GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} && \
+  go build -trimpath -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=${VERSION}' -X 'github.com/actions/actions-runner-controller/build.CommitSHA=${COMMIT_SHA}'" -o /out/manager main.go && \
+  go build -trimpath -ldflags="-s -w -X 'github.com/actions/actions-runner-controller/build.Version=${VERSION}' -X 'github.com/actions/actions-runner-controller/build.CommitSHA=${COMMIT_SHA}'" -o /out/ghalistener ./cmd/ghalistener && \
+  go build -trimpath -ldflags="-s -w" -o /out/github-webhook-server ./cmd/githubwebhookserver && \
+  go build -trimpath -ldflags="-s -w" -o /out/actions-metrics-server ./cmd/actionsmetricsserver && \
+  go build -trimpath -ldflags="-s -w" -o /out/sleep ./cmd/sleep
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

Makefile

@@ -6,7 +6,7 @@ endif
 DOCKER_USER ?= $(shell echo ${DOCKER_IMAGE_NAME} | cut -d / -f1)
 VERSION ?= dev
 COMMIT_SHA = $(shell git rev-parse HEAD)
-RUNNER_VERSION ?= 2.332.0
+RUNNER_VERSION ?= 2.323.0
 TARGETPLATFORM ?= $(shell arch)
 RUNNER_NAME ?= ${DOCKER_USER}/actions-runner
 RUNNER_TAG  ?= ${VERSION}
@@ -20,7 +20,7 @@ KUBECONTEXT ?= kind-acceptance
 CLUSTER ?= acceptance
 CERT_MANAGER_VERSION ?= v1.1.1
 KUBE_RBAC_PROXY_VERSION ?= v0.11.0
-SHELLCHECK_VERSION ?= 0.10.0
+SHELLCHECK_VERSION ?= 0.8.0
 
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:generateEmbeddedObjectMeta=true,allowDangerousTypes=true"
@@ -32,15 +32,21 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
+TEST_ASSETS=$(PWD)/test-assets
 TOOLS_PATH=$(PWD)/.tools
 
 OS_NAME := $(shell uname -s | tr A-Z a-z)
 
-# ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script
-ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
-# ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries
-ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
-ENVTEST ?= $(GOBIN)/setup-envtest
+# The etcd packages that coreos maintain use different extensions for each *nix OS on their github release page.
+# ETCD_EXTENSION: the storage format file extension listed on the release page.
+# EXTRACT_COMMAND: the  appropriate CLI command for extracting this file format.
+ifeq ($(OS_NAME), darwin)
+ETCD_EXTENSION:=zip
+EXTRACT_COMMAND:=unzip
+else
+ETCD_EXTENSION:=tar.gz
+EXTRACT_COMMAND:=tar -xzf
+endif
 
 # default list of platforms for which multiarch image is built
 ifeq (${PLATFORMS}, )
@@ -62,23 +68,22 @@ endif
 all: manager
 
 lint:
-	docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v2.11.2 golangci-lint run
+	docker run --rm -v $(PWD):/app -w /app golangci/golangci-lint:v1.57.2 golangci-lint run
 
 GO_TEST_ARGS ?= -short
 
-
 # Run tests
-test: generate fmt vet manifests shellcheck setup-envtest
-	KUBEBUILDER_ASSETS="$$($(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(GOBIN) -p path)" \
-	  go test $(GO_TEST_ARGS) `go list ./... | grep -v ./test_e2e_arc` -coverprofile cover.out
-	KUBEBUILDER_ASSETS="$$($(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(GOBIN) -p path)" \
-	  go test -fuzz=Fuzz -fuzztime=10s -run=Fuzz* ./controllers/actions.summerwind.net
+test: generate fmt vet manifests shellcheck
+	go test $(GO_TEST_ARGS) `go list ./... | grep -v ./test_e2e_arc` -coverprofile cover.out
+	go test -fuzz=Fuzz -fuzztime=10s -run=Fuzz* ./controllers/actions.summerwind.net
 
-test-with-deps: setup-envtest
-	KUBEBUILDER_ASSETS="$$($(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(GOBIN) -p path)" \
+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
 
-
 # Build manager binary
 manager: generate fmt vet
 	go build -o bin/manager main.go
@@ -112,6 +117,9 @@ manifests: manifests-gen-crds chart-crds
 
 manifests-gen-crds: controller-gen yq
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	for YAMLFILE in config/crd/bases/actions*.yaml; do \
+		$(YQ) '.spec.preserveUnknownFields = false' --inplace "$$YAMLFILE" ; \
+	done
 	make manifests-gen-crds-fix DELETE_KEY=x-kubernetes-list-type
 	make manifests-gen-crds-fix DELETE_KEY=x-kubernetes-list-map-keys
 
@@ -177,10 +185,6 @@ chart-crds:
 	cp config/crd/bases/actions.github.com_autoscalinglisteners.yaml charts/gha-runner-scale-set-controller/crds/
 	cp config/crd/bases/actions.github.com_ephemeralrunnersets.yaml charts/gha-runner-scale-set-controller/crds/
 	cp config/crd/bases/actions.github.com_ephemeralrunners.yaml charts/gha-runner-scale-set-controller/crds/
-	cp config/crd/bases/actions.github.com_autoscalingrunnersets.yaml charts/gha-runner-scale-set-controller-experimental/crds/
-	cp config/crd/bases/actions.github.com_autoscalinglisteners.yaml charts/gha-runner-scale-set-controller-experimental/crds/
-	cp config/crd/bases/actions.github.com_ephemeralrunnersets.yaml charts/gha-runner-scale-set-controller-experimental/crds/
-	cp config/crd/bases/actions.github.com_ephemeralrunners.yaml charts/gha-runner-scale-set-controller-experimental/crds/
 	rm charts/actions-runner-controller/crds/actions.github.com_autoscalingrunnersets.yaml
 	rm charts/actions-runner-controller/crds/actions.github.com_autoscalinglisteners.yaml
 	rm charts/actions-runner-controller/crds/actions.github.com_ephemeralrunnersets.yaml
@@ -200,7 +204,7 @@ generate: controller-gen
 
 # Run shellcheck on runner scripts
 shellcheck: shellcheck-install
-	$(TOOLS_PATH)/shellcheck --shell bash --source-path runner runner/*.sh runner/update-status hack/*.sh
+	$(TOOLS_PATH)/shellcheck --shell bash --source-path runner runner/*.sh hack/*.sh
 
 docker-buildx:
 	export DOCKER_CLI_EXPERIMENTAL=enabled ;\
@@ -209,6 +213,8 @@ docker-buildx:
 		docker buildx create --platform ${PLATFORMS} --name container-builder --use;\
 	fi
 	docker buildx build --platform ${PLATFORMS} \
+		--build-arg RUNNER_VERSION=${RUNNER_VERSION} \
+		--build-arg DOCKER_VERSION=${DOCKER_VERSION} \
 		--build-arg VERSION=${VERSION} \
 		--build-arg COMMIT_SHA=${COMMIT_SHA} \
 		-t "${DOCKER_IMAGE_NAME}:${VERSION}" \
@@ -294,10 +300,6 @@ acceptance/runner/startup:
 e2e:
 	go test -count=1 -v -timeout 600s -run '^TestE2E$$' ./test/e2e
 
-.PHONY: gha-e2e
-gha-e2e:
-	bash hack/e2e-test.sh
-
 # Upload release file to GitHub.
 github-release: release
 	ghr ${VERSION} release/
@@ -308,7 +310,7 @@ github-release: release
 # 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.8.1 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
+# Note that controller-gen newer than 0.6.2 is needed due to https://github.com/kubernetes-sigs/controller-tools/issues/448
 # Otherwise ObjectMeta embedded in Spec results in empty on the storage.
 controller-gen:
 ifeq (, $(shell which controller-gen))
@@ -318,7 +320,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.20.1 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 endif
@@ -363,29 +365,68 @@ ifeq (, $(wildcard $(TOOLS_PATH)/shellcheck))
 endif
 SHELLCHECK=$(TOOLS_PATH)/shellcheck
 
-# find or download envtest
-envtest:
-ifeq (, $(shell which setup-envtest))
-ifeq (, $(wildcard $(GOBIN)/setup-envtest))
+# find or download etcd
+etcd:
+ifeq (, $(shell which etcd))
+ifeq (, $(wildcard $(TEST_ASSETS)/etcd))
 	@{ \
-	set -e ;\
-	ENVTEST_TMP_DIR=$$(mktemp -d) ;\
-	cd $$ENVTEST_TMP_DIR ;\
-	go mod init tmp ;\
-	go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION) ;\
-	rm -rf $$ENVTEST_TMP_DIR ;\
+	set -xe ;\
+	INSTALL_TMP_DIR=$$(mktemp -d) ;\
+	cd $$INSTALL_TMP_DIR ;\
+	wget https://github.com/coreos/etcd/releases/download/v3.4.22/etcd-v3.4.22-$(OS_NAME)-amd64.$(ETCD_EXTENSION);\
+	mkdir -p $(TEST_ASSETS) ;\
+	$(EXTRACT_COMMAND) etcd-v3.4.22-$(OS_NAME)-amd64.$(ETCD_EXTENSION) ;\
+	mv etcd-v3.4.22-$(OS_NAME)-amd64/etcd $(TEST_ASSETS)/etcd ;\
+	rm -rf $$INSTALL_TMP_DIR ;\
 	}
-endif
-ENVTEST=$(GOBIN)/setup-envtest
+ETCD_BIN=$(TEST_ASSETS)/etcd
 else
-ENVTEST=$(shell which setup-envtest)
+ETCD_BIN=$(TEST_ASSETS)/etcd
+endif
+else
+ETCD_BIN=$(shell which etcd)
 endif
 
-.PHONY: setup-envtest
-setup-envtest: envtest
-	@echo "Setting up envtest binaries for Kubernetes version $(ENVTEST_K8S_VERSION)..."
-	@$(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(GOBIN) -p path || { \
-		echo "Error: Failed to set up envtest binaries for version $(ENVTEST_K8S_VERSION)."; \
-		exit 1; \
+# 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/kube-apiserver $(TEST_ASSETS)/kube-apiserver ;\
+	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/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

acceptance/pipelines/eks-integration-tests.yaml

@@ -5,23 +5,22 @@ on:
 
 env:
   IRSA_ROLE_ARN:
-  ASSUME_ROLE_ARN:
-  AWS_REGION:
+  ASSUME_ROLE_ARN: 
+  AWS_REGION: 
 
 jobs:
   assume-role-in-runner-test:
-    runs-on: ["self-hosted", "Linux"]
+    runs-on: ['self-hosted', 'Linux']
     steps:
       - name: Test aws-actions/configure-aws-credentials Action
-        # https://github.com/aws-actions/configure-aws-credentials/releases/tag/v4.1.0
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
+        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:
+    runs-on: ['self-hosted', 'Linux']
+    container: 
       image: amazon/aws-cli
       env:
         AWS_WEB_IDENTITY_TOKEN_FILE: /var/run/secrets/eks.amazonaws.com/serviceaccount/token
@@ -30,8 +29,7 @@ jobs:
         - /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
-        # https://github.com/aws-actions/configure-aws-credentials/releases/tag/v4.1.0
-        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722
+        uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-region: ${{ env.AWS_REGION }}
           role-to-assume: ${{ env.ASSUME_ROLE_ARN }}

acceptance/pipelines/runner-integration-tests.yaml

@@ -8,8 +8,8 @@ env:
 
 jobs:
   run-step-in-container-test:
-    runs-on: ["self-hosted", "Linux"]
-    container:
+    runs-on: ['self-hosted', 'Linux']
+    container: 
       image: alpine
     steps:
       - name: Test we are working in the container
@@ -21,7 +21,7 @@ jobs:
               exit 1
           fi
   setup-python-test:
-    runs-on: ["self-hosted", "Linux"]
+    runs-on: ['self-hosted', 'Linux']
     steps:
       - name: Print native Python environment
         run: |
@@ -41,12 +41,12 @@ jobs:
             echo "Python version detected : $(python --version 2>&1)"
           fi
   setup-node-test:
-    runs-on: ["self-hosted", "Linux"]
+    runs-on: ['self-hosted', 'Linux']
     steps:
       - uses: actions/setup-node@v2
         with:
-          node-version: "12"
-      - name: Test actions/setup-node works
+          node-version: '12'
+      - name: Test actions/setup-node works 
         run: |
           VERSION=$(node --version | cut -c 2- | cut -d '.' -f1)
           if [[ $VERSION != '12' ]]; then
@@ -57,14 +57,13 @@ jobs:
             echo "Node version detected : $(node --version 2>&1)"
           fi
   setup-ruby-test:
-    runs-on: ["self-hosted", "Linux"]
+    runs-on: ['self-hosted', 'Linux']
     steps:
-      # https://github.com/ruby/setup-ruby/releases/tag/v1.227.0
-      - uses: ruby/setup-ruby@1a615958ad9d422dd932dc1d5823942ee002799f
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3.0
           bundler-cache: true
-      - name: Test ruby/setup-ruby works
+      - name: Test ruby/setup-ruby works 
         run: |
           VERSION=$(ruby --version | cut -d ' ' -f2 | cut -d '.' -f1-2)
           if [[ $VERSION != '3.0' ]]; then
@@ -75,8 +74,8 @@ jobs:
               echo "Ruby version detected : $(ruby --version 2>&1)"
           fi
   python-shell-test:
-    runs-on: ["self-hosted", "Linux"]
-    steps:
+    runs-on: ['self-hosted', 'Linux']
+    steps:      
       - name: Test Python shell works
         run: |
           import os

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

@@ -1,89 +0,0 @@
-package appconfig
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strconv"
-
-	corev1 "k8s.io/api/core/v1"
-)
-
-type AppConfig struct {
-	AppID             string `json:"github_app_id"`
-	AppInstallationID int64  `json:"github_app_installation_id"`
-	AppPrivateKey     string `json:"github_app_private_key"`
-
-	Token string `json:"github_token"`
-}
-
-func (c *AppConfig) tidy() *AppConfig {
-	if len(c.Token) > 0 {
-		return &AppConfig{
-			Token: c.Token,
-		}
-	}
-
-	return &AppConfig{
-		AppID:             c.AppID,
-		AppInstallationID: c.AppInstallationID,
-		AppPrivateKey:     c.AppPrivateKey,
-	}
-}
-
-func (c *AppConfig) Validate() error {
-	if c == nil {
-		return fmt.Errorf("missing app config")
-	}
-	hasToken := len(c.Token) > 0
-	hasGitHubAppAuth := c.hasGitHubAppAuth()
-	if hasToken && hasGitHubAppAuth {
-		return fmt.Errorf("both PAT and GitHub App credentials provided. should only provide one")
-	}
-	if !hasToken && !hasGitHubAppAuth {
-		return fmt.Errorf("no credentials provided: either a PAT or GitHub App credentials should be provided")
-	}
-
-	return nil
-}
-
-func (c *AppConfig) hasGitHubAppAuth() bool {
-	return len(c.AppID) > 0 && c.AppInstallationID > 0 && len(c.AppPrivateKey) > 0
-}
-
-func FromSecret(secret *corev1.Secret) (*AppConfig, error) {
-	var appInstallationID int64
-	if v := string(secret.Data["github_app_installation_id"]); v != "" {
-		val, err := strconv.ParseInt(v, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		appInstallationID = val
-	}
-
-	cfg := &AppConfig{
-		Token:             string(secret.Data["github_token"]),
-		AppID:             string(secret.Data["github_app_id"]),
-		AppInstallationID: appInstallationID,
-		AppPrivateKey:     string(secret.Data["github_app_private_key"]),
-	}
-
-	if err := cfg.Validate(); err != nil {
-		return nil, fmt.Errorf("failed to validate config: %v", err)
-	}
-
-	return cfg.tidy(), nil
-}
-
-func FromJSONString(v string) (*AppConfig, error) {
-	var appConfig AppConfig
-	if err := json.NewDecoder(bytes.NewBufferString(v)).Decode(&appConfig); err != nil {
-		return nil, err
-	}
-
-	if err := appConfig.Validate(); err != nil {
-		return nil, fmt.Errorf("failed to validate app config decoded from string: %w", err)
-	}
-
-	return appConfig.tidy(), nil
-}

apis/actions.github.com/v1alpha1/appconfig/appconfig_test.go

@@ -1,152 +0,0 @@
-package appconfig
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	corev1 "k8s.io/api/core/v1"
-)
-
-func TestAppConfigValidate_invalid(t *testing.T) {
-	tt := map[string]*AppConfig{
-		"empty": {},
-		"token and app config": {
-			AppID:             "1",
-			AppInstallationID: 2,
-			AppPrivateKey:     "private key",
-			Token:             "token",
-		},
-		"app id not set": {
-			AppInstallationID: 2,
-			AppPrivateKey:     "private key",
-		},
-		"app installation id not set": {
-			AppID:         "2",
-			AppPrivateKey: "private key",
-		},
-		"private key empty": {
-			AppID:             "2",
-			AppInstallationID: 1,
-			AppPrivateKey:     "",
-		},
-	}
-
-	for name, cfg := range tt {
-		t.Run(name, func(t *testing.T) {
-			err := cfg.Validate()
-			require.Error(t, err)
-		})
-	}
-}
-
-func TestAppConfigValidate_valid(t *testing.T) {
-	tt := map[string]*AppConfig{
-		"token": {
-			Token: "token",
-		},
-		"app ID": {
-			AppID:             "1",
-			AppInstallationID: 2,
-			AppPrivateKey:     "private key",
-		},
-	}
-
-	for name, cfg := range tt {
-		t.Run(name, func(t *testing.T) {
-			err := cfg.Validate()
-			require.NoError(t, err)
-		})
-	}
-}
-
-func TestAppConfigFromSecret_invalid(t *testing.T) {
-	tt := map[string]map[string]string{
-		"empty": {},
-		"token and app provided": {
-			"github_token":              "token",
-			"github_app_id":             "2",
-			"githu_app_installation_id": "3",
-			"github_app_private_key":    "private key",
-		},
-		"invalid app id": {
-			"github_app_id":             "abc",
-			"githu_app_installation_id": "3",
-			"github_app_private_key":    "private key",
-		},
-		"invalid app installation_id": {
-			"github_app_id":             "1",
-			"githu_app_installation_id": "abc",
-			"github_app_private_key":    "private key",
-		},
-		"empty private key": {
-			"github_app_id":             "1",
-			"githu_app_installation_id": "2",
-			"github_app_private_key":    "",
-		},
-	}
-
-	for name, data := range tt {
-		t.Run(name, func(t *testing.T) {
-			secret := &corev1.Secret{
-				StringData: data,
-			}
-
-			appConfig, err := FromSecret(secret)
-			assert.Error(t, err)
-			assert.Nil(t, appConfig)
-		})
-	}
-}
-
-func TestAppConfigFromSecret_valid(t *testing.T) {
-	tt := map[string]map[string]string{
-		"with token": {
-			"github_token": "token",
-		},
-		"app config": {
-			"github_app_id":             "2",
-			"githu_app_installation_id": "3",
-			"github_app_private_key":    "private key",
-		},
-	}
-
-	for name, data := range tt {
-		t.Run(name, func(t *testing.T) {
-			secret := &corev1.Secret{
-				StringData: data,
-			}
-
-			appConfig, err := FromSecret(secret)
-			assert.Error(t, err)
-			assert.Nil(t, appConfig)
-		})
-	}
-}
-
-func TestAppConfigFromString_valid(t *testing.T) {
-	tt := map[string]*AppConfig{
-		"token": {
-			Token: "token",
-		},
-		"app ID": {
-			AppID:             "1",
-			AppInstallationID: 2,
-			AppPrivateKey:     "private key",
-		},
-	}
-
-	for name, cfg := range tt {
-		t.Run(name, func(t *testing.T) {
-			bytes, err := json.Marshal(cfg)
-			require.NoError(t, err)
-
-			got, err := FromJSONString(string(bytes))
-			require.NoError(t, err)
-
-			want := cfg.tidy()
-			assert.Equal(t, want, got)
-		})
-	}
-}

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

@@ -59,28 +59,13 @@ type AutoscalingListenerSpec struct {
 	Proxy *ProxyConfig `json:"proxy,omitempty"`
 
 	// +optional
-	GitHubServerTLS *TLSConfig `json:"githubServerTLS,omitempty"`
-
-	// +optional
-	VaultConfig *VaultConfig `json:"vaultConfig,omitempty"`
+	GitHubServerTLS *GitHubServerTLSConfig `json:"githubServerTLS,omitempty"`
 
 	// +optional
 	Metrics *MetricsConfig `json:"metrics,omitempty"`
 
 	// +optional
 	Template *corev1.PodTemplateSpec `json:"template,omitempty"`
-
-	// +optional
-	ConfigSecretMetadata *ResourceMeta `json:"configSecretMetadata,omitempty"`
-
-	// +optional
-	ServiceAccountMetadata *ResourceMeta `json:"serviceAccountMetadata,omitempty"`
-
-	// +optional
-	RoleMetadata *ResourceMeta `json:"roleMetadata,omitempty"`
-
-	// +optional
-	RoleBindingMetadata *ResourceMeta `json:"roleBindingMetadata,omitempty"`
 }
 
 // AutoscalingListenerStatus defines the observed state of AutoscalingListener
@@ -102,6 +87,7 @@ type AutoscalingListener struct {
 }
 
 // +kubebuilder:object:root=true
+
 // AutoscalingListenerList contains a list of AutoscalingListener
 type AutoscalingListenerList struct {
 	metav1.TypeMeta `json:",inline"`

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

@@ -24,7 +24,6 @@ import (
 	"strings"
 
 	"github.com/actions/actions-runner-controller/hash"
-	"github.com/actions/actions-runner-controller/vault"
 	"golang.org/x/net/http/httpproxy"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -66,51 +65,21 @@ type AutoscalingRunnerSetSpec struct {
 	// +optional
 	RunnerScaleSetName string `json:"runnerScaleSetName,omitempty"`
 
-	// +optional
-	RunnerScaleSetLabels []string `json:"runnerScaleSetLabels,omitempty"`
-
 	// +optional
 	Proxy *ProxyConfig `json:"proxy,omitempty"`
 
 	// +optional
-	GitHubServerTLS *TLSConfig `json:"githubServerTLS,omitempty"`
-
-	// +optional
-	VaultConfig *VaultConfig `json:"vaultConfig,omitempty"`
+	GitHubServerTLS *GitHubServerTLSConfig `json:"githubServerTLS,omitempty"`
 
 	// Required
 	Template corev1.PodTemplateSpec `json:"template,omitempty"`
 
-	// +optional
-	AutoscalingListenerMetadata *ResourceMeta `json:"autoscalingListener,omitempty"`
-
 	// +optional
 	ListenerMetrics *MetricsConfig `json:"listenerMetrics,omitempty"`
 
 	// +optional
 	ListenerTemplate *corev1.PodTemplateSpec `json:"listenerTemplate,omitempty"`
 
-	// +optional
-	ListenerServiceAccountMetadata *ResourceMeta `json:"listenerServiceAccountMetadata,omitempty"`
-
-	// +optional
-	ListenerRoleMetadata *ResourceMeta `json:"listenerRoleMetadata,omitempty"`
-
-	// +optional
-	ListenerRoleBindingMetadata *ResourceMeta `json:"listenerRoleBindingMetadata,omitempty"`
-
-	// +optional
-	ListenerConfigSecretMetadata *ResourceMeta `json:"listenerConfigSecretMetadata,omitempty"`
-
-	// +optional
-	EphemeralRunnerSetMetadata *ResourceMeta `json:"ephemeralRunnerSetMetadata,omitempty"`
-
-	// +optional
-	EphemeralRunnerMetadata *ResourceMeta `json:"ephemeralRunnerMetadata,omitempty"`
-
-	// +optional
-	EphemeralRunnerConfigSecretMetadata *ResourceMeta `json:"ephemeralRunnerConfigSecretMetadata,omitempty"`
-
 	// +optional
 	// +kubebuilder:validation:Minimum:=0
 	MaxRunners *int `json:"maxRunners,omitempty"`
@@ -120,12 +89,12 @@ type AutoscalingRunnerSetSpec struct {
 	MinRunners *int `json:"minRunners,omitempty"`
 }
 
-type TLSConfig struct {
+type GitHubServerTLSConfig struct {
 	// Required
 	CertificateFrom *TLSCertificateSource `json:"certificateFrom,omitempty"`
 }
 
-func (c *TLSConfig) ToCertPool(keyFetcher func(name, key string) ([]byte, error)) (*x509.CertPool, error) {
+func (c *GitHubServerTLSConfig) ToCertPool(keyFetcher func(name, key string) ([]byte, error)) (*x509.CertPool, error) {
 	if c.CertificateFrom == nil {
 		return nil, fmt.Errorf("certificateFrom not specified")
 	}
@@ -173,7 +142,7 @@ type ProxyConfig struct {
 	NoProxy []string `json:"noProxy,omitempty"`
 }
 
-func (c *ProxyConfig) ToHTTPProxyConfig(secretFetcher func(string) (*corev1.Secret, error)) (*httpproxy.Config, error) {
+func (c *ProxyConfig) toHTTPProxyConfig(secretFetcher func(string) (*corev1.Secret, error)) (*httpproxy.Config, error) {
 	config := &httpproxy.Config{
 		NoProxy: strings.Join(c.NoProxy, ","),
 	}
@@ -232,7 +201,7 @@ func (c *ProxyConfig) ToHTTPProxyConfig(secretFetcher func(string) (*corev1.Secr
 }
 
 func (c *ProxyConfig) ToSecretData(secretFetcher func(string) (*corev1.Secret, error)) (map[string][]byte, error) {
-	config, err := c.ToHTTPProxyConfig(secretFetcher)
+	config, err := c.toHTTPProxyConfig(secretFetcher)
 	if err != nil {
 		return nil, err
 	}
@@ -246,7 +215,7 @@ func (c *ProxyConfig) ToSecretData(secretFetcher func(string) (*corev1.Secret, e
 }
 
 func (c *ProxyConfig) ProxyFunc(secretFetcher func(string) (*corev1.Secret, error)) (func(*http.Request) (*url.URL, error), error) {
-	config, err := c.ToHTTPProxyConfig(secretFetcher)
+	config, err := c.toHTTPProxyConfig(secretFetcher)
 	if err != nil {
 		return nil, err
 	}
@@ -266,26 +235,6 @@ type ProxyServerConfig struct {
 	CredentialSecretRef string `json:"credentialSecretRef,omitempty"`
 }
 
-type VaultConfig struct {
-	// +optional
-	Type vault.VaultType `json:"type,omitempty"`
-	// +optional
-	AzureKeyVault *AzureKeyVaultConfig `json:"azureKeyVault,omitempty"`
-	// +optional
-	Proxy *ProxyConfig `json:"proxy,omitempty"`
-}
-
-type AzureKeyVaultConfig struct {
-	// +required
-	URL string `json:"url,omitempty"`
-	// +required
-	TenantID string `json:"tenantId,omitempty"`
-	// +required
-	ClientID string `json:"clientId,omitempty"`
-	// +required
-	CertificatePath string `json:"certificatePath,omitempty"`
-}
-
 // MetricsConfig holds configuration parameters for each metric type
 type MetricsConfig struct {
 	// +optional
@@ -318,7 +267,7 @@ type AutoscalingRunnerSetStatus struct {
 	CurrentRunners int `json:"currentRunners"`
 
 	// +optional
-	Phase AutoscalingRunnerSetPhase `json:"phase"`
+	State string `json:"state"`
 
 	// EphemeralRunner counts separated by the stage ephemeral runners are in, taken from the EphemeralRunnerSet
 
@@ -330,61 +279,10 @@ type AutoscalingRunnerSetStatus struct {
 	FailedEphemeralRunners int `json:"failedEphemeralRunners"`
 }
 
-type AutoscalingRunnerSetPhase string
-
-const (
-	// AutoscalingRunnerSetPhasePending phase means that the listener is not
-	// yet started
-	AutoscalingRunnerSetPhasePending  AutoscalingRunnerSetPhase = "Pending"
-	AutoscalingRunnerSetPhaseRunning  AutoscalingRunnerSetPhase = "Running"
-	AutoscalingRunnerSetPhaseOutdated AutoscalingRunnerSetPhase = "Outdated"
-)
-
-func (ars *AutoscalingRunnerSet) Hash() string {
-	type data struct {
-		Spec   *AutoscalingRunnerSetSpec
-		Labels map[string]string
-	}
-
-	d := &data{
-		Spec:   ars.Spec.DeepCopy(),
-		Labels: ars.Labels,
-	}
-
-	return hash.ComputeTemplateHash(d)
-}
-
-func (ars *AutoscalingRunnerSet) ListenerSpecHash() string {
+func (ars *AutoscalingRunnerSet) ListenerSpecHash(githubSecret *corev1.Secret) string {
 	arsSpec := ars.Spec.DeepCopy()
-	spec := arsSpec
-	return hash.ComputeTemplateHash(&spec)
-}
-
-func (ars *AutoscalingRunnerSet) GitHubConfigSecret() string {
-	return ars.Spec.GitHubConfigSecret
-}
-
-func (ars *AutoscalingRunnerSet) GitHubConfigUrl() string {
-	return ars.Spec.GitHubConfigUrl
-}
-
-func (ars *AutoscalingRunnerSet) GitHubProxy() *ProxyConfig {
-	return ars.Spec.Proxy
-}
-
-func (ars *AutoscalingRunnerSet) GitHubServerTLS() *TLSConfig {
-	return ars.Spec.GitHubServerTLS
-}
-
-func (ars *AutoscalingRunnerSet) VaultConfig() *VaultConfig {
-	return ars.Spec.VaultConfig
-}
-
-func (ars *AutoscalingRunnerSet) VaultProxy() *ProxyConfig {
-	if ars.Spec.VaultConfig != nil {
-		return ars.Spec.VaultConfig.Proxy
-	}
-	return nil
+	secret := githubSecret.DeepCopy()
+	return hash.ComputeCombinedObjectsHash(&arsSpec, &secret)
 }
 
 func (ars *AutoscalingRunnerSet) RunnerSetSpecHash() string {
@@ -394,7 +292,7 @@ func (ars *AutoscalingRunnerSet) RunnerSetSpecHash() string {
 		RunnerGroup        string
 		RunnerScaleSetName string
 		Proxy              *ProxyConfig
-		GitHubServerTLS    *TLSConfig
+		GitHubServerTLS    *GitHubServerTLSConfig
 		Template           corev1.PodTemplateSpec
 	}
 	spec := &runnerSetSpec{

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

@@ -1,9 +0,0 @@
-package v1alpha1
-
-// ResourceMeta carries metadata common to all internal resources
-type ResourceMeta struct {
-	// +optional
-	Labels map[string]string `json:"labels,omitempty"`
-	// +optional
-	Annotations map[string]string `json:"annotations,omitempty"`
-}

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

@@ -34,7 +34,6 @@ const EphemeralRunnerContainerName = "runner"
 // +kubebuilder:printcolumn:JSONPath=".status.jobWorkflowRef",name=JobWorkflowRef,type=string
 // +kubebuilder:printcolumn:JSONPath=".status.workflowRunId",name=WorkflowRunId,type=number
 // +kubebuilder:printcolumn:JSONPath=".status.jobDisplayName",name=JobDisplayName,type=string
-// +kubebuilder:printcolumn:JSONPath=".status.jobId",name=JobId,type=string
 // +kubebuilder:printcolumn:JSONPath=".status.message",name=Message,type=string
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
@@ -48,11 +47,7 @@ type EphemeralRunner struct {
 }
 
 func (er *EphemeralRunner) IsDone() bool {
-	return er.Status.Phase == EphemeralRunnerPhaseSucceeded || er.Status.Phase == EphemeralRunnerPhaseFailed || er.Status.Phase == EphemeralRunnerPhaseOutdated
-}
-
-func (er *EphemeralRunner) HasJob() bool {
-	return len(er.Status.JobID) > 0
+	return er.Status.Phase == corev1.PodSucceeded || er.Status.Phase == corev1.PodFailed
 }
 
 func (er *EphemeralRunner) HasContainerHookConfigured() bool {
@@ -72,33 +67,6 @@ func (er *EphemeralRunner) HasContainerHookConfigured() bool {
 	return false
 }
 
-func (er *EphemeralRunner) GitHubConfigSecret() string {
-	return er.Spec.GitHubConfigSecret
-}
-
-func (er *EphemeralRunner) GitHubConfigUrl() string {
-	return er.Spec.GitHubConfigUrl
-}
-
-func (er *EphemeralRunner) GitHubProxy() *ProxyConfig {
-	return er.Spec.Proxy
-}
-
-func (er *EphemeralRunner) GitHubServerTLS() *TLSConfig {
-	return er.Spec.GitHubServerTLS
-}
-
-func (er *EphemeralRunner) VaultConfig() *VaultConfig {
-	return er.Spec.VaultConfig
-}
-
-func (er *EphemeralRunner) VaultProxy() *ProxyConfig {
-	if er.Spec.VaultConfig != nil {
-		return er.Spec.VaultConfig.Proxy
-	}
-	return nil
-}
-
 // EphemeralRunnerSpec defines the desired state of EphemeralRunner
 type EphemeralRunnerSpec struct {
 	// +required
@@ -107,11 +75,8 @@ type EphemeralRunnerSpec struct {
 	// +required
 	GitHubConfigSecret string `json:"githubConfigSecret,omitempty"`
 
-	// +optional
-	GitHubServerTLS *TLSConfig `json:"githubServerTLS,omitempty"`
-
 	// +required
-	RunnerScaleSetID int `json:"runnerScaleSetId,omitempty"`
+	RunnerScaleSetId int `json:"runnerScaleSetId,omitempty"`
 
 	// +optional
 	Proxy *ProxyConfig `json:"proxy,omitempty"`
@@ -120,10 +85,7 @@ type EphemeralRunnerSpec struct {
 	ProxySecretRef string `json:"proxySecretRef,omitempty"`
 
 	// +optional
-	VaultConfig *VaultConfig `json:"vaultConfig,omitempty"`
-
-	// +optional
-	EphemeralRunnerConfigSecretMetadata *ResourceMeta `json:"ephemeralRunnerConfigSecretMetadata,omitempty"`
+	GitHubServerTLS *GitHubServerTLSConfig `json:"githubServerTLS,omitempty"`
 
 	corev1.PodTemplateSpec `json:",inline"`
 }
@@ -143,25 +105,24 @@ type EphemeralRunnerStatus struct {
 	// The PodSucceded phase should be set only when confirmed that EphemeralRunner
 	// actually executed the job and has been removed from the service.
 	// +optional
-	Phase EphemeralRunnerPhase `json:"phase,omitempty"`
+	Phase corev1.PodPhase `json:"phase,omitempty"`
 	// +optional
 	Reason string `json:"reason,omitempty"`
 	// +optional
 	Message string `json:"message,omitempty"`
 
 	// +optional
-	RunnerID int `json:"runnerId,omitempty"`
+	RunnerId int `json:"runnerId,omitempty"`
 	// +optional
 	RunnerName string `json:"runnerName,omitempty"`
+	// +optional
+	RunnerJITConfig string `json:"runnerJITConfig,omitempty"`
 
 	// +optional
-	Failures map[string]metav1.Time `json:"failures,omitempty"`
+	Failures map[string]bool `json:"failures,omitempty"`
 
 	// +optional
-	JobRequestID int64 `json:"jobRequestId,omitempty"`
-
-	// +optional
-	JobID string `json:"jobId,omitempty"`
+	JobRequestId int64 `json:"jobRequestId,omitempty"`
 
 	// +optional
 	JobRepositoryName string `json:"jobRepositoryName,omitempty"`
@@ -170,47 +131,12 @@ type EphemeralRunnerStatus struct {
 	JobWorkflowRef string `json:"jobWorkflowRef,omitempty"`
 
 	// +optional
-	WorkflowRunID int64 `json:"workflowRunId,omitempty"`
+	WorkflowRunId int64 `json:"workflowRunId,omitempty"`
 
 	// +optional
 	JobDisplayName string `json:"jobDisplayName,omitempty"`
 }
 
-// EphemeralRunnerPhase is the phase of the ephemeral runner.
-// It must be a superset of the pod phase.
-type EphemeralRunnerPhase string
-
-const (
-	// EphemeralRunnerPhasePending is a phase set when the ephemeral runner is
-	// being provisioned and is not yet online.
-	EphemeralRunnerPhasePending EphemeralRunnerPhase = "Pending"
-	// EphemeralRunnerPhaseRunning is a phase set when the ephemeral runner is online and
-	// waiting for a job to execute.
-	EphemeralRunnerPhaseRunning EphemeralRunnerPhase = "Running"
-	// EphemeralRunnerPhaseSucceeded is a phase set when the ephemeral runner
-	// successfully executed the job and has been removed from the service.
-	EphemeralRunnerPhaseSucceeded EphemeralRunnerPhase = "Succeeded"
-	// EphemeralRunnerPhaseFailed is a phase set when the ephemeral runner
-	// fails with unrecoverable failure.
-	EphemeralRunnerPhaseFailed EphemeralRunnerPhase = "Failed"
-	// EphemeralRunnerPhaseOutdated is a special phase that indicates the runner is outdated and should be upgraded.
-	EphemeralRunnerPhaseOutdated EphemeralRunnerPhase = "Outdated"
-)
-
-func (s *EphemeralRunnerStatus) LastFailure() metav1.Time {
-	var maxTime metav1.Time
-	if len(s.Failures) == 0 {
-		return maxTime
-	}
-
-	for _, ts := range s.Failures {
-		if ts.After(maxTime.Time) {
-			maxTime = ts
-		}
-	}
-	return maxTime
-}
-
 // +kubebuilder:object:root=true
 
 // EphemeralRunnerList contains a list of EphemeralRunner

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

@@ -28,8 +28,6 @@ type EphemeralRunnerSetSpec struct {
 	PatchID int `json:"patchID"`
 	// EphemeralRunnerSpec is the spec of the ephemeral runner
 	EphemeralRunnerSpec EphemeralRunnerSpec `json:"ephemeralRunnerSpec,omitempty"`
-	// +optional
-	EphemeralRunnerMetadata *ResourceMeta `json:"ephemeralRunnerMetadata,omitempty"`
 }
 
 // EphemeralRunnerSetStatus defines the observed state of EphemeralRunnerSet
@@ -42,20 +40,8 @@ type EphemeralRunnerSetStatus struct {
 	RunningEphemeralRunners int `json:"runningEphemeralRunners"`
 	// +optional
 	FailedEphemeralRunners int `json:"failedEphemeralRunners"`
-	// +optional
-	Phase EphemeralRunnerSetPhase `json:"phase"`
 }
 
-// EphemeralRunnerSetPhase is the phase of the ephemeral runner set resource
-type EphemeralRunnerSetPhase string
-
-const (
-	EphemeralRunnerSetPhaseRunning EphemeralRunnerSetPhase = "Running"
-	// EphemeralRunnerSetPhaseOutdated is set when at least one ephemeral runner
-	// contains the outdated phase
-	EphemeralRunnerSetPhaseOutdated EphemeralRunnerSetPhase = "Outdated"
-)
-
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=".spec.replicas",name="DesiredReplicas",type="integer"
@@ -74,35 +60,9 @@ type EphemeralRunnerSet struct {
 	Status EphemeralRunnerSetStatus `json:"status,omitempty"`
 }
 
-func (ers *EphemeralRunnerSet) GitHubConfigSecret() string {
-	return ers.Spec.EphemeralRunnerSpec.GitHubConfigSecret
-}
-
-func (ers *EphemeralRunnerSet) GitHubConfigUrl() string {
-	return ers.Spec.EphemeralRunnerSpec.GitHubConfigUrl
-}
-
-func (ers *EphemeralRunnerSet) GitHubProxy() *ProxyConfig {
-	return ers.Spec.EphemeralRunnerSpec.Proxy
-}
-
-func (ers *EphemeralRunnerSet) GitHubServerTLS() *TLSConfig {
-	return ers.Spec.EphemeralRunnerSpec.GitHubServerTLS
-}
-
-func (ers *EphemeralRunnerSet) VaultConfig() *VaultConfig {
-	return ers.Spec.EphemeralRunnerSpec.VaultConfig
-}
-
-func (ers *EphemeralRunnerSet) VaultProxy() *ProxyConfig {
-	if ers.Spec.EphemeralRunnerSpec.VaultConfig != nil {
-		return ers.Spec.EphemeralRunnerSpec.VaultConfig.Proxy
-	}
-	return nil
-}
+// +kubebuilder:object:root=true
 
 // EphemeralRunnerSetList contains a list of EphemeralRunnerSet
-// +kubebuilder:object:root=true
 type EphemeralRunnerSetList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`

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

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

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

@@ -1,72 +0,0 @@
-package v1alpha1
-
-import "strings"
-
-func IsVersionAllowed(resourceVersion, buildVersion string) bool {
-	if buildVersion == "dev" || resourceVersion == buildVersion || strings.HasPrefix(buildVersion, "canary-") {
-		return true
-	}
-
-	rv, ok := parseSemver(resourceVersion)
-	if !ok {
-		return false
-	}
-	bv, ok := parseSemver(buildVersion)
-	if !ok {
-		return false
-	}
-	return rv.major == bv.major && rv.minor == bv.minor
-}
-
-type semver struct {
-	major string
-	minor string
-}
-
-func parseSemver(v string) (p semver, ok bool) {
-	if v == "" {
-		return
-	}
-	p.major, v, ok = parseInt(v)
-	if !ok {
-		return p, false
-	}
-	if v == "" {
-		p.minor = "0"
-		return p, true
-	}
-	if v[0] != '.' {
-		return p, false
-	}
-	p.minor, v, ok = parseInt(v[1:])
-	if !ok {
-		return p, false
-	}
-	if v == "" {
-		return p, true
-	}
-	if v[0] != '.' {
-		return p, false
-	}
-	if _, _, ok = parseInt(v[1:]); !ok {
-		return p, false
-	}
-	return p, true
-}
-
-func parseInt(v string) (t, rest string, ok bool) {
-	if v == "" {
-		return
-	}
-	if v[0] < '0' || '9' < v[0] {
-		return
-	}
-	i := 1
-	for i < len(v) && '0' <= v[i] && v[i] <= '9' {
-		i++
-	}
-	if v[0] == '0' && i != 1 {
-		return
-	}
-	return v[:i], v[i:], true
-}

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

@@ -1,60 +0,0 @@
-package v1alpha1_test
-
-import (
-	"testing"
-
-	"github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestIsVersionAllowed(t *testing.T) {
-	t.Parallel()
-	tt := map[string]struct {
-		resourceVersion string
-		buildVersion    string
-		want            bool
-	}{
-		"dev should always be allowed": {
-			resourceVersion: "0.11.0",
-			buildVersion:    "dev",
-			want:            true,
-		},
-		"resourceVersion is not semver": {
-			resourceVersion: "dev",
-			buildVersion:    "0.11.0",
-			want:            false,
-		},
-		"buildVersion is not semver": {
-			resourceVersion: "0.11.0",
-			buildVersion:    "NA",
-			want:            false,
-		},
-		"major version mismatch": {
-			resourceVersion: "0.11.0",
-			buildVersion:    "1.11.0",
-			want:            false,
-		},
-		"minor version mismatch": {
-			resourceVersion: "0.11.0",
-			buildVersion:    "0.10.0",
-			want:            false,
-		},
-		"patch version mismatch": {
-			resourceVersion: "0.11.1",
-			buildVersion:    "0.11.0",
-			want:            true,
-		},
-		"arbitrary version match": {
-			resourceVersion: "abc",
-			buildVersion:    "abc",
-			want:            true,
-		},
-	}
-
-	for name, tc := range tt {
-		t.Run(name, func(t *testing.T) {
-			got := v1alpha1.IsVersionAllowed(tc.resourceVersion, tc.buildVersion)
-			assert.Equal(t, tc.want, got)
-		})
-	}
-}

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

@@ -22,7 +22,6 @@ package v1alpha1
 
 import (
 	"k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -100,12 +99,7 @@ func (in *AutoscalingListenerSpec) DeepCopyInto(out *AutoscalingListenerSpec) {
 	}
 	if in.GitHubServerTLS != nil {
 		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
-		*out = new(TLSConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.VaultConfig != nil {
-		in, out := &in.VaultConfig, &out.VaultConfig
-		*out = new(VaultConfig)
+		*out = new(GitHubServerTLSConfig)
 		(*in).DeepCopyInto(*out)
 	}
 	if in.Metrics != nil {
@@ -118,26 +112,6 @@ func (in *AutoscalingListenerSpec) DeepCopyInto(out *AutoscalingListenerSpec) {
 		*out = new(v1.PodTemplateSpec)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.ConfigSecretMetadata != nil {
-		in, out := &in.ConfigSecretMetadata, &out.ConfigSecretMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ServiceAccountMetadata != nil {
-		in, out := &in.ServiceAccountMetadata, &out.ServiceAccountMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.RoleMetadata != nil {
-		in, out := &in.RoleMetadata, &out.RoleMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.RoleBindingMetadata != nil {
-		in, out := &in.RoleBindingMetadata, &out.RoleBindingMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AutoscalingListenerSpec.
@@ -227,11 +201,6 @@ func (in *AutoscalingRunnerSetList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AutoscalingRunnerSetSpec) DeepCopyInto(out *AutoscalingRunnerSetSpec) {
 	*out = *in
-	if in.RunnerScaleSetLabels != nil {
-		in, out := &in.RunnerScaleSetLabels, &out.RunnerScaleSetLabels
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
 	if in.Proxy != nil {
 		in, out := &in.Proxy, &out.Proxy
 		*out = new(ProxyConfig)
@@ -239,20 +208,10 @@ func (in *AutoscalingRunnerSetSpec) DeepCopyInto(out *AutoscalingRunnerSetSpec)
 	}
 	if in.GitHubServerTLS != nil {
 		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
-		*out = new(TLSConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.VaultConfig != nil {
-		in, out := &in.VaultConfig, &out.VaultConfig
-		*out = new(VaultConfig)
+		*out = new(GitHubServerTLSConfig)
 		(*in).DeepCopyInto(*out)
 	}
 	in.Template.DeepCopyInto(&out.Template)
-	if in.AutoscalingListenerMetadata != nil {
-		in, out := &in.AutoscalingListenerMetadata, &out.AutoscalingListenerMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.ListenerMetrics != nil {
 		in, out := &in.ListenerMetrics, &out.ListenerMetrics
 		*out = new(MetricsConfig)
@@ -263,41 +222,6 @@ func (in *AutoscalingRunnerSetSpec) DeepCopyInto(out *AutoscalingRunnerSetSpec)
 		*out = new(v1.PodTemplateSpec)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.ListenerServiceAccountMetadata != nil {
-		in, out := &in.ListenerServiceAccountMetadata, &out.ListenerServiceAccountMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ListenerRoleMetadata != nil {
-		in, out := &in.ListenerRoleMetadata, &out.ListenerRoleMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ListenerRoleBindingMetadata != nil {
-		in, out := &in.ListenerRoleBindingMetadata, &out.ListenerRoleBindingMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ListenerConfigSecretMetadata != nil {
-		in, out := &in.ListenerConfigSecretMetadata, &out.ListenerConfigSecretMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.EphemeralRunnerSetMetadata != nil {
-		in, out := &in.EphemeralRunnerSetMetadata, &out.EphemeralRunnerSetMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.EphemeralRunnerMetadata != nil {
-		in, out := &in.EphemeralRunnerMetadata, &out.EphemeralRunnerMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.EphemeralRunnerConfigSecretMetadata != nil {
-		in, out := &in.EphemeralRunnerConfigSecretMetadata, &out.EphemeralRunnerConfigSecretMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.MaxRunners != nil {
 		in, out := &in.MaxRunners, &out.MaxRunners
 		*out = new(int)
@@ -335,21 +259,6 @@ func (in *AutoscalingRunnerSetStatus) DeepCopy() *AutoscalingRunnerSetStatus {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AzureKeyVaultConfig) DeepCopyInto(out *AzureKeyVaultConfig) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureKeyVaultConfig.
-func (in *AzureKeyVaultConfig) DeepCopy() *AzureKeyVaultConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(AzureKeyVaultConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *CounterMetric) DeepCopyInto(out *CounterMetric) {
 	*out = *in
@@ -492,11 +401,6 @@ func (in *EphemeralRunnerSetList) DeepCopyObject() runtime.Object {
 func (in *EphemeralRunnerSetSpec) DeepCopyInto(out *EphemeralRunnerSetSpec) {
 	*out = *in
 	in.EphemeralRunnerSpec.DeepCopyInto(&out.EphemeralRunnerSpec)
-	if in.EphemeralRunnerMetadata != nil {
-		in, out := &in.EphemeralRunnerMetadata, &out.EphemeralRunnerMetadata
-		*out = new(ResourceMeta)
-		(*in).DeepCopyInto(*out)
-	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EphemeralRunnerSetSpec.
@@ -527,24 +431,14 @@ func (in *EphemeralRunnerSetStatus) DeepCopy() *EphemeralRunnerSetStatus {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *EphemeralRunnerSpec) DeepCopyInto(out *EphemeralRunnerSpec) {
 	*out = *in
-	if in.GitHubServerTLS != nil {
-		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
-		*out = new(TLSConfig)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.Proxy != nil {
 		in, out := &in.Proxy, &out.Proxy
 		*out = new(ProxyConfig)
 		(*in).DeepCopyInto(*out)
 	}
-	if in.VaultConfig != nil {
-		in, out := &in.VaultConfig, &out.VaultConfig
-		*out = new(VaultConfig)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.EphemeralRunnerConfigSecretMetadata != nil {
-		in, out := &in.EphemeralRunnerConfigSecretMetadata, &out.EphemeralRunnerConfigSecretMetadata
-		*out = new(ResourceMeta)
+	if in.GitHubServerTLS != nil {
+		in, out := &in.GitHubServerTLS, &out.GitHubServerTLS
+		*out = new(GitHubServerTLSConfig)
 		(*in).DeepCopyInto(*out)
 	}
 	in.PodTemplateSpec.DeepCopyInto(&out.PodTemplateSpec)
@@ -565,9 +459,9 @@ func (in *EphemeralRunnerStatus) DeepCopyInto(out *EphemeralRunnerStatus) {
 	*out = *in
 	if in.Failures != nil {
 		in, out := &in.Failures, &out.Failures
-		*out = make(map[string]metav1.Time, len(*in))
+		*out = make(map[string]bool, len(*in))
 		for key, val := range *in {
-			(*out)[key] = *val.DeepCopy()
+			(*out)[key] = val
 		}
 	}
 }
@@ -602,6 +496,26 @@ func (in *GaugeMetric) DeepCopy() *GaugeMetric {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *GitHubServerTLSConfig) DeepCopyInto(out *GitHubServerTLSConfig) {
+	*out = *in
+	if in.CertificateFrom != nil {
+		in, out := &in.CertificateFrom, &out.CertificateFrom
+		*out = new(TLSCertificateSource)
+		(*in).DeepCopyInto(*out)
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitHubServerTLSConfig.
+func (in *GitHubServerTLSConfig) DeepCopy() *GitHubServerTLSConfig {
+	if in == nil {
+		return nil
+	}
+	out := new(GitHubServerTLSConfig)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *HistogramMetric) DeepCopyInto(out *HistogramMetric) {
 	*out = *in
@@ -735,35 +649,6 @@ func (in *ProxyServerConfig) DeepCopy() *ProxyServerConfig {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ResourceMeta) DeepCopyInto(out *ResourceMeta) {
-	*out = *in
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.Annotations != nil {
-		in, out := &in.Annotations, &out.Annotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceMeta.
-func (in *ResourceMeta) DeepCopy() *ResourceMeta {
-	if in == nil {
-		return nil
-	}
-	out := new(ResourceMeta)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TLSCertificateSource) DeepCopyInto(out *TLSCertificateSource) {
 	*out = *in
@@ -783,48 +668,3 @@ func (in *TLSCertificateSource) DeepCopy() *TLSCertificateSource {
 	in.DeepCopyInto(out)
 	return out
 }
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TLSConfig) DeepCopyInto(out *TLSConfig) {
-	*out = *in
-	if in.CertificateFrom != nil {
-		in, out := &in.CertificateFrom, &out.CertificateFrom
-		*out = new(TLSCertificateSource)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TLSConfig.
-func (in *TLSConfig) DeepCopy() *TLSConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(TLSConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *VaultConfig) DeepCopyInto(out *VaultConfig) {
-	*out = *in
-	if in.AzureKeyVault != nil {
-		in, out := &in.AzureKeyVault, &out.AzureKeyVault
-		*out = new(AzureKeyVaultConfig)
-		**out = **in
-	}
-	if in.Proxy != nil {
-		in, out := &in.Proxy, &out.Proxy
-		*out = new(ProxyConfig)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VaultConfig.
-func (in *VaultConfig) DeepCopy() *VaultConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(VaultConfig)
-	in.DeepCopyInto(out)
-	return out
-}

apis/actions.summerwind.net/v1alpha1/runner_types.go

@@ -215,10 +215,10 @@ func (rs *RunnerSpec) validateRepository() error {
 		foundCount += 1
 	}
 	if foundCount == 0 {
-		return errors.New("spec needs enterprise, organization or repository")
+		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")
+		return errors.New("Spec cannot have many fields defined enterprise, organization and repository")
 	}
 
 	return nil

apis/actions.summerwind.net/v1alpha1/runner_webhook.go

@@ -18,11 +18,14 @@ package v1alpha1
 
 import (
 	"context"
+	"fmt"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"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"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
@@ -30,7 +33,8 @@ import (
 var runnerLog = logf.Log.WithName("runner-resource")
 
 func (r *Runner) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr, r).
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
 		WithDefaulter(&RunnerDefaulter{}).
 		WithValidator(&RunnerValidator{}).
 		Complete()
@@ -38,35 +42,44 @@ func (r *Runner) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 // +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
 
-var _ admission.Defaulter[*Runner] = &RunnerDefaulter{}
+var _ webhook.CustomDefaulter = &RunnerDefaulter{}
 
 type RunnerDefaulter struct{}
 
-// Default implements [admission.Defaulter].
-func (in *RunnerDefaulter) Default(ctx context.Context, obj *Runner) error {
+// Default implements webhook.Defaulter so a webhook will be registered for the type
+func (*RunnerDefaulter) Default(ctx context.Context, obj runtime.Object) error {
+	// Nothing to do.
 	return nil
 }
 
 // +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
 
-var _ admission.Validator[*Runner] = &RunnerValidator{}
+var _ webhook.CustomValidator = &RunnerValidator{}
 
 type RunnerValidator struct{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerValidator) ValidateCreate(ctx context.Context, r *Runner) (admission.Warnings, error) {
+func (*RunnerValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*Runner)
+	if !ok {
+		return nil, fmt.Errorf("expected Runner object, got %T", obj)
+	}
 	runnerLog.Info("validate resource to be created", "name", r.Name)
 	return nil, r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerValidator) ValidateUpdate(ctx context.Context, old, r *Runner) (admission.Warnings, error) {
+func (*RunnerValidator) ValidateUpdate(ctx context.Context, old, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*Runner)
+	if !ok {
+		return nil, fmt.Errorf("expected Runner object, got %T", obj)
+	}
 	runnerLog.Info("validate resource to be updated", "name", r.Name)
 	return nil, r.Validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerValidator) ValidateDelete(ctx context.Context, obj *Runner) (admission.Warnings, error) {
+func (*RunnerValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 

apis/actions.summerwind.net/v1alpha1/runnerdeployment_webhook.go

@@ -18,11 +18,14 @@ package v1alpha1
 
 import (
 	"context"
+	"fmt"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"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"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
@@ -30,7 +33,8 @@ import (
 var runnerDeploymentLog = logf.Log.WithName("runnerdeployment-resource")
 
 func (r *RunnerDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr, r).
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
 		WithDefaulter(&RunnerDeploymentDefaulter{}).
 		WithValidator(&RunnerDeploymentValidator{}).
 		Complete()
@@ -38,36 +42,44 @@ func (r *RunnerDeployment) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 // +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
 
-var _ admission.Defaulter[*RunnerDeployment] = &RunnerDeploymentDefaulter{}
+var _ webhook.CustomDefaulter = &RunnerDeploymentDefaulter{}
 
 type RunnerDeploymentDefaulter struct{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
-func (*RunnerDeploymentDefaulter) Default(context.Context, *RunnerDeployment) error {
+func (*RunnerDeploymentDefaulter) Default(context.Context, runtime.Object) error {
 	// Nothing to do.
 	return nil
 }
 
 // +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
 
-var _ admission.Validator[*RunnerDeployment] = &RunnerDeploymentValidator{}
+var _ webhook.CustomValidator = &RunnerDeploymentValidator{}
 
 type RunnerDeploymentValidator struct{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerDeploymentValidator) ValidateCreate(ctx context.Context, r *RunnerDeployment) (admission.Warnings, error) {
+func (*RunnerDeploymentValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*RunnerDeployment)
+	if !ok {
+		return nil, fmt.Errorf("expected RunnerDeployment object, got %T", obj)
+	}
 	runnerDeploymentLog.Info("validate resource to be created", "name", r.Name)
 	return nil, r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerDeploymentValidator) ValidateUpdate(ctx context.Context, old, r *RunnerDeployment) (admission.Warnings, error) {
+func (*RunnerDeploymentValidator) ValidateUpdate(ctx context.Context, old, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*RunnerDeployment)
+	if !ok {
+		return nil, fmt.Errorf("expected RunnerDeployment object, got %T", obj)
+	}
 	runnerDeploymentLog.Info("validate resource to be updated", "name", r.Name)
 	return nil, r.Validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerDeploymentValidator) ValidateDelete(context.Context, *RunnerDeployment) (admission.Warnings, error) {
+func (*RunnerDeploymentValidator) ValidateDelete(context.Context, runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 

apis/actions.summerwind.net/v1alpha1/runnerreplicaset_webhook.go

@@ -18,11 +18,14 @@ package v1alpha1
 
 import (
 	"context"
+	"fmt"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"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"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
@@ -30,7 +33,8 @@ import (
 var runnerReplicaSetLog = logf.Log.WithName("runnerreplicaset-resource")
 
 func (r *RunnerReplicaSet) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr, r).
+	return ctrl.NewWebhookManagedBy(mgr).
+		For(r).
 		WithDefaulter(&RunnerReplicaSetDefaulter{}).
 		WithValidator(&RunnerReplicaSetValidator{}).
 		Complete()
@@ -38,36 +42,44 @@ func (r *RunnerReplicaSet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 // +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
 
-var _ admission.Defaulter[*RunnerReplicaSet] = &RunnerReplicaSetDefaulter{}
+var _ webhook.CustomDefaulter = &RunnerReplicaSetDefaulter{}
 
 type RunnerReplicaSetDefaulter struct{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type
-func (*RunnerReplicaSetDefaulter) Default(context.Context, *RunnerReplicaSet) error {
+func (*RunnerReplicaSetDefaulter) Default(context.Context, runtime.Object) error {
 	// Nothing to do.
 	return nil
 }
 
 // +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
 
-var _ admission.Validator[*RunnerReplicaSet] = &RunnerReplicaSetValidator{}
+var _ webhook.CustomValidator = &RunnerReplicaSetValidator{}
 
 type RunnerReplicaSetValidator struct{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerReplicaSetValidator) ValidateCreate(ctx context.Context, r *RunnerReplicaSet) (admission.Warnings, error) {
+func (*RunnerReplicaSetValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*RunnerReplicaSet)
+	if !ok {
+		return nil, fmt.Errorf("expected RunnerReplicaSet object, got %T", obj)
+	}
 	runnerReplicaSetLog.Info("validate resource to be created", "name", r.Name)
 	return nil, r.Validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerReplicaSetValidator) ValidateUpdate(ctx context.Context, old, r *RunnerReplicaSet) (admission.Warnings, error) {
+func (*RunnerReplicaSetValidator) ValidateUpdate(ctx context.Context, old, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*RunnerReplicaSet)
+	if !ok {
+		return nil, fmt.Errorf("expected RunnerReplicaSet object, got %T", obj)
+	}
 	runnerReplicaSetLog.Info("validate resource to be updated", "name", r.Name)
 	return nil, r.Validate()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (*RunnerReplicaSetValidator) ValidateDelete(context.Context, *RunnerReplicaSet) (admission.Warnings, error) {
+func (*RunnerReplicaSetValidator) ValidateDelete(context.Context, runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 

apis/actions.summerwind.net/v1alpha1/zz_generated.deepcopy.go

@@ -23,7 +23,7 @@ package v1alpha1
 import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime"
 )
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.

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

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

charts/.ci/ct-config.yaml

@@ -1,9 +1,7 @@
 # This file defines the config for "ct" (chart tester) used by the helm linting GitHub workflow
-remote: origin
-target-branch: master
 lint-conf: charts/.ci/lint-config.yaml
 chart-repos:
   - jetstack=https://charts.jetstack.io
 check-version-increment: false # Disable checking that the chart version has been bumped
 charts:
-  - charts/actions-runner-controller
+- charts/actions-runner-controller

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

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+
 for chart in `ls charts`;
 do
 helm template --values charts/$chart/ci/ci-values.yaml charts/$chart | kube-score score - \
@@ -11,4 +12,4 @@ helm template --values charts/$chart/ci/ci-values.yaml charts/$chart | kube-scor
     --enable-optional-test container-security-context-privileged \
     --enable-optional-test container-security-context-readonlyrootfilesystem \
     --ignore-test container-security-context
-done
+done

charts/actions-runner-controller/README.md

@@ -44,7 +44,7 @@ All additional docs are kept in the `docs/` folder, this README is solely for do
 | `image.pullPolicy`                                        | The pull policy of the controller image                                                                                                   | IfNotPresent                                                                                    |
 | `metrics.serviceMonitor.enable`                           | Deploy serviceMonitor kind for for use with prometheus-operator CRDs                                                                      | false                                                                                           |
 | `metrics.serviceMonitor.interval`                         | Configure the interval that Prometheus should scrap the controller's metrics                                                              | 1m                                                                                              |
-| `metrics.serviceMonitor.namespace`                        | Namespace which Prometheus is running in                                                                                                  | `Release.Namespace` (the default namespace of the helm chart).                                  |
+| `metrics.serviceMonitor.namespace                         | Namespace which Prometheus is running in                                                                                                  | `Release.Namespace` (the default namespace of the helm chart).                                  |
 | `metrics.serviceMonitor.timeout`                          | Configure the timeout the timeout of Prometheus scrapping.                                                                                | 30s                                                                                             |
 | `metrics.serviceAnnotations`                              | Set annotations for the provisioned metrics service resource                                                                              |                                                                                                 |
 | `metrics.port`                                            | Set port of metrics service                                                                                                               | 8443                                                                                            |

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

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: horizontalrunnerautoscalers.actions.summerwind.dev
 spec:
   group: actions.summerwind.dev
@@ -12,313 +12,306 @@ spec:
     listKind: HorizontalRunnerAutoscalerList
     plural: horizontalrunnerautoscalers
     shortNames:
-    - hra
+      - 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
-      type: string
-    name: v1alpha1
-    schema:
-      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
-          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
-              githubAPICredentialsFrom:
-                properties:
-                  secretRef:
+    - 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
+          type: string
+      name: v1alpha1
+      schema:
+        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
+            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
-                    required:
-                    - name
+                      replicas:
+                        type: integer
                     type: object
-                type: object
-              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:
+                  type: array
+                githubAPICredentialsFrom:
                   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:
+                    secretRef:
+                      properties:
+                        name:
+                          type: string
+                      required:
+                        - name
+                      type: object
+                  type: object
+                maxReplicas:
+                  description: MaxReplicas is the maximum number of replicas the deployment is allowed to scale
+                  type: integer
+                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
-                      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.
-                        It can be TotalNumberOfQueuedAndInProgressWorkflowRuns or PercentageRunnersBusy.
-                      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 is the reference to scaled resource like
-                  RunnerDeployment
-                properties:
-                  kind:
-                    description: Kind is the type of resource being referenced
-                    enum:
-                    - RunnerDeployment
-                    - RunnerSet
-                    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.
-
-                  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.
-                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:
+                      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.
+                          It can be TotalNumberOfQueuedAndInProgressWorkflowRuns or PercentageRunnersBusy.
+                        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: |-
-                    ScheduledOverride can be used to override a few fields of HorizontalRunnerAutoscalerSpec on schedule.
-                    A schedule can optionally be recurring, so that the corresponding override happens every day, week, month, or year.
+                    ScaleDownDelaySecondsAfterScaleUp is the approximate delay for a scale down followed by a scale up
+                    Used to prevent flapping (down->up->down->... loop)
+                  type: integer
+                scaleTargetRef:
+                  description: ScaleTargetRef is the reference to scaled resource like RunnerDeployment
                   properties:
-                    endTime:
-                      description: EndTime is the time at which the first override
-                        ends.
-                      format: date-time
+                    kind:
+                      description: Kind is the type of resource being referenced
+                      enum:
+                        - RunnerDeployment
+                        - RunnerSet
                       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
+                    name:
+                      description: Name is the name of resource being referenced
                       type: string
-                  required:
-                  - endTime
-                  - startTime
                   type: object
-                type: array
-            type: object
-          status:
-            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.
-                type: string
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
+                scaleUpTriggers:
+                  description: |-
+                    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.
+                  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 corresponding 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:
+              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.
+                  type: string
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+  preserveUnknownFields: false

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

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: runnersets.actions.summerwind.dev
 spec:
   group: actions.summerwind.dev
@@ -554,6 +554,7 @@ spec:
                                               pod labels will be ignored. The default value is empty.
                                               The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                               Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                              This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                             items:
                                               type: string
                                             type: array
@@ -568,6 +569,7 @@ spec:
                                               pod labels will be ignored. The default value is empty.
                                               The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                               Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                              This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                             items:
                                               type: string
                                             type: array
@@ -728,6 +730,7 @@ spec:
                                           pod labels will be ignored. The default value is empty.
                                           The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                           Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                          This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                         items:
                                           type: string
                                         type: array
@@ -742,6 +745,7 @@ spec:
                                           pod labels will be ignored. The default value is empty.
                                           The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                           Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                          This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                         items:
                                           type: string
                                         type: array
@@ -830,8 +834,8 @@ spec:
                                     most preferred is the one with the greatest sum of weights, i.e.
                                     for each node that meets all of the scheduling requirements (resource
                                     request, requiredDuringScheduling anti-affinity expressions, etc.),
-                                    compute a sum by iterating through the elements of this field and subtracting
-                                    "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                                    compute a sum by iterating through the elements of this field and adding
+                                    "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
                                     node(s) with the highest sum are the most preferred.
                                   items:
                                     description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most preferred node(s)
@@ -895,6 +899,7 @@ spec:
                                               pod labels will be ignored. The default value is empty.
                                               The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                               Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                              This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                             items:
                                               type: string
                                             type: array
@@ -909,6 +914,7 @@ spec:
                                               pod labels will be ignored. The default value is empty.
                                               The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                               Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                              This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                             items:
                                               type: string
                                             type: array
@@ -1069,6 +1075,7 @@ spec:
                                           pod labels will be ignored. The default value is empty.
                                           The same key is forbidden to exist in both matchLabelKeys and labelSelector.
                                           Also, matchLabelKeys cannot be set when labelSelector isn't set.
+                                          This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                         items:
                                           type: string
                                         type: array
@@ -1083,6 +1090,7 @@ spec:
                                           pod labels will be ignored. The default value is empty.
                                           The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
                                           Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
+                                          This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
                                         items:
                                           type: string
                                         type: array
@@ -1209,9 +1217,7 @@ spec:
                                   description: EnvVar represents an environment variable present in a Container.
                                   properties:
                                     name:
-                                      description: |-
-                                        Name of the environment variable.
-                                        May consist of any printable ASCII characters except '='.
+                                      description: Name of the environment variable. Must be a C_IDENTIFIER.
                                       type: string
                                     value:
                                       description: |-
@@ -1265,42 +1271,6 @@ spec:
                                             - fieldPath
                                           type: object
                                           x-kubernetes-map-type: atomic
-                                        fileKeyRef:
-                                          description: |-
-                                            FileKeyRef selects a key of the env file.
-                                            Requires the EnvFiles feature gate to be enabled.
-                                          properties:
-                                            key:
-                                              description: |-
-                                                The key within the env file. An invalid key will prevent the pod from starting.
-                                                The keys defined within a source may consist of any printable ASCII characters except '='.
-                                                During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
-                                              type: string
-                                            optional:
-                                              default: false
-                                              description: |-
-                                                Specify whether the file or its key must be defined. If the file or key
-                                                does not exist, then the env var is not published.
-                                                If optional is set to true and the specified key does not exist,
-                                                the environment variable will not be set in the Pod's containers.
-
-                                                If optional is set to false and the specified key does not exist,
-                                                an error will be returned during Pod creation.
-                                              type: boolean
-                                            path:
-                                              description: |-
-                                                The path within the volume from which to select the file.
-                                                Must be relative and may not contain the '..' path or start with '..'.
-                                              type: string
-                                            volumeName:
-                                              description: The name of the volume mount containing the env file.
-                                              type: string
-                                          required:
-                                            - key
-                                            - path
-                                            - volumeName
-                                          type: object
-                                          x-kubernetes-map-type: atomic
                                         resourceFieldRef:
                                           description: |-
                                             Selects a resource of the container: only resources limits and requests
@@ -1356,13 +1326,13 @@ spec:
                               envFrom:
                                 description: |-
                                   List of sources to populate environment variables in the container.
-                                  The keys defined within a source may consist of any printable ASCII characters except '='.
-                                  When a key exists in multiple
+                                  The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                                  will be reported as an event when the container is starting. When a key exists in multiple
                                   sources, the value associated with the last source will take precedence.
                                   Values defined by an Env with a duplicate key will take precedence.
                                   Cannot be updated.
                                 items:
-                                  description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                                  description: EnvFromSource represents the source of a set of ConfigMaps
                                   properties:
                                     configMapRef:
                                       description: The ConfigMap to select from
@@ -1382,9 +1352,7 @@ spec:
                                       type: object
                                       x-kubernetes-map-type: atomic
                                     prefix:
-                                      description: |-
-                                        Optional text to prepend to the name of each environment variable.
-                                        May consist of any printable ASCII characters except '='.
+                                      description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
                                       type: string
                                     secretRef:
                                       description: The Secret to select from
@@ -1633,12 +1601,6 @@ spec:
                                           - port
                                         type: object
                                     type: object
-                                  stopSignal:
-                                    description: |-
-                                      StopSignal defines which signal will be sent to a container when it is being stopped.
-                                      If not specified, the default is defined by the container runtime in use.
-                                      StopSignal can only be set for Pods with a non-empty .spec.os.name
-                                    type: string
                                 type: object
                               livenessProbe:
                                 description: |-
@@ -1998,9 +1960,7 @@ spec:
                                     type: integer
                                 type: object
                               resizePolicy:
-                                description: |-
-                                  Resources resize policy for the container.
-                                  This field cannot be set on ephemeral containers.
+                                description: Resources resize policy for the container.
                                 items:
                                   description: ContainerResizePolicy represents resource resize policy for the container.
                                   properties:
@@ -2031,7 +1991,7 @@ spec:
                                       Claims lists the names of resources, defined in spec.resourceClaims,
                                       that are used by this container.
 
-                                      This field depends on the
+                                      This is an alpha field and requires enabling the
                                       DynamicResourceAllocation feature gate.
 
                                       This field is immutable. It can only be set for containers.
@@ -2082,10 +2042,10 @@ spec:
                               restartPolicy:
                                 description: |-
                                   RestartPolicy defines the restart behavior of individual containers in a pod.
-                                  This overrides the pod-level restart policy. When this field is not specified,
+                                  This field may only be set for init containers, and the only allowed value is "Always".
+                                  For non-init containers or when this field is not specified,
                                   the restart behavior is defined by the Pod's restart policy and the container type.
-                                  Additionally, setting the RestartPolicy as "Always" for the init container will
-                                  have the following effect:
+                                  Setting the RestartPolicy as "Always" for the init container will have the following effect:
                                   this init container will be continually restarted on
                                   exit until all regular containers have terminated. Once all regular
                                   containers have completed, all init containers with restartPolicy "Always"
@@ -2097,57 +2057,6 @@ spec:
                                   init container is started, or after any startupProbe has successfully
                                   completed.
                                 type: string
-                              restartPolicyRules:
-                                description: |-
-                                  Represents a list of rules to be checked to determine if the
-                                  container should be restarted on exit. The rules are evaluated in
-                                  order. Once a rule matches a container exit condition, the remaining
-                                  rules are ignored. If no rule matches the container exit condition,
-                                  the Container-level restart policy determines the whether the container
-                                  is restarted or not. Constraints on the rules:
-                                  - At most 20 rules are allowed.
-                                  - Rules can have the same action.
-                                  - Identical rules are not forbidden in validations.
-                                  When rules are specified, container MUST set RestartPolicy explicitly
-                                  even it if matches the Pod's RestartPolicy.
-                                items:
-                                  description: ContainerRestartRule describes how a container exit is handled.
-                                  properties:
-                                    action:
-                                      description: |-
-                                        Specifies the action taken on a container exit if the requirements
-                                        are satisfied. The only possible value is "Restart" to restart the
-                                        container.
-                                      type: string
-                                    exitCodes:
-                                      description: Represents the exit codes to check on container exits.
-                                      properties:
-                                        operator:
-                                          description: |-
-                                            Represents the relationship between the container exit code(s) and the
-                                            specified values. Possible values are:
-                                            - In: the requirement is satisfied if the container exit code is in the
-                                              set of specified values.
-                                            - NotIn: the requirement is satisfied if the container exit code is
-                                              not in the set of specified values.
-                                          type: string
-                                        values:
-                                          description: |-
-                                            Specifies the set of values to check for container exit codes.
-                                            At most 255 elements are allowed.
-                                          items:
-                                            format: int32
-                                            type: integer
-                                          type: array
-                                          x-kubernetes-list-type: set
-                                      required:
-                                        - operator
-                                      type: object
-                                  required:
-                                    - action
-                                  type: object
-                                type: array
-                                x-kubernetes-list-type: atomic
                               securityContext:
                                 description: |-
                                   SecurityContext defines the security options the container should be run with.
@@ -2745,9 +2654,7 @@ spec:
                                   description: EnvVar represents an environment variable present in a Container.
                                   properties:
                                     name:
-                                      description: |-
-                                        Name of the environment variable.
-                                        May consist of any printable ASCII characters except '='.
+                                      description: Name of the environment variable. Must be a C_IDENTIFIER.
                                       type: string
                                     value:
                                       description: |-
@@ -2801,42 +2708,6 @@ spec:
                                             - fieldPath
                                           type: object
                                           x-kubernetes-map-type: atomic
-                                        fileKeyRef:
-                                          description: |-
-                                            FileKeyRef selects a key of the env file.
-                                            Requires the EnvFiles feature gate to be enabled.
-                                          properties:
-                                            key:
-                                              description: |-
-                                                The key within the env file. An invalid key will prevent the pod from starting.
-                                                The keys defined within a source may consist of any printable ASCII characters except '='.
-                                                During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
-                                              type: string
-                                            optional:
-                                              default: false
-                                              description: |-
-                                                Specify whether the file or its key must be defined. If the file or key
-                                                does not exist, then the env var is not published.
-                                                If optional is set to true and the specified key does not exist,
-                                                the environment variable will not be set in the Pod's containers.
-
-                                                If optional is set to false and the specified key does not exist,
-                                                an error will be returned during Pod creation.
-                                              type: boolean
-                                            path:
-                                              description: |-
-                                                The path within the volume from which to select the file.
-                                                Must be relative and may not contain the '..' path or start with '..'.
-                                              type: string
-                                            volumeName:
-                                              description: The name of the volume mount containing the env file.
-                                              type: string
-                                          required:
-                                            - key
-                                            - path
-                                            - volumeName
-                                          type: object
-                                          x-kubernetes-map-type: atomic
                                         resourceFieldRef:
                                           description: |-
                                             Selects a resource of the container: only resources limits and requests
@@ -2892,13 +2763,13 @@ spec:
                               envFrom:
                                 description: |-
                                   List of sources to populate environment variables in the container.
-                                  The keys defined within a source may consist of any printable ASCII characters except '='.
-                                  When a key exists in multiple
+                                  The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                                  will be reported as an event when the container is starting. When a key exists in multiple
                                   sources, the value associated with the last source will take precedence.
                                   Values defined by an Env with a duplicate key will take precedence.
                                   Cannot be updated.
                                 items:
-                                  description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                                  description: EnvFromSource represents the source of a set of ConfigMaps
                                   properties:
                                     configMapRef:
                                       description: The ConfigMap to select from
@@ -2918,9 +2789,7 @@ spec:
                                       type: object
                                       x-kubernetes-map-type: atomic
                                     prefix:
-                                      description: |-
-                                        Optional text to prepend to the name of each environment variable.
-                                        May consist of any printable ASCII characters except '='.
+                                      description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
                                       type: string
                                     secretRef:
                                       description: The Secret to select from
@@ -3165,12 +3034,6 @@ spec:
                                           - port
                                         type: object
                                     type: object
-                                  stopSignal:
-                                    description: |-
-                                      StopSignal defines which signal will be sent to a container when it is being stopped.
-                                      If not specified, the default is defined by the container runtime in use.
-                                      StopSignal can only be set for Pods with a non-empty .spec.os.name
-                                    type: string
                                 type: object
                               livenessProbe:
                                 description: Probes are not allowed for ephemeral containers.
@@ -3544,7 +3407,7 @@ spec:
                                       Claims lists the names of resources, defined in spec.resourceClaims,
                                       that are used by this container.
 
-                                      This field depends on the
+                                      This is an alpha field and requires enabling the
                                       DynamicResourceAllocation feature gate.
 
                                       This field is immutable. It can only be set for containers.
@@ -3596,51 +3459,9 @@ spec:
                                 description: |-
                                   Restart policy for the container to manage the restart behavior of each
                                   container within a pod.
-                                  You cannot set this field on ephemeral containers.
-                                type: string
-                              restartPolicyRules:
-                                description: |-
-                                  Represents a list of rules to be checked to determine if the
-                                  container should be restarted on exit. You cannot set this field on
+                                  This may only be set for init containers. You cannot set this field on
                                   ephemeral containers.
-                                items:
-                                  description: ContainerRestartRule describes how a container exit is handled.
-                                  properties:
-                                    action:
-                                      description: |-
-                                        Specifies the action taken on a container exit if the requirements
-                                        are satisfied. The only possible value is "Restart" to restart the
-                                        container.
-                                      type: string
-                                    exitCodes:
-                                      description: Represents the exit codes to check on container exits.
-                                      properties:
-                                        operator:
-                                          description: |-
-                                            Represents the relationship between the container exit code(s) and the
-                                            specified values. Possible values are:
-                                            - In: the requirement is satisfied if the container exit code is in the
-                                              set of specified values.
-                                            - NotIn: the requirement is satisfied if the container exit code is
-                                              not in the set of specified values.
-                                          type: string
-                                        values:
-                                          description: |-
-                                            Specifies the set of values to check for container exit codes.
-                                            At most 255 elements are allowed.
-                                          items:
-                                            format: int32
-                                            type: integer
-                                          type: array
-                                          x-kubernetes-list-type: set
-                                      required:
-                                        - operator
-                                      type: object
-                                  required:
-                                    - action
-                                  type: object
-                                type: array
-                                x-kubernetes-list-type: atomic
+                                type: string
                               securityContext:
                                 description: |-
                                   Optional: SecurityContext defines the security options the ephemeral container should be run with.
@@ -4159,9 +3980,7 @@ spec:
                         hostNetwork:
                           description: |-
                             Host networking requested for this pod. Use the host's network namespace.
-                            When using HostNetwork you should specify ports so the scheduler is aware.
-                            When `hostNetwork` is true, specified `hostPort` fields in port definitions must match `containerPort`,
-                            and unspecified `hostPort` fields in port definitions are defaulted to match `containerPort`.
+                            If this option is set, the ports that will be used must be specified.
                             Default to false.
                           type: boolean
                         hostPID:
@@ -4186,19 +4005,6 @@ spec:
                             Specifies the hostname of the Pod
                             If not specified, the pod's hostname will be set to a system-defined value.
                           type: string
-                        hostnameOverride:
-                          description: |-
-                            HostnameOverride specifies an explicit override for the pod's hostname as perceived by the pod.
-                            This field only specifies the pod's hostname and does not affect its DNS records.
-                            When this field is set to a non-empty string:
-                            - It takes precedence over the values set in `hostname` and `subdomain`.
-                            - The Pod's hostname will be set to this value.
-                            - `setHostnameAsFQDN` must be nil or set to false.
-                            - `hostNetwork` must be set to false.
-
-                            This field must be a valid DNS subdomain as defined in RFC 1123 and contain at most 64 characters.
-                            Requires the HostnameOverride feature gate to be enabled.
-                          type: string
                         imagePullSecrets:
                           description: |-
                             ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the images used by this PodSpec.
@@ -4234,7 +4040,7 @@ spec:
                             Init containers may not have Lifecycle actions, Readiness probes, Liveness probes, or Startup probes.
                             The resourceRequirements of an init container are taken into account during scheduling
                             by finding the highest request/limit for each resource type, and then using the max of
-                            that value or the sum of the normal containers. Limits are applied to init containers
+                            of that value or the sum of the normal containers. Limits are applied to init containers
                             in a similar fashion.
                             Init containers cannot currently be added or removed.
                             Cannot be updated.
@@ -4278,9 +4084,7 @@ spec:
                                   description: EnvVar represents an environment variable present in a Container.
                                   properties:
                                     name:
-                                      description: |-
-                                        Name of the environment variable.
-                                        May consist of any printable ASCII characters except '='.
+                                      description: Name of the environment variable. Must be a C_IDENTIFIER.
                                       type: string
                                     value:
                                       description: |-
@@ -4334,42 +4138,6 @@ spec:
                                             - fieldPath
                                           type: object
                                           x-kubernetes-map-type: atomic
-                                        fileKeyRef:
-                                          description: |-
-                                            FileKeyRef selects a key of the env file.
-                                            Requires the EnvFiles feature gate to be enabled.
-                                          properties:
-                                            key:
-                                              description: |-
-                                                The key within the env file. An invalid key will prevent the pod from starting.
-                                                The keys defined within a source may consist of any printable ASCII characters except '='.
-                                                During Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.
-                                              type: string
-                                            optional:
-                                              default: false
-                                              description: |-
-                                                Specify whether the file or its key must be defined. If the file or key
-                                                does not exist, then the env var is not published.
-                                                If optional is set to true and the specified key does not exist,
-                                                the environment variable will not be set in the Pod's containers.
-
-                                                If optional is set to false and the specified key does not exist,
-                                                an error will be returned during Pod creation.
-                                              type: boolean
-                                            path:
-                                              description: |-
-                                                The path within the volume from which to select the file.
-                                                Must be relative and may not contain the '..' path or start with '..'.
-                                              type: string
-                                            volumeName:
-                                              description: The name of the volume mount containing the env file.
-                                              type: string
-                                          required:
-                                            - key
-                                            - path
-                                            - volumeName
-                                          type: object
-                                          x-kubernetes-map-type: atomic
                                         resourceFieldRef:
                                           description: |-
                                             Selects a resource of the container: only resources limits and requests
@@ -4425,13 +4193,13 @@ spec:
                               envFrom:
                                 description: |-
                                   List of sources to populate environment variables in the container.
-                                  The keys defined within a source may consist of any printable ASCII characters except '='.
-                                  When a key exists in multiple
+                                  The keys defined within a source must be a C_IDENTIFIER. All invalid keys
+                                  will be reported as an event when the container is starting. When a key exists in multiple
                                   sources, the value associated with the last source will take precedence.
                                   Values defined by an Env with a duplicate key will take precedence.
                                   Cannot be updated.
                                 items:
-                                  description: EnvFromSource represents the source of a set of ConfigMaps or Secrets
+                                  description: EnvFromSource represents the source of a set of ConfigMaps
                                   properties:
                                     configMapRef:
                                       description: The ConfigMap to select from
@@ -4451,9 +4219,7 @@ spec:
                                       type: object
                                       x-kubernetes-map-type: atomic
                                     prefix:
-                                      description: |-
-                                        Optional text to prepend to the name of each environment variable.
-                                        May consist of any printable ASCII characters except '='.
+                                      description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.
                                       type: string
                                     secretRef:
                                       description: The Secret to select from
@@ -4702,12 +4468,6 @@ spec:
                                           - port
                                         type: object
                                     type: object
-                                  stopSignal:
-                                    description: |-
-                                      StopSignal defines which signal will be sent to a container when it is being stopped.
-                                      If not specified, the default is defined by the container runtime in use.
-                                      StopSignal can only be set for Pods with a non-empty .spec.os.name
-                                    type: string
                                 type: object
                               livenessProbe:
                                 description: |-
@@ -5067,9 +4827,7 @@ spec:
                                     type: integer
                                 type: object
                               resizePolicy:
-                                description: |-
-                                  Resources resize policy for the container.
-                                  This field cannot be set on ephemeral containers.
+                                description: Resources resize policy for the container.
                                 items:
                                   description: ContainerResizePolicy represents resource resize policy for the container.
                                   properties:
@@ -5100,7 +4858,7 @@ spec:
                                       Claims lists the names of resources, defined in spec.resourceClaims,
                                       that are used by this container.
 
-                                      This field depends on the
+                                      This is an alpha field and requires enabling the
                                       DynamicResourceAllocation feature gate.
 
                                       This field is immutable. It can only be set for containers.
@@ -5151,10 +4909,10 @@ spec:
                               restartPolicy:
                                 description: |-
                                   RestartPolicy defines the restart behavior of individual containers in a pod.
-                                  This overrides the pod-level restart policy. When this field is not specified,
+                                  This field may only be set for init containers, and the only allowed value is "Always".
+                                  For non-init containers or when this field is not specified,
                                   the restart behavior is defined by the Pod's restart policy and the container type.
-                                  Additionally, setting the RestartPolicy as "Always" for the init container will
-                                  have the following effect:
+                                  Setting the RestartPolicy as "Always" for the init container will have the following effect:
                                   this init container will be continually restarted on
                                   exit until all regular containers have terminated. Once all regular
                                   containers have completed, all init containers with restartPolicy "Always"
@@ -5166,57 +4924,6 @@ spec:
                                   init container is started, or after any startupProbe has successfully
                                   completed.
                                 type: string
-                              restartPolicyRules:
-                                description: |-
-                                  Represents a list of rules to be checked to determine if the
-                                  container should be restarted on exit. The rules are evaluated in
-                                  order. Once a rule matches a container exit condition, the remaining
-                                  rules are ignored. If no rule matches the container exit condition,
-                                  the Container-level restart policy determines the whether the container
-                                  is restarted or not. Constraints on the rules:
-                                  - At most 20 rules are allowed.
-                                  - Rules can have the same action.
-                                  - Identical rules are not forbidden in validations.
-                                  When rules are specified, container MUST set RestartPolicy explicitly
-                                  even it if matches the Pod's RestartPolicy.
-                                items:
-                                  description: ContainerRestartRule describes how a container exit is handled.
-                                  properties:
-                                    action:
-                                      description: |-
-                                        Specifies the action taken on a container exit if the requirements
-                                        are satisfied. The only possible value is "Restart" to restart the
-                                        container.
-                                      type: string
-                                    exitCodes:
-                                      description: Represents the exit codes to check on container exits.
-                                      properties:
-                                        operator:
-                                          description: |-
-                                            Represents the relationship between the container exit code(s) and the
-                                            specified values. Possible values are:
-                                            - In: the requirement is satisfied if the container exit code is in the
-                                              set of specified values.
-                                            - NotIn: the requirement is satisfied if the container exit code is
-                                              not in the set of specified values.
-                                          type: string
-                                        values:
-                                          description: |-
-                                            Specifies the set of values to check for container exit codes.
-                                            At most 255 elements are allowed.
-                                          items:
-                                            format: int32
-                                            type: integer
-                                          type: array
-                                          x-kubernetes-list-type: set
-                                      required:
-                                        - operator
-                                      type: object
-                                  required:
-                                    - action
-                                  type: object
-                                type: array
-                                x-kubernetes-list-type: atomic
                               securityContext:
                                 description: |-
                                   SecurityContext defines the security options the container should be run with.
@@ -5730,7 +5437,6 @@ spec:
                             - spec.hostPID
                             - spec.hostIPC
                             - spec.hostUsers
-                            - spec.resources
                             - spec.securityContext.appArmorProfile
                             - spec.securityContext.seLinuxOptions
                             - spec.securityContext.seccompProfile
@@ -5827,8 +5533,8 @@ spec:
                             will be made available to those containers which consume them
                             by name.
 
-                            This is a stable field but requires that the
-                            DynamicResourceAllocation feature gate is enabled.
+                            This is an alpha field and requires enabling the
+                            DynamicResourceAllocation feature gate.
 
                             This field is immutable.
                           items:
@@ -5882,7 +5588,7 @@ spec:
                           description: |-
                             Resources is the total amount of CPU and Memory resources required by all
                             containers in the pod. It supports specifying Requests and Limits for
-                            "cpu", "memory" and "hugepages-" resource names only. ResourceClaims are not supported.
+                            "cpu" and "memory" resource names only. ResourceClaims are not supported.
 
                             This field enables fine-grained control over resource allocation for the
                             entire pod, allowing resource sharing among containers in a pod.
@@ -5895,7 +5601,7 @@ spec:
                                 Claims lists the names of resources, defined in spec.resourceClaims,
                                 that are used by this container.
 
-                                This field depends on the
+                                This is an alpha field and requires enabling the
                                 DynamicResourceAllocation feature gate.
 
                                 This field is immutable. It can only be set for containers.
@@ -6277,10 +5983,9 @@ spec:
                               operator:
                                 description: |-
                                   Operator represents a key's relationship to the value.
-                                  Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
+                                  Valid operators are Exists and Equal. Defaults to Equal.
                                   Exists is equivalent to wildcard for value, so that a pod can
                                   tolerate all taints of a particular category.
-                                  Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
                                 type: string
                               tolerationSeconds:
                                 description: |-
@@ -6421,6 +6126,7 @@ spec:
                                   - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
 
                                   If this value is nil, the behavior is equivalent to the Honor policy.
+                                  This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
                                 type: string
                               nodeTaintsPolicy:
                                 description: |-
@@ -6431,6 +6137,7 @@ spec:
                                   - Ignore: node taints are ignored. All nodes are included.
 
                                   If this value is nil, the behavior is equivalent to the Ignore policy.
+                                  This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
                                 type: string
                               topologyKey:
                                 description: |-
@@ -7052,7 +6759,7 @@ spec:
                                           resources:
                                             description: |-
                                               resources represents the minimum resources the volume should have.
-                                              Users are allowed to specify resource requirements
+                                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
                                               that are lower than previous value but must still be higher than capacity recorded in the
                                               status field of the claim.
                                               More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -7136,13 +6843,15 @@ spec:
                                               volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
                                               If specified, the CSI driver will create or update the volume with the attributes defined
                                               in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
-                                              it can be changed after the claim is created. An empty string or nil value indicates that no
-                                              VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
-                                              this field can be reset to its previous value (including nil) to cancel the modification.
+                                              it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
+                                              will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
+                                              If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
+                                              will be set by the persistentvolume controller if it exists.
                                               If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
                                               set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
                                               exists.
                                               More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                                              (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                                             type: string
                                           volumeMode:
                                             description: |-
@@ -7316,9 +7025,12 @@ spec:
                                 description: |-
                                   glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime.
                                   Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported.
+                                  More info: https://examples.k8s.io/volumes/glusterfs/README.md
                                 properties:
                                   endpoints:
-                                    description: endpoints is the endpoint name that details Glusterfs topology.
+                                    description: |-
+                                      endpoints is the endpoint name that details Glusterfs topology.
+                                      More info: https://examples.k8s.io/volumes/glusterfs/README.md#create-a-pod
                                     type: string
                                   path:
                                     description: |-
@@ -7372,7 +7084,7 @@ spec:
                                   The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                                   The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
                                   The volume will be mounted read-only (ro) and non-executable files (noexec).
-                                  Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
+                                  Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
                                   The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                                 properties:
                                   pullPolicy:
@@ -7397,7 +7109,7 @@ spec:
                                 description: |-
                                   iscsi represents an ISCSI Disk resource that is attached to a
                                   kubelet's host machine and then exposed to the pod.
-                                  More info: https://kubernetes.io/docs/concepts/storage/volumes/#iscsi
+                                  More info: https://examples.k8s.io/volumes/iscsi/README.md
                                 properties:
                                   chapAuthDiscovery:
                                     description: chapAuthDiscovery defines whether support iSCSI Discovery CHAP authentication
@@ -7787,128 +7499,6 @@ spec:
                                               type: array
                                               x-kubernetes-list-type: atomic
                                           type: object
-                                        podCertificate:
-                                          description: |-
-                                            Projects an auto-rotating credential bundle (private key and certificate
-                                            chain) that the pod can use either as a TLS client or server.
-
-                                            Kubelet generates a private key and uses it to send a
-                                            PodCertificateRequest to the named signer.  Once the signer approves the
-                                            request and issues a certificate chain, Kubelet writes the key and
-                                            certificate chain to the pod filesystem.  The pod does not start until
-                                            certificates have been issued for each podCertificate projected volume
-                                            source in its spec.
-
-                                            Kubelet will begin trying to rotate the certificate at the time indicated
-                                            by the signer using the PodCertificateRequest.Status.BeginRefreshAt
-                                            timestamp.
-
-                                            Kubelet can write a single file, indicated by the credentialBundlePath
-                                            field, or separate files, indicated by the keyPath and
-                                            certificateChainPath fields.
-
-                                            The credential bundle is a single file in PEM format.  The first PEM
-                                            entry is the private key (in PKCS#8 format), and the remaining PEM
-                                            entries are the certificate chain issued by the signer (typically,
-                                            signers will return their certificate chain in leaf-to-root order).
-
-                                            Prefer using the credential bundle format, since your application code
-                                            can read it atomically.  If you use keyPath and certificateChainPath,
-                                            your application must make two separate file reads. If these coincide
-                                            with a certificate rotation, it is possible that the private key and leaf
-                                            certificate you read may not correspond to each other.  Your application
-                                            will need to check for this condition, and re-read until they are
-                                            consistent.
-
-                                            The named signer controls chooses the format of the certificate it
-                                            issues; consult the signer implementation's documentation to learn how to
-                                            use the certificates it issues.
-                                          properties:
-                                            certificateChainPath:
-                                              description: |-
-                                                Write the certificate chain at this path in the projected volume.
-
-                                                Most applications should use credentialBundlePath.  When using keyPath
-                                                and certificateChainPath, your application needs to check that the key
-                                                and leaf certificate are consistent, because it is possible to read the
-                                                files mid-rotation.
-                                              type: string
-                                            credentialBundlePath:
-                                              description: |-
-                                                Write the credential bundle at this path in the projected volume.
-
-                                                The credential bundle is a single file that contains multiple PEM blocks.
-                                                The first PEM block is a PRIVATE KEY block, containing a PKCS#8 private
-                                                key.
-
-                                                The remaining blocks are CERTIFICATE blocks, containing the issued
-                                                certificate chain from the signer (leaf and any intermediates).
-
-                                                Using credentialBundlePath lets your Pod's application code make a single
-                                                atomic read that retrieves a consistent key and certificate chain.  If you
-                                                project them to separate files, your application code will need to
-                                                additionally check that the leaf certificate was issued to the key.
-                                              type: string
-                                            keyPath:
-                                              description: |-
-                                                Write the key at this path in the projected volume.
-
-                                                Most applications should use credentialBundlePath.  When using keyPath
-                                                and certificateChainPath, your application needs to check that the key
-                                                and leaf certificate are consistent, because it is possible to read the
-                                                files mid-rotation.
-                                              type: string
-                                            keyType:
-                                              description: |-
-                                                The type of keypair Kubelet will generate for the pod.
-
-                                                Valid values are "RSA3072", "RSA4096", "ECDSAP256", "ECDSAP384",
-                                                "ECDSAP521", and "ED25519".
-                                              type: string
-                                            maxExpirationSeconds:
-                                              description: |-
-                                                maxExpirationSeconds is the maximum lifetime permitted for the
-                                                certificate.
-
-                                                Kubelet copies this value verbatim into the PodCertificateRequests it
-                                                generates for this projection.
-
-                                                If omitted, kube-apiserver will set it to 86400(24 hours). kube-apiserver
-                                                will reject values shorter than 3600 (1 hour).  The maximum allowable
-                                                value is 7862400 (91 days).
-
-                                                The signer implementation is then free to issue a certificate with any
-                                                lifetime *shorter* than MaxExpirationSeconds, but no shorter than 3600
-                                                seconds (1 hour).  This constraint is enforced by kube-apiserver.
-                                                `kubernetes.io` signers will never issue certificates with a lifetime
-                                                longer than 24 hours.
-                                              format: int32
-                                              type: integer
-                                            signerName:
-                                              description: Kubelet's generated CSRs will be addressed to this signer.
-                                              type: string
-                                            userAnnotations:
-                                              additionalProperties:
-                                                type: string
-                                              description: |-
-                                                userAnnotations allow pod authors to pass additional information to
-                                                the signer implementation.  Kubernetes does not restrict or validate this
-                                                metadata in any way.
-
-                                                These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
-                                                the PodCertificateRequest objects that Kubelet creates.
-
-                                                Entries are subject to the same validation as object metadata annotations,
-                                                with the addition that all keys must be domain-prefixed. No restrictions
-                                                are placed on values, except an overall size limitation on the entire field.
-
-                                                Signers should document the keys and values they support. Signers should
-                                                deny requests that contain keys they do not recognize.
-                                              type: object
-                                          required:
-                                            - keyType
-                                            - signerName
-                                          type: object
                                         secret:
                                           description: secret information about the secret data to project
                                           properties:
@@ -8038,6 +7628,7 @@ spec:
                                 description: |-
                                   rbd represents a Rados Block Device mount on the host that shares a pod's lifetime.
                                   Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported.
+                                  More info: https://examples.k8s.io/volumes/rbd/README.md
                                 properties:
                                   fsType:
                                     description: |-
@@ -8314,42 +7905,6 @@ spec:
                           x-kubernetes-list-map-keys:
                             - name
                           x-kubernetes-list-type: map
-                        workloadRef:
-                          description: |-
-                            WorkloadRef provides a reference to the Workload object that this Pod belongs to.
-                            This field is used by the scheduler to identify the PodGroup and apply the
-                            correct group scheduling policies. The Workload object referenced
-                            by this field may not exist at the time the Pod is created.
-                            This field is immutable, but a Workload object with the same name
-                            may be recreated with different policies. Doing this during pod scheduling
-                            may result in the placement not conforming to the expected policies.
-                          properties:
-                            name:
-                              description: |-
-                                Name defines the name of the Workload object this Pod belongs to.
-                                Workload must be in the same namespace as the Pod.
-                                If it doesn't match any existing Workload, the Pod will remain unschedulable
-                                until a Workload object is created and observed by the kube-scheduler.
-                                It must be a DNS subdomain.
-                              type: string
-                            podGroup:
-                              description: |-
-                                PodGroup is the name of the PodGroup within the Workload that this Pod
-                                belongs to. If it doesn't match any existing PodGroup within the Workload,
-                                the Pod will remain unschedulable until the Workload object is recreated
-                                and observed by the kube-scheduler. It must be a DNS label.
-                              type: string
-                            podGroupReplicaKey:
-                              description: |-
-                                PodGroupReplicaKey specifies the replica key of the PodGroup to which this
-                                Pod belongs. It is used to distinguish pods belonging to different replicas
-                                of the same pod group. The pod group policy is applied separately to each replica.
-                                When set, it must be a DNS label.
-                              type: string
-                          required:
-                            - name
-                            - podGroup
-                          type: object
                       required:
                         - containers
                       type: object
@@ -8371,10 +7926,10 @@ spec:
                             The maximum number of pods that can be unavailable during the update.
                             Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%).
                             Absolute number is calculated from percentage by rounding up. This can not be 0.
-                            Defaults to 1. This field is beta-level and is enabled by default. The field applies to all pods in the range 0 to
+                            Defaults to 1. This field is alpha-level and is only honored by servers that enable the
+                            MaxUnavailableStatefulSet feature. The field applies to all pods in the range 0 to
                             Replicas-1. That means if there is any unavailable pod in the range 0 to Replicas-1, it
                             will be counted towards MaxUnavailable.
-                            This setting might not be effective for the OrderedReady podManagementPolicy. That policy ensures pods are created and become ready one at a time.
                           x-kubernetes-int-or-string: true
                         partition:
                           description: |-
@@ -8531,7 +8086,7 @@ spec:
                           resources:
                             description: |-
                               resources represents the minimum resources the volume should have.
-                              Users are allowed to specify resource requirements
+                              If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
                               that are lower than previous value but must still be higher than capacity recorded in the
                               status field of the claim.
                               More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -8615,13 +8170,15 @@ spec:
                               volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
                               If specified, the CSI driver will create or update the volume with the attributes defined
                               in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
-                              it can be changed after the claim is created. An empty string or nil value indicates that no
-                              VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
-                              this field can be reset to its previous value (including nil) to cancel the modification.
+                              it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
+                              will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
+                              If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
+                              will be set by the persistentvolume controller if it exists.
                               If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
                               set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
                               exists.
                               More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
+                              (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                             type: string
                           volumeMode:
                             description: |-
@@ -8653,7 +8210,7 @@ spec:
                                 that it does not recognizes, then it should ignore that update and let other controllers
                                 handle it.
                               type: string
-                            description: "allocatedResourceStatuses stores status of resource being resized for the given PVC.\nKey names follow standard Kubernetes label syntax. Valid values are either:\n\t* Un-prefixed keys:\n\t\t- storage - the capacity of the volume.\n\t* Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart from above values - keys that are unprefixed or have kubernetes.io prefix are considered\nreserved and hence may not be used.\n\nClaimResourceStatus can be in any of following states:\n\t- ControllerResizeInProgress:\n\t\tState set when resize controller starts resizing the volume in control-plane.\n\t- ControllerResizeFailed:\n\t\tState set when resize has failed in resize controller with a terminal error.\n\t- NodeResizePending:\n\t\tState set when resize controller has finished resizing the volume but further resizing of\n\t\tvolume is needed on the node.\n\t- NodeResizeInProgress:\n\t\tState set when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState set when resizing has failed in kubelet with a terminal error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor example: if expanding a PVC for more capacity - this field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeFailed\"\nWhen this field is not set, it means that no resize operation is in progress for the given PVC.\n\nA controller that receives PVC update with previously unknown resourceName or ClaimResourceStatus\nshould ignore the update for the purpose it was designed. For example - a controller that\nonly is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid\nresources associated with PVC."
+                            description: "allocatedResourceStatuses stores status of resource being resized for the given PVC.\nKey names follow standard Kubernetes label syntax. Valid values are either:\n\t* Un-prefixed keys:\n\t\t- storage - the capacity of the volume.\n\t* Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart from above values - keys that are unprefixed or have kubernetes.io prefix are considered\nreserved and hence may not be used.\n\nClaimResourceStatus can be in any of following states:\n\t- ControllerResizeInProgress:\n\t\tState set when resize controller starts resizing the volume in control-plane.\n\t- ControllerResizeFailed:\n\t\tState set when resize has failed in resize controller with a terminal error.\n\t- NodeResizePending:\n\t\tState set when resize controller has finished resizing the volume but further resizing of\n\t\tvolume is needed on the node.\n\t- NodeResizeInProgress:\n\t\tState set when kubelet starts resizing the volume.\n\t- NodeResizeFailed:\n\t\tState set when resizing has failed in kubelet with a terminal error. Transient errors don't set\n\t\tNodeResizeFailed.\nFor example: if expanding a PVC for more capacity - this field can be one of the following states:\n\t- pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"ControllerResizeFailed\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizePending\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeInProgress\"\n     - pvc.status.allocatedResourceStatus['storage'] = \"NodeResizeFailed\"\nWhen this field is not set, it means that no resize operation is in progress for the given PVC.\n\nA controller that receives PVC update with previously unknown resourceName or ClaimResourceStatus\nshould ignore the update for the purpose it was designed. For example - a controller that\nonly is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid\nresources associated with PVC.\n\nThis is an alpha field and requires enabling RecoverVolumeExpansionFailure feature."
                             type: object
                             x-kubernetes-map-type: granular
                           allocatedResources:
@@ -8663,7 +8220,7 @@ spec:
                                 - type: string
                               pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                               x-kubernetes-int-or-string: true
-                            description: "allocatedResources tracks the resources allocated to a PVC including its capacity.\nKey names follow standard Kubernetes label syntax. Valid values are either:\n\t* Un-prefixed keys:\n\t\t- storage - the capacity of the volume.\n\t* Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart from above values - keys that are unprefixed or have kubernetes.io prefix are considered\nreserved and hence may not be used.\n\nCapacity reported here may be larger than the actual capacity when a volume expansion operation\nis requested.\nFor storage quota, the larger value from allocatedResources and PVC.spec.resources is used.\nIf allocatedResources is not set, PVC.spec.resources alone is used for quota calculation.\nIf a volume expansion capacity request is lowered, allocatedResources is only\nlowered if there are no expansion operations in progress and if the actual volume capacity\nis equal or lower than the requested capacity.\n\nA controller that receives PVC update with previously unknown resourceName\nshould ignore the update for the purpose it was designed. For example - a controller that\nonly is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid\nresources associated with PVC."
+                            description: "allocatedResources tracks the resources allocated to a PVC including its capacity.\nKey names follow standard Kubernetes label syntax. Valid values are either:\n\t* Un-prefixed keys:\n\t\t- storage - the capacity of the volume.\n\t* Custom resources must use implementation-defined prefixed names such as \"example.com/my-custom-resource\"\nApart from above values - keys that are unprefixed or have kubernetes.io prefix are considered\nreserved and hence may not be used.\n\nCapacity reported here may be larger than the actual capacity when a volume expansion operation\nis requested.\nFor storage quota, the larger value from allocatedResources and PVC.spec.resources is used.\nIf allocatedResources is not set, PVC.spec.resources alone is used for quota calculation.\nIf a volume expansion capacity request is lowered, allocatedResources is only\nlowered if there are no expansion operations in progress and if the actual volume capacity\nis equal or lower than the requested capacity.\n\nA controller that receives PVC update with previously unknown resourceName\nshould ignore the update for the purpose it was designed. For example - a controller that\nonly is responsible for resizing capacity of the volume, should ignore PVC updates that change other valid\nresources associated with PVC.\n\nThis is an alpha field and requires enabling RecoverVolumeExpansionFailure feature."
                             type: object
                           capacity:
                             additionalProperties:
@@ -8721,11 +8278,13 @@ spec:
                             description: |-
                               currentVolumeAttributesClassName is the current name of the VolumeAttributesClass the PVC is using.
                               When unset, there is no VolumeAttributeClass applied to this PersistentVolumeClaim
+                              This is a beta field and requires enabling VolumeAttributesClass feature (off by default).
                             type: string
                           modifyVolumeStatus:
                             description: |-
                               ModifyVolumeStatus represents the status object of ControllerModifyVolume operation.
                               When this is unset, there is no ModifyVolume operation being attempted.
+                              This is a beta field and requires enabling VolumeAttributesClass feature (off by default).
                             properties:
                               status:
                                 description: "status is the status of the ControllerModifyVolume operation. It can be in any of following states:\n - Pending\n   Pending indicates that the PersistentVolumeClaim cannot be modified due to unmet requirements, such as\n   the specified VolumeAttributesClass not existing.\n - InProgress\n   InProgress indicates that the volume is being modified.\n - Infeasible\n  Infeasible indicates that the request has been rejected as invalid by the CSI driver. To\n\t  resolve the error, a valid VolumeAttributesClass needs to be specified.\nNote: New statuses can be added in the future. Consumers should check for unknown statuses and fail appropriately."
@@ -8796,6 +8355,7 @@ spec:
                   type: object
               required:
                 - selector
+                - serviceName
                 - template
               type: object
             status:
@@ -8829,3 +8389,4 @@ spec:
       storage: true
       subresources:
         status: {}
+  preserveUnknownFields: false

charts/gha-runner-scale-set-controller-experimental/.helmignore

@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-tests/

charts/gha-runner-scale-set-controller-experimental/Chart.yaml

@@ -1,33 +0,0 @@
-apiVersion: v2
-name: gha-runner-scale-set-controller-experimental
-description: A Helm chart for install actions-runner-controller CRD
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-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.14.0"
-
-# 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.
-# It is recommended to use it with quotes.
-appVersion: "0.14.0"
-
-home: https://github.com/actions/actions-runner-controller
-
-sources:
-  - "https://github.com/actions/actions-runner-controller"
-
-maintainers:
-  - name: actions
-    url: https://github.com/actions

charts/gha-runner-scale-set-controller-experimental/templates/NOTES.txt

@@ -1,3 +0,0 @@
-Thank you for installing {{ .Chart.Name }}.
-
-Your release is named {{ .Release.Name }}.

charts/gha-runner-scale-set-controller-experimental/templates/_controller.tpl

@@ -1,67 +0,0 @@
-{{/*
-Allow overriding the namespace for the resources.
-*/}}
-{{- define "gha-controller.namespace" -}}
-{{- if .Values.namespaceOverride }}
-  {{- .Values.namespaceOverride }}
-{{- else }}
-  {{- .Release.Namespace }}
-{{- end }}
-{{- 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 "gha-controller.name" -}}
-{{- if .Values.nameOverride }}
-  {{- .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-  {{- $name := default (include "gha-base-name" .) .Values.nameOverride }}
-  {{- if contains $name .Release.Name }}
-    {{- .Release.Name | trunc 63 | trimSuffix "-" }}
-  {{- else }}
-    {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-  {{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Labels applied to the controller deployment
-*/}}
-{{- define "gha-controller.labels" -}}
-{{- $resourceLabels := dict "app.kubernetes.io/component" "controller-manager" -}}
-{{- $commonLabels := include "gha-common.labels" . | fromYaml -}}
-{{- $userLabels := include "apply-non-reserved-gha-labels-and-annotations" (.Values.controller.metadata.labels | default (dict)) | fromYaml -}}
-{{- $global := include "apply-non-reserved-gha-labels-and-annotations" (.Values.labels | default (dict)) | fromYaml -}}
-{{- $labels := mergeOverwrite $global $userLabels $resourceLabels $commonLabels -}}
-
-{{- /* Reserved actions.github.com/* labels owned by the chart itself */ -}}
-{{- $_ := set $labels "actions.github.com/controller-service-account-namespace" (include "gha-controller.namespace" .) -}}
-{{- $_ := set $labels "actions.github.com/controller-service-account-name" (include "gha-controller.service-account-name" .) -}}
-{{- with .Values.controller.manager.config.watchSingleNamespace }}
-  {{- $_ := set $labels "actions.github.com/controller-watch-single-namespace" . -}}
-{{- end }}
-
-{{- toYaml $labels -}}
-{{- end }}
-
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "gha-controller.service-account-name" -}}
-{{- if eq .Values.controller.serviceAccount.name "default"}}
-  {{- fail "serviceAccount.name cannot be set to 'default'" }}
-{{- end }}
-{{- if .Values.controller.serviceAccount.create }}
-  {{- default (include "gha-controller.name" .) .Values.controller.serviceAccount.name }}
-{{- else }}
-  {{- if not .Values.controller.serviceAccount.name }}
-    {{- fail "serviceAccount.name must be set if serviceAccount.create is false" }}
-  {{- else }}
-    {{- .Values.controller.serviceAccount.name }}
-  {{- end }}
-{{- end }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/_controller_template.tpl

@@ -1,122 +0,0 @@
-
-{{/*
-Labels applied to the controller Pod template (spec.template.metadata.labels)
-*/}}
-{{- define "gha-controller-template.labels" -}}
-{{- $static := dict "app.kubernetes.io/part-of" "gha-rs-controller" "app.kubernetes.io/component" "controller-manager" -}}
-{{- $_ := set $static "app.kubernetes.io/version" (.Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-") -}}
-{{- $selector := include "gha-controller.selector-labels" . | fromYaml -}}
-{{- $podUser := include "apply-non-reserved-gha-labels-and-annotations" (.Values.controller.pod.metadata.labels | default (dict)) | fromYaml -}}
-{{- $labels := mergeOverwrite $podUser $selector $static -}}
-{{- toYaml $labels -}}
-{{- end }}
-
-{{/*
-Annotations applied to the controller Pod template (spec.template.metadata.annotations)
-*/}}
-{{- define "gha-controller-template.annotations" -}}
-{{- $static := dict "kubectl.kubernetes.io/default-container" "manager" -}}
-{{- $podUser := include "apply-non-reserved-gha-labels-and-annotations" (.Values.controller.pod.metadata.annotations | default (dict)) | fromYaml -}}
-{{- $annotations := mergeOverwrite $podUser $static -}}
-{{- toYaml $annotations -}}
-{{- end }}
-
-{{- define "gha-controller-template.manager-container" -}}
-name: manager
-image: "{{ .Values.controller.manager.container.image }}"
-imagePullPolicy: {{ default "IfNotPresent" .Values.controller.manager.container.pullPolicy }}
-command:
-  - "/manager"
-args:
-  - "--auto-scaling-runner-set-only"
-{{- if gt (int (default 1 .Values.controller.replicaCount)) 1 }}
-  - "--enable-leader-election"
-  - "--leader-election-id={{ include "gha-controller.name" . }}"
-{{- end }}
-{{- with .Values.imagePullSecrets }}
-{{- range . }}
-  - "--auto-scaler-image-pull-secrets={{- .name -}}"
-{{- end }}
-{{- end }}
-{{- with .Values.controller.manager.config.logLevel }}
-  - "--log-level={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.config.logFormat }}
-  - "--log-format={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.config.watchSingleNamespace }}
-  - "--watch-single-namespace={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.config.runnerMaxConcurrentReconciles }}
-  - "--runner-max-concurrent-reconciles={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.config.updateStrategy }}
-  - "--update-strategy={{ . }}"
-{{- end }}
-{{- if .Values.controller.metrics }}
-{{- with .Values.controller.metrics }}
-  - "--listener-metrics-addr={{ .listenerAddr }}"
-  - "--listener-metrics-endpoint={{ .listenerEndpoint }}"
-  - "--metrics-addr={{ .controllerManagerAddr }}"
-{{- end }}
-{{- else }}
-  - "--listener-metrics-addr=0"
-  - "--listener-metrics-endpoint="
-  - "--metrics-addr=0"
-{{- end }}
-{{- range .Values.controller.manager.config.excludeLabelPropagationPrefixes }}
-  - "--exclude-label-propagation-prefix={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.config.k8sClientRateLimiterQPS }}
-  - "--k8s-client-rate-limiter-qps={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.config.k8sClientRateLimiterBurst }}
-  - "--k8s-client-rate-limiter-burst={{ . }}"
-{{- end }}
-{{- with .Values.controller.manager.container.extraArgs }}
-{{- range . }}
-  - "{{ . }}"
-{{- end }}
-{{- end }}
-{{- $ports := list -}}
-{{- if .Values.controller.metrics }}
-{{- $metricsPort := dict "containerPort" ((regexReplaceAll ":([0-9]+)" .Values.controller.metrics.controllerManagerAddr "${1}") | int) "protocol" "TCP" "name" "metrics" -}}
-{{- $ports = append $ports $metricsPort -}}
-{{- end }}
-{{- with .Values.controller.manager.container.extraPorts }}
-{{- if kindIs "slice" . }}
-{{- $ports = concat $ports . -}}
-{{- end }}
-{{- end }}
-{{- if gt (len $ports) 0 }}
-ports:
-{{- toYaml $ports | nindent 2 }}
-{{- end }}
-env:
-  - name: CONTROLLER_MANAGER_CONTAINER_IMAGE
-    value: "{{ .Values.controller.manager.container.image }}"
-  - name: CONTROLLER_MANAGER_POD_NAMESPACE
-    valueFrom:
-      fieldRef:
-        fieldPath: metadata.namespace
-  {{- with .Values.controller.manager.container.env }}
-  {{- if kindIs "slice" . }}
-{{- toYaml . | nindent 2 }}
-  {{- end }}
-  {{- end }}
-{{- with .Values.controller.manager.container.resources }}
-resources:
-{{- toYaml . | nindent 2 }}
-{{- end }}
-{{- with .Values.controller.manager.container.securityContext }}
-securityContext:
-{{- toYaml . | nindent 2 }}
-{{- end }}
-volumeMounts:
-  - mountPath: /tmp
-    name: tmp
-  {{- $podVolumeMounts := (.Values.controller.pod.volumeMounts | default list) -}}
-  {{- range $podVolumeMounts }}
-  - {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/_defaults.tpl

@@ -1,74 +0,0 @@
-{{- define "gha-base-name" -}}
-gha-rs-controller
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "gha-controller.chart" -}}
-{{- printf "%s-%s" (include "gha-base-name" .) .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "gha-common.labels" -}}
-helm.sh/chart: {{ include "gha-controller.chart" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/part-of: "gha-rs-controller"
-app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-app.kubernetes.io/name: {{ include "gha-controller.name" . }}
-app.kubernetes.io/namespace: {{ include "gha-controller.namespace" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-
-{{- define "gha-controller.manager-cluster-role-name" -}}
-{{- include "gha-controller.name" . }}
-{{- end }}
-
-{{- define "gha-controller.manager-cluster-role-binding" -}}
-{{- include "gha-controller.name" . }}
-{{- end }}
-
-{{- define "gha-controller.manager-single-namespace-role-name" -}}
-{{- include "gha-controller.name" . }}-single-namespace
-{{- end }}
-
-{{- define "gha-controller.manager-single-namespace-role-binding" -}}
-{{- include "gha-controller.name" . }}-single-namespace
-{{- end }}
-
-{{- define "gha-controller.manager-single-namespace-watch-role-name" -}}
-{{- include "gha-controller.name" . }}-single-namespace-watch
-{{- end }}
-
-{{- define "gha-controller.manager-single-namespace-watch-role-binding" -}}
-{{- include "gha-controller.name" . }}-single-namespace-watch
-{{- end }}
-
-{{- define "gha-controller.manager-listener-role-name" -}}
-{{- include "gha-controller.name" . }}-listener
-{{- end }}
-
-{{- define "gha-controller.manager-listener-role-binding" -}}
-{{- include "gha-controller.name" . }}-listener
-{{- end }}
-
-{{- define "gha-controller.leaderElectionRoleName" -}}
-{{- include "gha-controller.name" . }}-leader-election
-{{- end }}
-
-{{- define "gha-controller.leader-election-role-name" -}}
-{{- include "gha-controller.leaderElectionRoleName" . -}}
-{{- end }}
-
-{{- define "gha-controller.leaderElectionRoleBinding" -}}
-{{- include "gha-controller.name" . }}-leader-election
-{{- end }}
-
-{{- define "gha-controller.leader-election-role-binding" -}}
-{{- include "gha-controller.leaderElectionRoleBinding" . -}}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/_helpers.tpl

@@ -1,21 +0,0 @@
-{{/*
-Takes a map of user labels and removes the ones with "actions.github.com/" prefix
-*/}}
-{{- define "apply-non-reserved-gha-labels-and-annotations" -}}
-{{- $userLabels := . -}}
-{{- $processed := dict -}}
-{{- range $key, $value := $userLabels -}}
-  {{- if not (hasPrefix "actions.github.com/" $key) -}}
-    {{- $_ := set $processed $key $value -}}
-  {{- end -}}
-{{- end -}}
-{{- if not (empty $processed) -}}
-  {{- $processed | toYaml }}
-{{- end }}
-{{- end }}
-
-{{- define "gha-controller.selector-labels" -}}
-app.kubernetes.io/name: {{ include "gha-controller.name" . }}
-app.kubernetes.io/namespace: {{ include "gha-controller.namespace" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/deployment.yaml

@@ -1,54 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "gha-controller.name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-  labels:
-    {{- include "gha-controller.labels" . | nindent 4 }}
-spec:
-  replicas: {{ default 1 .Values.controller.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "gha-controller.selector-labels" . | nindent 6 }}
-  template:
-    metadata:
-      annotations:
-        {{- include "gha-controller-template.annotations" . | nindent 8 }}
-      labels:
-        {{- include "gha-controller-template.labels" . | nindent 8 }}
-    spec:
-      {{- $pod := (.Values.controller.pod | default dict) -}}
-      {{- if and (hasKey .Values.controller "pod") (not (kindIs "map" $pod)) -}}
-        {{- fail "controller.pod must be an object" -}}
-      {{- end -}}
-      {{- $podSpec := (index $pod "spec" | default dict) -}}
-      {{- if and (hasKey $pod "spec") (not (kindIs "map" $podSpec)) -}}
-        {{- fail "controller.pod.spec must be an object" -}}
-      {{- end -}}
-
-
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "gha-controller.service-account-name" . }}
-      containers:
-        -
-      {{- include "gha-controller-template.manager-container" . | nindent 10 }}
-        {{- $extraContainers := (index $podSpec "containers" | default list) -}}
-        {{- range $extraContainers }}
-        -
-      {{- toYaml . | nindent 10 }}
-        {{- end }}
-      terminationGracePeriodSeconds: {{ default 10 (index $podSpec "terminationGracePeriodSeconds") }}
-      volumes:
-        - name: tmp
-          emptyDir: {}
-      {{- $podVolumes := (index $podSpec "volumes" | default list) -}}
-      {{- range $podVolumes }}
-        - {{- toYaml . | nindent 10 }}
-      {{- end }}
-      {{- $runnerPodSpecExtraFields := (omit $podSpec "containers" "serviceAccountName" "terminationGracePeriodSeconds" "volumes") -}}
-      {{- if gt (len $runnerPodSpecExtraFields) 0 }}
-      {{- toYaml $runnerPodSpecExtraFields | nindent 6 }}
-      {{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/leader_election_role.yaml

@@ -1,15 +0,0 @@
-{{- if gt (int (default 1 .Values.controller.replicaCount)) 1 }}
-# permissions to do leader election.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "gha-controller.leader-election-role-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-rules:
-  - apiGroups: ["coordination.k8s.io"]
-    resources: ["leases"]
-    verbs: ["get", "watch", "list", "delete", "update", "create"]
-  - apiGroups: [""]
-    resources: ["events"]
-    verbs: ["create", "patch"]
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/leader_election_role_binding.yaml

@@ -1,15 +0,0 @@
-{{- if gt (int (default 1 .Values.controller.replicaCount)) 1 }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "gha-controller.leader-election-role-binding" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "gha-controller.leader-election-role-name" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "gha-controller.service-account-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_cluster_role.yaml

@@ -1,144 +0,0 @@
-{{- if empty .Values.controller.manager.config.watchSingleNamespace }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "gha-controller.manager-cluster-role-name" . }}
-rules:
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - rolebindings
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - roles
-  verbs:
-  - list
-  - watch
-  - patch
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_cluster_role_binding.yaml

@@ -1,14 +0,0 @@
-{{- if empty .Values.controller.manager.config.watchSingleNamespace }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "gha-controller.manager-cluster-role-binding" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "gha-controller.manager-cluster-role-name" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "gha-controller.service-account-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_listener_role.yaml

@@ -1,40 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "gha-controller.manager-listener-role-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - create
-  - delete
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - pods/status
-  verbs:
-  - get
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - create
-  - delete
-  - get
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - create
-  - delete
-  - get
-  - patch
-  - update

charts/gha-runner-scale-set-controller-experimental/templates/manager_listener_role_binding.yaml

@@ -1,13 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "gha-controller.manager-listener-role-binding" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "gha-controller.manager-listener-role-name" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "gha-controller.service-account-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_single_namespace_controller_role.yaml

@@ -1,84 +0,0 @@
-{{- if .Values.controller.manager.config.watchSingleNamespace }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "gha-controller.manager-single-namespace-role-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-rules:
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - rolebindings
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - roles
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners
-  verbs:
-  - list
-  - watch
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_single_namespace_controller_role_binding.yaml

@@ -1,15 +0,0 @@
-{{- if .Values.controller.manager.config.watchSingleNamespace }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "gha-controller.manager-single-namespace-role-binding" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "gha-controller.manager-single-namespace-role-name" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "gha-controller.service-account-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_single_namespace_watch_role.yaml

@@ -1,125 +0,0 @@
-{{- if .Values.controller.manager.config.watchSingleNamespace }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "gha-controller.manager-single-namespace-watch-role-name" . }}
-  namespace: {{ .Values.controller.manager.config.watchSingleNamespace }}
-rules:
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalingrunnersets/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunnersets/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners/finalizers
-  verbs:
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - ephemeralrunners/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - actions.github.com
-  resources:
-  - autoscalinglisteners
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - rolebindings
-  verbs:
-  - list
-  - watch
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - roles
-  verbs:
-  - list
-  - watch
-  - patch
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/manager_single_namespace_watch_role_binding.yaml

@@ -1,15 +0,0 @@
-{{- if .Values.controller.manager.config.watchSingleNamespace }}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "gha-controller.manager-single-namespace-watch-role-binding" . }}
-  namespace: {{ .Values.controller.manager.config.watchSingleNamespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "gha-controller.manager-single-namespace-watch-role-name" . }}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "gha-controller.service-account-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/templates/serviceaccount.yaml

@@ -1,13 +0,0 @@
-{{- if .Values.controller.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "gha-controller.service-account-name" . }}
-  namespace: {{ include "gha-controller.namespace" . }}
-  labels:
-    {{- include "gha-controller.labels" . | nindent 4 }}
-  {{- with .Values.controller.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_args_test.yaml

@@ -1,75 +0,0 @@
-suite: "Controller Deployment args"
-templates:
-  - deployment.yaml
-tests:
-  - it: should include metrics-disabled flags by default
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--metrics-addr=0"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--listener-metrics-addr=0"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--listener-metrics-endpoint="
-
-  - it: should include watch-single-namespace flag when configured
-    set:
-      controller:
-        manager:
-          config:
-            watchSingleNamespace: "demo"
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--watch-single-namespace=demo"
-
-  - it: should include exclude-label-propagation-prefix flags when configured
-    set:
-      controller:
-        manager:
-          config:
-            excludeLabelPropagationPrefixes:
-              - "prefix.com/"
-              - "complete.io/label"
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--exclude-label-propagation-prefix=prefix.com/"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--exclude-label-propagation-prefix=complete.io/label"
-
-  - it: should render metrics port when metrics are enabled
-    set:
-      controller:
-        metrics:
-          controllerManagerAddr: ":8080"
-          listenerAddr: ":8081"
-          listenerEndpoint: "/metrics"
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].ports[0].containerPort
-          value: 8080
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--metrics-addr=:8080"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--listener-metrics-addr=:8081"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--listener-metrics-endpoint=/metrics"

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_env_test.yaml

@@ -1,46 +0,0 @@
-suite: "Controller Deployment env"
-templates:
-  - deployment.yaml
-tests:
-  - it: should not render envFrom in manager container
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - notExists:
-          path: spec.template.spec.containers[0].envFrom
-      - notExists:
-          path: spec.template.spec.containers[0].ports
-
-  - it: should include extra env entries from values
-    set:
-      controller:
-        manager:
-          container:
-            env:
-              - name: "FOO"
-                value: "bar"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: "FOO"
-            value: "bar"
-
-  - it: should enable leader election when replicaCount > 1
-    set:
-      controller:
-        replicaCount: 2
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--enable-leader-election"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--leader-election-id=test-name-gha-rs-controller"

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_extra_containers_test.yaml

@@ -1,55 +0,0 @@
-suite: "Controller Deployment extra containers"
-templates:
-  - deployment.yaml
-tests:
-  - it: should render manager container first and then extra containers
-    set:
-      controller:
-        pod:
-          spec:
-            containers:
-              - name: "sidecar"
-                image: "busybox:1.36"
-                command:
-                  - "sh"
-                  - "-c"
-                args:
-                  - "echo hello && sleep 3600"
-              - name: "another"
-                image: "alpine:3.19"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].name
-          value: "manager"
-      - equal:
-          path: spec.template.spec.containers[1].name
-          value: "sidecar"
-      - equal:
-          path: spec.template.spec.containers[1].image
-          value: "busybox:1.36"
-      - equal:
-          path: spec.template.spec.containers[1].command[0]
-          value: "sh"
-      - equal:
-          path: spec.template.spec.containers[1].args[0]
-          value: "echo hello && sleep 3600"
-      - equal:
-          path: spec.template.spec.containers[2].name
-          value: "another"
-      - equal:
-          path: spec.template.spec.containers[2].image
-          value: "alpine:3.19"
-
-  - it: should not fail when extra containers are unset
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[0].name
-          value: "manager"
-      - notExists:
-          path: spec.template.spec.containers[1]

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_imagepullsecrets_test.yaml

@@ -1,33 +0,0 @@
-suite: "Controller Deployment imagePullSecrets"
-templates:
-  - deployment.yaml
-tests:
-  - it: should not render imagePullSecrets by default
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - notExists:
-          path: spec.template.spec.imagePullSecrets
-
-  - it: should render imagePullSecrets and forward them as args when configured
-    set:
-      imagePullSecrets:
-        - name: regcred
-        - name: another
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.template.spec.imagePullSecrets[0].name
-          value: regcred
-      - equal:
-          path: spec.template.spec.imagePullSecrets[1].name
-          value: another
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--auto-scaler-image-pull-secrets=regcred"
-      - contains:
-          path: spec.template.spec.containers[0].args
-          content: "--auto-scaler-image-pull-secrets=another"

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_pod_extra_fields_test.yaml

@@ -1,54 +0,0 @@
-suite: "Controller Deployment pod extra fields"
-templates:
-  - deployment.yaml
-tests:
-  - it: should render extra pod spec fields from controller.pod
-    set:
-      controller:
-        pod:
-          spec:
-            nodeSelector:
-              kubernetes.io/os: linux
-            tolerations:
-              - key: "dedicated"
-                operator: "Equal"
-                value: "arc"
-                effect: "NoSchedule"
-            hostNetwork: true
-            dnsPolicy: "ClusterFirstWithHostNet"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.template.spec.nodeSelector["kubernetes.io/os"]
-          value: "linux"
-      - equal:
-          path: spec.template.spec.tolerations[0].key
-          value: "dedicated"
-      - equal:
-          path: spec.template.spec.tolerations[0].value
-          value: "arc"
-      - equal:
-          path: spec.template.spec.hostNetwork
-          value: true
-      - equal:
-          path: spec.template.spec.dnsPolicy
-          value: "ClusterFirstWithHostNet"
-
-  - it: should not allow overriding serviceAccountName via controller.pod
-    set:
-      controller:
-        pod:
-          spec:
-            serviceAccountName: "hacker-sa"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: spec.template.spec.serviceAccountName
-          value: "test-name-gha-rs-controller"
-      - notEqual:
-          path: spec.template.spec.serviceAccountName
-          value: "hacker-sa"

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_smoke_test.yaml

@@ -1,27 +0,0 @@
-suite: "Controller Deployment smoke"
-templates:
-  - deployment.yaml
-tests:
-  - it: should render deployment basics
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: apiVersion
-          value: "apps/v1"
-      - equal:
-          path: kind
-          value: "Deployment"
-      - equal:
-          path: metadata.name
-          value: "test-name-gha-rs-controller"
-      - equal:
-          path: metadata.namespace
-          value: "test-namespace"
-      - equal:
-          path: spec.template.spec.containers[0].name
-          value: "manager"
-      - contains:
-          path: spec.template.spec.containers[0].command
-          content: "/manager"

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_volume_mounts_test.yaml

@@ -1,25 +0,0 @@
-suite: "Controller Deployment volume mounts"
-templates:
-  - deployment.yaml
-tests:
-  - it: should append controller.pod.volumeMounts to manager container
-    set:
-      controller:
-        manager:
-          container:
-            image: "ghcr.io/actions/gha-runner-scale-set-controller:latest"
-        pod:
-          volumeMounts:
-            - name: my-config
-              mountPath: /etc/my-config
-              readOnly: true
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].volumeMounts
-          content:
-            name: my-config
-            mountPath: /etc/my-config
-            readOnly: true

charts/gha-runner-scale-set-controller-experimental/tests/controller_deployment_volumes_test.yaml

@@ -1,26 +0,0 @@
-suite: "Controller Deployment volumes"
-templates:
-  - deployment.yaml
-tests:
-  - it: should append controller.pod.spec.volumes to pod spec volumes
-    set:
-      controller:
-        manager:
-          container:
-            image: "ghcr.io/actions/gha-runner-scale-set-controller:latest"
-        pod:
-          spec:
-            volumes:
-              - name: my-config
-                configMap:
-                  name: my-config
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - contains:
-          path: spec.template.spec.volumes
-          content:
-            name: my-config
-            configMap:
-              name: my-config

charts/gha-runner-scale-set-controller-experimental/tests/controller_manager_clusterrolebinding_test.yaml

@@ -1,37 +0,0 @@
-suite: "Controller Manager ClusterRoleBinding"
-templates:
-  - manager_cluster_role_binding.yaml
-tests:
-  - it: should render when watchSingleNamespace is empty
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: apiVersion
-          value: "rbac.authorization.k8s.io/v1"
-      - equal:
-          path: kind
-          value: "ClusterRoleBinding"
-      - equal:
-          path: subjects[0].kind
-          value: "ServiceAccount"
-      - equal:
-          path: subjects[0].name
-          value: "test-name-gha-rs-controller"
-      - equal:
-          path: subjects[0].namespace
-          value: "test-namespace"
-
-  - it: should not render when watchSingleNamespace is set
-    set:
-      controller:
-        manager:
-          config:
-            watchSingleNamespace: "my-ns"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - hasDocuments:
-          count: 0

charts/gha-runner-scale-set-controller-experimental/tests/controller_namespace_override_test.yaml

@@ -1,24 +0,0 @@
-suite: "Controller namespaceOverride"
-templates:
-  - deployment.yaml
-  - serviceaccount.yaml
-tests:
-  - it: should apply namespaceOverride to deployment and serviceaccount
-    set:
-      namespaceOverride: "override-ns"
-    release:
-      name: "test-name"
-      namespace: "release-ns"
-    asserts:
-      - equal:
-          path: metadata.namespace
-          value: "override-ns"
-        template: deployment.yaml
-      - equal:
-          path: metadata.labels["actions.github.com/controller-service-account-namespace"]
-          value: "override-ns"
-        template: deployment.yaml
-      - equal:
-          path: metadata.namespace
-          value: "override-ns"
-        template: serviceaccount.yaml

charts/gha-runner-scale-set-controller-experimental/tests/controller_rbac_clusterrole_test.yaml

@@ -1,38 +0,0 @@
-suite: "Controller RBAC cluster"
-templates:
-  - manager_cluster_role.yaml
-tests:
-  - it: should render manager ClusterRole when watchSingleNamespace is empty
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - equal:
-          path: kind
-          value: "ClusterRole"
-      - equal:
-          path: metadata.name
-          value: "test-arc-gha-rs-controller"
-      - contains:
-          path: rules
-          content:
-            apiGroups:
-              - ""
-            resources:
-              - pods
-            verbs:
-              - list
-              - watch
-
-  - it: should not render manager ClusterRole when watchSingleNamespace is set
-    set:
-      controller:
-        manager:
-          config:
-            watchSingleNamespace: "demo"
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - hasDocuments:
-          count: 0

charts/gha-runner-scale-set-controller-experimental/tests/controller_rbac_leader_election_test.yaml

@@ -1,52 +0,0 @@
-suite: "Controller RBAC leader election"
-templates:
-  - leader_election_role.yaml
-  - leader_election_role_binding.yaml
-tests:
-  - it: should not render leader election resources when replicaCount is 1
-    set:
-      controller:
-        replicaCount: 1
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - hasDocuments:
-          count: 0
-        template: leader_election_role.yaml
-      - hasDocuments:
-          count: 0
-        template: leader_election_role_binding.yaml
-
-  - it: should render leader election resources when replicaCount > 1
-    set:
-      controller:
-        replicaCount: 2
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - equal:
-          path: kind
-          value: "Role"
-        template: leader_election_role.yaml
-      - equal:
-          path: metadata.name
-          value: "test-arc-gha-rs-controller-leader-election"
-        template: leader_election_role.yaml
-      - equal:
-          path: metadata.namespace
-          value: "test-ns"
-        template: leader_election_role.yaml
-      - equal:
-          path: kind
-          value: "RoleBinding"
-        template: leader_election_role_binding.yaml
-      - equal:
-          path: roleRef.name
-          value: "test-arc-gha-rs-controller-leader-election"
-        template: leader_election_role_binding.yaml
-      - equal:
-          path: subjects[0].name
-          value: "test-arc-gha-rs-controller"
-        template: leader_election_role_binding.yaml

charts/gha-runner-scale-set-controller-experimental/tests/controller_rbac_listener_role_test.yaml

@@ -1,68 +0,0 @@
-suite: "Controller RBAC listener"
-templates:
-  - manager_listener_role.yaml
-  - manager_listener_role_binding.yaml
-tests:
-  - it: should render listener role with expected rules
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - equal:
-          path: kind
-          value: "Role"
-        template: manager_listener_role.yaml
-      - equal:
-          path: metadata.name
-          value: "test-arc-gha-rs-controller-listener"
-        template: manager_listener_role.yaml
-      - equal:
-          path: metadata.namespace
-          value: "test-ns"
-        template: manager_listener_role.yaml
-      - equal:
-          path: rules[0].resources[0]
-          value: "pods"
-        template: manager_listener_role.yaml
-      - equal:
-          path: rules[1].resources[0]
-          value: "pods/status"
-        template: manager_listener_role.yaml
-      - equal:
-          path: rules[2].resources[0]
-          value: "secrets"
-        template: manager_listener_role.yaml
-      - equal:
-          path: rules[3].resources[0]
-          value: "serviceaccounts"
-        template: manager_listener_role.yaml
-
-  - it: should bind listener role to controller serviceaccount
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - equal:
-          path: kind
-          value: "RoleBinding"
-        template: manager_listener_role_binding.yaml
-      - equal:
-          path: metadata.name
-          value: "test-arc-gha-rs-controller-listener"
-        template: manager_listener_role_binding.yaml
-      - equal:
-          path: metadata.namespace
-          value: "test-ns"
-        template: manager_listener_role_binding.yaml
-      - equal:
-          path: roleRef.name
-          value: "test-arc-gha-rs-controller-listener"
-        template: manager_listener_role_binding.yaml
-      - equal:
-          path: subjects[0].name
-          value: "test-arc-gha-rs-controller"
-        template: manager_listener_role_binding.yaml
-      - equal:
-          path: subjects[0].namespace
-          value: "test-ns"
-        template: manager_listener_role_binding.yaml

charts/gha-runner-scale-set-controller-experimental/tests/controller_rbac_single_namespace_test.yaml

@@ -1,56 +0,0 @@
-suite: "Controller RBAC single-namespace mode"
-templates:
-  - manager_single_namespace_controller_role.yaml
-  - manager_single_namespace_controller_role_binding.yaml
-  - manager_single_namespace_watch_role.yaml
-  - manager_single_namespace_watch_role_binding.yaml
-tests:
-  - it: should not render single-namespace roles when watchSingleNamespace is empty
-    set:
-      controller:
-        manager:
-          config:
-            watchSingleNamespace: ""
-    release:
-      name: "test-arc"
-      namespace: "test-ns"
-    asserts:
-      - hasDocuments:
-          count: 0
-        template: manager_single_namespace_controller_role.yaml
-      - hasDocuments:
-          count: 0
-        template: manager_single_namespace_controller_role_binding.yaml
-      - hasDocuments:
-          count: 0
-        template: manager_single_namespace_watch_role.yaml
-      - hasDocuments:
-          count: 0
-        template: manager_single_namespace_watch_role_binding.yaml
-
-  - it: should render roles in controller namespace and watch namespace
-    set:
-      controller:
-        manager:
-          config:
-            watchSingleNamespace: "demo"
-    release:
-      name: "test-arc"
-      namespace: "ctrl-ns"
-    asserts:
-      - equal:
-          path: metadata.namespace
-          value: "ctrl-ns"
-        template: manager_single_namespace_controller_role.yaml
-      - equal:
-          path: metadata.namespace
-          value: "ctrl-ns"
-        template: manager_single_namespace_controller_role_binding.yaml
-      - equal:
-          path: metadata.namespace
-          value: "demo"
-        template: manager_single_namespace_watch_role.yaml
-      - equal:
-          path: metadata.namespace
-          value: "demo"
-        template: manager_single_namespace_watch_role_binding.yaml

charts/gha-runner-scale-set-controller-experimental/tests/controller_serviceaccount_create_toggle_test.yaml

@@ -1,46 +0,0 @@
-suite: "Controller serviceAccount.create toggle"
-templates:
-  - serviceaccount.yaml
-  - deployment.yaml
-tests:
-  - it: should create ServiceAccount and use it in Deployment when create is true
-    set:
-      controller:
-        manager:
-          container:
-            image: "ghcr.io/actions/gha-runner-scale-set-controller:latest"
-        serviceAccount:
-          create: true
-          name: ""
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - hasDocuments:
-          count: 1
-        template: serviceaccount.yaml
-      - equal:
-          path: spec.template.spec.serviceAccountName
-          value: "test-name-gha-rs-controller"
-        template: deployment.yaml
-
-  - it: should not create ServiceAccount and use provided name in Deployment when create is false
-    set:
-      controller:
-        manager:
-          container:
-            image: "ghcr.io/actions/gha-runner-scale-set-controller:latest"
-        serviceAccount:
-          create: false
-          name: "existing-sa"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - hasDocuments:
-          count: 0
-        template: serviceaccount.yaml
-      - equal:
-          path: spec.template.spec.serviceAccountName
-          value: "existing-sa"
-        template: deployment.yaml

charts/gha-runner-scale-set-controller-experimental/tests/controller_serviceaccount_test.yaml

@@ -1,72 +0,0 @@
-suite: "Controller ServiceAccount"
-templates:
-  - serviceaccount.yaml
-tests:
-  - it: should render serviceaccount by default
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: apiVersion
-          value: "v1"
-      - equal:
-          path: kind
-          value: "ServiceAccount"
-      - equal:
-          path: metadata.name
-          value: "test-name-gha-rs-controller"
-      - equal:
-          path: metadata.namespace
-          value: "test-namespace"
-      - equal:
-          path: metadata.labels["actions.github.com/controller-service-account-name"]
-          value: "test-name-gha-rs-controller"
-      - equal:
-          path: metadata.labels["actions.github.com/controller-service-account-namespace"]
-          value: "test-namespace"
-
-  - it: should allow overriding serviceAccount.name when create is true
-    set:
-      controller:
-        serviceAccount:
-          create: true
-          name: "overwritten-name"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: metadata.name
-          value: "overwritten-name"
-      - equal:
-          path: metadata.labels["actions.github.com/controller-service-account-name"]
-          value: "overwritten-name"
-
-  - it: should render serviceAccount annotations
-    set:
-      controller:
-        serviceAccount:
-          create: true
-          annotations:
-            foo: bar
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - equal:
-          path: metadata.annotations.foo
-          value: "bar"
-
-  - it: should not render when serviceAccount.create is false
-    set:
-      controller:
-        serviceAccount:
-          create: false
-          name: "existing-sa"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - hasDocuments:
-          count: 0

charts/gha-runner-scale-set-controller-experimental/tests/controller_serviceaccount_validation_test.yaml

@@ -1,32 +0,0 @@
-suite: "Controller ServiceAccount validation"
-templates:
-  - serviceaccount.yaml
-  - deployment.yaml
-tests:
-  - it: should fail if serviceAccount.name is 'default'
-    set:
-      controller:
-        serviceAccount:
-          create: true
-          name: "default"
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - failedTemplate:
-          errorMessage: "serviceAccount.name cannot be set to 'default'"
-        template: serviceaccount.yaml
-
-  - it: should fail when serviceAccount.create is false and name is not set
-    set:
-      controller:
-        serviceAccount:
-          create: false
-          name: ""
-    release:
-      name: "test-name"
-      namespace: "test-namespace"
-    asserts:
-      - failedTemplate:
-          errorMessage: "serviceAccount.name must be set if serviceAccount.create is false"
-        template: deployment.yaml

charts/gha-runner-scale-set-controller-experimental/tests/template_test.go

@@ -1,52 +0,0 @@
-package tests
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/gruntwork-io/terratest/modules/helm"
-	"github.com/gruntwork-io/terratest/modules/k8s"
-	"github.com/gruntwork-io/terratest/modules/logger"
-	"github.com/gruntwork-io/terratest/modules/random"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gopkg.in/yaml.v2"
-	appsv1 "k8s.io/api/apps/v1"
-)
-
-type Chart struct {
-	Version    string `yaml:"version"`
-	AppVersion string `yaml:"appVersion"`
-}
-
-func TestTemplate_RenderedDeployment_UsesChartMetadataLabels(t *testing.T) {
-	t.Parallel()
-
-	helmChartPath, err := filepath.Abs("../../gha-runner-scale-set-controller-experimental")
-	require.NoError(t, err)
-
-	chartContent, err := os.ReadFile(filepath.Join(helmChartPath, "Chart.yaml"))
-	require.NoError(t, err)
-
-	chart := new(Chart)
-	err = yaml.Unmarshal(chartContent, chart)
-	require.NoError(t, err)
-
-	releaseName := "test-arc"
-	namespaceName := "test-" + strings.ToLower(random.UniqueId())
-
-	options := &helm.Options{
-		Logger:         logger.Discard,
-		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
-	}
-
-	output := helm.RenderTemplate(t, options, helmChartPath, releaseName, []string{"templates/deployment.yaml"})
-
-	var deployment appsv1.Deployment
-	helm.UnmarshalK8SYaml(t, output, &deployment)
-
-	assert.Equal(t, "gha-rs-controller-"+chart.Version, deployment.Labels["helm.sh/chart"])
-	assert.Equal(t, chart.AppVersion, deployment.Labels["app.kubernetes.io/version"])
-}

charts/gha-runner-scale-set-controller-experimental/values.yaml

@@ -1,106 +0,0 @@
-# Global chart-level labels applied to all resources (Deployment, RBAC, etc.).
-labels: {}
-
-# Overrides the default `.Release.Namespace` for all resources in this chart.
-namespaceOverride: ""
-
-# Optional imagePullSecrets added to the controller Pod spec.
-# When set, the manager container also receives `--auto-scaler-image-pull-secrets=<name>` args.
-imagePullSecrets: []
-
-controller:
-  # Number of controller replicas.
-  replicaCount: 1
-
-  # Deployment-level metadata
-  metadata:
-    labels: {}
-    annotations: {}
-
-  manager:
-    config:
-      # Log level: "debug", "info", "warn", "error".
-      logLevel: "debug"
-      # Log format: "text", "json".
-      logFormat: "text"
-
-      # Restricts the controller to only watch resources in the desired namespace.
-      # Defaults to watch all namespaces when unset.
-      watchSingleNamespace: ""
-
-      # The maximum number of concurrent reconciles which can be run by the EphemeralRunner controller.
-      runnerMaxConcurrentReconciles: 2
-
-      # How the controller handles upgrades with running jobs: "immediate" or "eventual".
-      updateStrategy: "immediate"
-
-      # List of label prefixes that should NOT be propagated to internal resources.
-      excludeLabelPropagationPrefixes: []
-      # Example:
-      # excludeLabelPropagationPrefixes:
-      #   - "argocd.argoproj.io/instance"
-
-      # K8s client rate limiter parameters.
-      k8sClientRateLimiterQPS: null
-      k8sClientRateLimiterBurst: null
-
-    container:
-      image: "ghcr.io/actions/gha-runner-scale-set-controller:latest"
-      pullPolicy: IfNotPresent
-      # Extra arguments appended to the default set generated by the chart.
-      extraArgs: []
-      # Container-level environment variables.
-      env: []
-      # Container-level security context.
-      securityContext: {}
-      # Container-level resource requests/limits.
-      resources: {}
-      # Extra container ports (metrics port is derived from controller.metrics).
-      extraPorts: []
-
-  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: ""
-
-  # Pod-level configuration.
-  pod:
-    metadata:
-      labels: {}
-      annotations: {}
-
-    # PodSpec fields applied to spec.template.spec.
-    # Note: containers provided here are appended after the built-in manager container.
-    spec:
-      # Pod-level security context.
-      securityContext: {}
-      # Pod priority class name.
-      priorityClassName: ""
-      # Node selection constraints.
-      nodeSelector: {}
-      # Pod tolerations.
-      tolerations: []
-      # Pod affinity.
-      affinity: {}
-      # Pod topology spread constraints.
-      topologySpreadConstraints: []
-      # Pod termination grace period (overrides default 10s).
-      terminationGracePeriodSeconds: null
-      # Additional volumes appended to the default ones.
-      volumes: []
-      # Additional containers appended after the manager container.
-      containers: []
-
-    # Additional volume mounts appended to the manager container's default ones.
-    volumeMounts: []
-
-  # Metrics configuration. If omitted, metrics are disabled.
-  # metrics:
-  #   controllerManagerAddr: ":8080"
-  #   listenerAddr: ":8080"
-  #   listenerEndpoint: "/metrics"
-

charts/gha-runner-scale-set-controller/Chart.yaml

@@ -15,13 +15,13 @@ 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.14.0
+version: 0.11.0
 
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "0.14.0"
+appVersion: "0.11.0"
 
 home: https://github.com/actions/actions-runner-controller
 

charts/gha-runner-scale-set-controller/templates/_helpers.tpl

@@ -129,3 +129,11 @@ Create the name of the service account to use
 {{- define "gha-runner-scale-set-controller.leaderElectionRoleBinding" -}}
 {{- include "gha-runner-scale-set-controller.fullname" . }}-leader-election
 {{- end }}
+
+{{- define "gha-runner-scale-set-controller.imagePullSecretsNames" -}}
+{{- $names := list }}
+{{- range $k, $v := . }}
+  {{- $names = append $names $v.name }}
+{{- end }}
+{{- $names | join ","}}
+{{- end }}

charts/gha-runner-scale-set-controller/templates/deployment.yaml

@@ -54,9 +54,7 @@ spec:
         - "--leader-election-id={{ include "gha-runner-scale-set-controller.fullname" . }}"
         {{- end }}
         {{- with .Values.imagePullSecrets }}
-        {{- range . }}
-        - "--auto-scaler-image-pull-secrets={{- .name -}}"
-        {{- end }}
+        - "--auto-scaler-image-pull-secrets={{ include "gha-runner-scale-set-controller.imagePullSecretsNames" . }}"
         {{- end }}
         {{- with .Values.flags.logLevel }}
         - "--log-level={{ . }}"