Add support for repo-level runners. Fixes #40

deploy/crds/garo.tietoevry.com_v1alpha1_githubactionrunner_cr.yaml

@@ -7,6 +7,8 @@ spec:
   minRunners: 1
   maxRunners: 1
   organization: yourOrg
+  # if runner for repo
+  # repository: "theRepoName"
   tokenRef:
     key: GH_TOKEN
     name: actions-runner
@@ -25,6 +27,9 @@ spec:
             value: /certs/client
           - name: GH_ORG
             value: yourOrg
+        # if runner for repo:
+        # - name: GH_REPO
+        #   value: theRepoName
         envFrom:
           - secretRef:
               name: actions-runner

pkg/apis/garo/v1alpha1/githubactionrunner_types.go

@@ -5,12 +5,14 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // GithubActionRunnerSpec defines the desired state of GithubActionRunner
 type GithubActionRunnerSpec struct {
+	// kubebuilder:validation:Required
 	Organization string `json:"organization"`
+	// kubebuilder:validation:Optional
+	Repository string `json:"repository,omitempty"`
 	// +kubebuilder:validation:Minimum=0
 	MinRunners int `json:"minRunners"`
 	// +kubebuilder:validation:Minimum=0

pkg/controller/githubactionrunner/githubactionrunner_controller.go

@@ -100,7 +100,7 @@ func (r *ReconcileGithubActionRunner) Reconcile(request reconcile.Request) (reco
 		return reconcile.Result{}, err
 	}
 
-	runners, err := r.githubApi.GetOrgRunners(instance.Spec.Organization, token)
+	runners, err := r.githubApi.GetRunners(instance.Spec.Organization, instance.Spec.Repository, token)
 
 	if err != nil {
 		reqLogger.Error(err, "error from github api")

pkg/githubapi/runnerapi.go

@@ -7,7 +7,7 @@ import (
 )
 
 type IRunnerApi interface {
-	GetOrgRunners(organization string, token string) ([]*github.Runner, error)
+	GetRunners(organization string, repository string, token string) ([]*github.Runner, error)
 }
 
 type RunnerApi struct {
@@ -19,7 +19,7 @@ func NewRunnerApi() RunnerApi {
 }
 
 // Return all runners for the org
-func (r RunnerApi) GetOrgRunners(organization string, token string) ([]*github.Runner, error) {
+func (r RunnerApi) GetRunners(organization string, repository string, token string) ([]*github.Runner, error) {
 	ts := oauth2.StaticTokenSource(&(oauth2.Token{
 		AccessToken: token,
 	}))
@@ -30,7 +30,15 @@ func (r RunnerApi) GetOrgRunners(organization string, token string) ([]*github.R
 	opts := &github.ListOptions{PerPage: 30}
 
 	for {
-		runners, response, err := client.Actions.ListOrganizationRunners(context.TODO(), organization, opts)
+		var runners *github.Runners
+		var response *github.Response
+		var err error
+
+		if repository != "" {
+			runners, response, err = client.Actions.ListRunners(context.TODO(), organization, repository, opts)
+		} else {
+			runners, response, err = client.Actions.ListOrganizationRunners(context.TODO(), organization, opts)
+		}
 		if err != nil {
 			return allRunners, err
 		}

version/version.go

@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.1.6"
+	Version = "0.2.0"
 )