From 8b90b0f0e3a4a254c096f8d9ecd8aeed0ee3c00e Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Tue, 22 Jun 2021 17:55:06 +0900 Subject: [PATCH] Clean up import list (#645) Resolves #644 --- PROJECT | 2 +- README.md | 16 ++++++++-------- charts/actions-runner-controller/README.md | 2 +- charts/actions-runner-controller/values.yaml | 2 +- cmd/githubwebhookserver/main.go | 4 ++-- config/samples/actions_v1alpha1_runner.yaml | 2 +- .../actions_v1alpha1_runnerdeployment.yaml | 2 +- .../actions_v1alpha1_runnerreplicaset.yaml | 2 +- controllers/autoscaling.go | 4 ++-- controllers/autoscaling_test.go | 6 +++--- .../horizontal_runner_autoscaler_webhook.go | 2 +- ...tal_runner_autoscaler_webhook_on_check_run.go | 4 ++-- ..._runner_autoscaler_webhook_on_pull_request.go | 2 +- ...rizontal_runner_autoscaler_webhook_on_push.go | 2 +- .../horizontal_runner_autoscaler_webhook_test.go | 15 ++++++++------- .../horizontalrunnerautoscaler_controller.go | 6 +++--- ...horizontalrunnerautoscaler_controller_test.go | 7 ++++--- controllers/integration_test.go | 6 +++--- .../metrics/horizontalrunnerautoscaler.go | 2 +- controllers/metrics/runnerdeployment.go | 2 +- controllers/metrics/runnerset.go | 2 +- controllers/pod_runner_token_injector.go | 2 +- controllers/runner_controller.go | 12 ++++++------ controllers/runnerdeployment_controller.go | 6 +++--- controllers/runnerdeployment_controller_test.go | 2 +- controllers/runnerreplicaset_controller.go | 6 +++--- controllers/runnerreplicaset_controller_test.go | 4 ++-- controllers/runnerset_controller.go | 4 ++-- controllers/suite_test.go | 2 +- github/fake/runners.go | 2 +- github/github.go | 2 +- github/github_test.go | 2 +- go.mod | 2 +- main.go | 8 ++++---- runner/entrypoint.sh | 2 +- 35 files changed, 75 insertions(+), 73 deletions(-) diff --git a/PROJECT b/PROJECT index 7de4d0ab..576c3aa0 100644 --- a/PROJECT +++ b/PROJECT @@ -1,5 +1,5 @@ domain: summerwind.dev -repo: github.com/summerwind/actions-runner-controller +repo: github.com/actions-runner-controller/actions-runner-controller resources: - group: actions kind: Runner diff --git a/README.md b/README.md index 028d0e58..43047cb1 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ kind: Runner metadata: name: example-runner spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller env: [] ``` @@ -238,7 +238,7 @@ You can see that the Runner resource has been created. ```shell $ kubectl get runners NAME REPOSITORY STATUS -example-runner summerwind/actions-runner-controller Running +example-runner actions-runner-controller/actions-runner-controller Running ``` You can also see that the runner pod has been running. @@ -390,7 +390,7 @@ metadata: spec: template: spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller --- apiVersion: actions.summerwind.dev/v1alpha1 kind: HorizontalRunnerAutoscaler @@ -404,7 +404,7 @@ spec: metrics: - type: TotalNumberOfQueuedAndInProgressWorkflowRuns repositoryNames: - - summerwind/actions-runner-controller + - actions-runner-controller/actions-runner-controller ``` Additionally, the `HorizontalRunnerAutoscaler` also has an anti-flapping option that prevents periodic loop of scaling up and down. @@ -866,7 +866,7 @@ spec: replicas: 1 template: spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller labels: - custom-runner ``` @@ -971,7 +971,7 @@ kind: Runner metadata: name: custom-runner spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller image: YOUR_CUSTOM_DOCKER_IMAGE ``` @@ -1170,7 +1170,7 @@ If you don't want to use `make`, like when you're running tests from your IDE, i 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/summerwind/actions-runner-controller/controllers +go test -v -run TestAPIs github.com/actions-runner-controller/actions-runner-controller/controllers ``` To run Ginkgo tests selectively, set the pattern of target test names to `GINKGO_FOCUS`. @@ -1178,5 +1178,5 @@ All the Ginkgo test that matches `GINKGO_FOCUS` will be run. ```bash GINKGO_FOCUS='[It] should create a new Runner resource from the specified template, add a another Runner on replicas increased, and removes all the replicas when set to 0' \ - go test -v -run TestAPIs github.com/summerwind/actions-runner-controller/controllers + go test -v -run TestAPIs github.com/actions-runner-controller/actions-runner-controller/controllers ``` diff --git a/charts/actions-runner-controller/README.md b/charts/actions-runner-controller/README.md index 7066bc0f..81dd2e2a 100644 --- a/charts/actions-runner-controller/README.md +++ b/charts/actions-runner-controller/README.md @@ -21,7 +21,7 @@ _Default values are the defaults set in the charts values.yaml, some properties | `authSecret.github_app_installation_id` | The ID of your GitHub App installation. **This can't be set at the same time as `authSecret.github_token`** | | | `authSecret.github_app_private_key` | The multiline string of your GitHub App's private key. **This can't be set at the same time as `authSecret.github_token`** | | | `authSecret.github_token` | Your chosen GitHub PAT token. **This can't be set at the same time as the `authSecret.github_app_*`** | | -| `image.repository` | The "repository/image" of the controller container | summerwind/actions-runner-controller | +| `image.repository` | The "repository/image" of the controller container | actions-runner-controller/actions-runner-controller | | `image.tag` | The tag of the controller container | | | `image.dindSidecarRepositoryAndTag` | The "repository/image" of the dind sidecar container | docker:dind | | `image.pullPolicy` | The pull policy of the controller image | IfNotPresent | diff --git a/charts/actions-runner-controller/values.yaml b/charts/actions-runner-controller/values.yaml index dbe1f98b..8a43742f 100644 --- a/charts/actions-runner-controller/values.yaml +++ b/charts/actions-runner-controller/values.yaml @@ -26,7 +26,7 @@ authSecret: #github_token: "" image: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller dindSidecarRepositoryAndTag: "docker:dind" pullPolicy: IfNotPresent diff --git a/cmd/githubwebhookserver/main.go b/cmd/githubwebhookserver/main.go index 4723b4dd..9d60a658 100644 --- a/cmd/githubwebhookserver/main.go +++ b/cmd/githubwebhookserver/main.go @@ -25,8 +25,8 @@ import ( "sync" "time" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/controllers" + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/controllers" zaplib "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/config/samples/actions_v1alpha1_runner.yaml b/config/samples/actions_v1alpha1_runner.yaml index 97c95dcb..94ab5d97 100644 --- a/config/samples/actions_v1alpha1_runner.yaml +++ b/config/samples/actions_v1alpha1_runner.yaml @@ -3,4 +3,4 @@ kind: Runner metadata: name: summerwind-actions-runner-controller spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller diff --git a/config/samples/actions_v1alpha1_runnerdeployment.yaml b/config/samples/actions_v1alpha1_runnerdeployment.yaml index aa146557..e1f3b91f 100644 --- a/config/samples/actions_v1alpha1_runnerdeployment.yaml +++ b/config/samples/actions_v1alpha1_runnerdeployment.yaml @@ -6,4 +6,4 @@ spec: replicas: 2 template: spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller diff --git a/config/samples/actions_v1alpha1_runnerreplicaset.yaml b/config/samples/actions_v1alpha1_runnerreplicaset.yaml index 0256a394..3353e06e 100644 --- a/config/samples/actions_v1alpha1_runnerreplicaset.yaml +++ b/config/samples/actions_v1alpha1_runnerreplicaset.yaml @@ -6,4 +6,4 @@ spec: replicas: 2 template: spec: - repository: summerwind/actions-runner-controller + repository: actions-runner-controller/actions-runner-controller diff --git a/controllers/autoscaling.go b/controllers/autoscaling.go index b34e0543..6e7df65a 100644 --- a/controllers/autoscaling.go +++ b/controllers/autoscaling.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" @@ -142,7 +142,7 @@ func (r *HorizontalRunnerAutoscalerReconciler) suggestReplicasByQueuedAndInProgr // In case it's an organizational runners deployment without any scaling metrics defined, // we assume that the desired replicas should always be `minReplicas + capacityReservedThroughWebhook`. - // See https://github.com/summerwind/actions-runner-controller/issues/377#issuecomment-793372693 + // See https://github.com/actions-runner-controller/actions-runner-controller/issues/377#issuecomment-793372693 if metrics == nil { return nil, nil } diff --git a/controllers/autoscaling_test.go b/controllers/autoscaling_test.go index f6b817f0..21f3df90 100644 --- a/controllers/autoscaling_test.go +++ b/controllers/autoscaling_test.go @@ -6,9 +6,9 @@ import ( "net/url" "testing" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/github" - "github.com/summerwind/actions-runner-controller/github/fake" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/github" + "github.com/actions-runner-controller/actions-runner-controller/github/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" diff --git a/controllers/horizontal_runner_autoscaler_webhook.go b/controllers/horizontal_runner_autoscaler_webhook.go index 44f3fab5..acfe23eb 100644 --- a/controllers/horizontal_runner_autoscaler_webhook.go +++ b/controllers/horizontal_runner_autoscaler_webhook.go @@ -35,7 +35,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" ) const ( diff --git a/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go b/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go index c798ff92..38bd2662 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go +++ b/controllers/horizontal_runner_autoscaler_webhook_on_check_run.go @@ -1,9 +1,9 @@ package controllers import ( + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/pkg/actionsglob" "github.com/google/go-github/v33/github" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/pkg/actionsglob" ) func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchCheckRunEvent(event *github.CheckRunEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool { diff --git a/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go b/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go index 9d383fcf..c4773f97 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go +++ b/controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go @@ -1,8 +1,8 @@ package controllers import ( + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/google/go-github/v33/github" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" ) func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchPullRequestEvent(event *github.PullRequestEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool { diff --git a/controllers/horizontal_runner_autoscaler_webhook_on_push.go b/controllers/horizontal_runner_autoscaler_webhook_on_push.go index ecf5f718..01582edf 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_on_push.go +++ b/controllers/horizontal_runner_autoscaler_webhook_on_push.go @@ -1,8 +1,8 @@ package controllers import ( + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/google/go-github/v33/github" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" ) func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchPushEvent(event *github.PushEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool { diff --git a/controllers/horizontal_runner_autoscaler_webhook_test.go b/controllers/horizontal_runner_autoscaler_webhook_test.go index fb55b045..0ebec8ea 100644 --- a/controllers/horizontal_runner_autoscaler_webhook_test.go +++ b/controllers/horizontal_runner_autoscaler_webhook_test.go @@ -4,21 +4,22 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/go-logr/logr" - "github.com/google/go-github/v33/github" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" "io" "io/ioutil" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - clientgoscheme "k8s.io/client-go/kubernetes/scheme" "net/http" "net/http/httptest" "net/url" "os" - "sigs.k8s.io/controller-runtime/pkg/client/fake" "testing" "time" + + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/go-logr/logr" + "github.com/google/go-github/v33/github" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) var ( diff --git a/controllers/horizontalrunnerautoscaler_controller.go b/controllers/horizontalrunnerautoscaler_controller.go index d37a3e4b..8eebc73e 100644 --- a/controllers/horizontalrunnerautoscaler_controller.go +++ b/controllers/horizontalrunnerautoscaler_controller.go @@ -24,7 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/summerwind/actions-runner-controller/github" + "github.com/actions-runner-controller/actions-runner-controller/github" "k8s.io/apimachinery/pkg/types" "github.com/go-logr/logr" @@ -35,8 +35,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/controllers/metrics" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/controllers/metrics" ) const ( diff --git a/controllers/horizontalrunnerautoscaler_controller_test.go b/controllers/horizontalrunnerautoscaler_controller_test.go index d8f0940a..ced65bb9 100644 --- a/controllers/horizontalrunnerautoscaler_controller_test.go +++ b/controllers/horizontalrunnerautoscaler_controller_test.go @@ -1,11 +1,12 @@ package controllers import ( - "github.com/google/go-cmp/cmp" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "testing" "time" + + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/google/go-cmp/cmp" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestGetValidCacheEntries(t *testing.T) { diff --git a/controllers/integration_test.go b/controllers/integration_test.go index 6c76497b..8af02d16 100644 --- a/controllers/integration_test.go +++ b/controllers/integration_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "time" + github2 "github.com/actions-runner-controller/actions-runner-controller/github" "github.com/google/go-github/v33/github" - github2 "github.com/summerwind/actions-runner-controller/github" - "github.com/summerwind/actions-runner-controller/github/fake" + "github.com/actions-runner-controller/actions-runner-controller/github/fake" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" ) type testEnvironment struct { diff --git a/controllers/metrics/horizontalrunnerautoscaler.go b/controllers/metrics/horizontalrunnerautoscaler.go index 338de194..0815e2a5 100644 --- a/controllers/metrics/horizontalrunnerautoscaler.go +++ b/controllers/metrics/horizontalrunnerautoscaler.go @@ -1,8 +1,8 @@ package metrics import ( + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/prometheus/client_golang/prometheus" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/metrics/runnerdeployment.go b/controllers/metrics/runnerdeployment.go index c062a1cc..6837b698 100644 --- a/controllers/metrics/runnerdeployment.go +++ b/controllers/metrics/runnerdeployment.go @@ -1,8 +1,8 @@ package metrics import ( + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/prometheus/client_golang/prometheus" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" ) const ( diff --git a/controllers/metrics/runnerset.go b/controllers/metrics/runnerset.go index 89010b4d..ece2b2db 100644 --- a/controllers/metrics/runnerset.go +++ b/controllers/metrics/runnerset.go @@ -1,8 +1,8 @@ package metrics import ( + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/prometheus/client_golang/prometheus" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" ) const ( diff --git a/controllers/pod_runner_token_injector.go b/controllers/pod_runner_token_injector.go index ec6bf6b2..7b320517 100644 --- a/controllers/pod_runner_token_injector.go +++ b/controllers/pod_runner_token_injector.go @@ -6,8 +6,8 @@ import ( "net/http" "time" + "github.com/actions-runner-controller/actions-runner-controller/github" "github.com/go-logr/logr" - "github.com/summerwind/actions-runner-controller/github" "gomodules.xyz/jsonpatch/v2" admissionv1 "k8s.io/api/admission/v1" corev1 "k8s.io/api/core/v1" diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go index a14d9cdf..bb51b7ac 100644 --- a/controllers/runner_controller.go +++ b/controllers/runner_controller.go @@ -23,8 +23,8 @@ import ( "strings" "time" + "github.com/actions-runner-controller/actions-runner-controller/hash" gogithub "github.com/google/go-github/v33/github" - "github.com/summerwind/actions-runner-controller/hash" "k8s.io/apimachinery/pkg/util/wait" "github.com/go-logr/logr" @@ -37,8 +37,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/github" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/github" ) const ( @@ -395,7 +395,7 @@ func (r *RunnerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr "Runner failed to register itself to GitHub in timely manner. "+ "Recreating the pod to see if it resolves the issue. "+ "CAUTION: If you see this a lot, you should investigate the root cause. "+ - "See https://github.com/summerwind/actions-runner-controller/issues/288", + "See https://github.com/actions-runner-controller/actions-runner-controller/issues/288", "podCreationTimestamp", pod.CreationTimestamp, "currentTime", currentTime, "configuredRegistrationTimeout", registrationTimeout, @@ -588,7 +588,7 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) { // A registered runner's session and the a registration token seem to have two different and independent // lifecycles. // - // See https://github.com/summerwind/actions-runner-controller/issues/143 for more context. + // See https://github.com/actions-runner-controller/actions-runner-controller/issues/143 for more context. labels[LabelKeyPodTemplateHash] = hash.FNVHashStringObjects( filterLabels(runner.ObjectMeta.Labels, LabelKeyRunnerTemplateHash), runner.ObjectMeta.Annotations, @@ -937,7 +937,7 @@ func newRunnerPod(template corev1.Pod, runnerSpec v1alpha1.RunnerConfig, default }...) // Determine the volume mounts assigned to the docker sidecar. In case extra mounts are included in the RunnerSpec, append them to the standard - // set of mounts. See https://github.com/summerwind/actions-runner-controller/issues/435 for context. + // set of mounts. See https://github.com/actions-runner-controller/actions-runner-controller/issues/435 for context. dockerVolumeMounts := []corev1.VolumeMount{ { Name: "work", diff --git a/controllers/runnerdeployment_controller.go b/controllers/runnerdeployment_controller.go index 80df1f26..6725bc64 100644 --- a/controllers/runnerdeployment_controller.go +++ b/controllers/runnerdeployment_controller.go @@ -37,8 +37,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/controllers/metrics" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/controllers/metrics" ) const ( @@ -154,7 +154,7 @@ func (r *RunnerDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Req // A selector update change doesn't trigger replicaset replacement, // but we still need to update the existing replicaset with it. // Otherwise selector-based runner query will never work on replicasets created before the controller v0.17.0 - // See https://github.com/summerwind/actions-runner-controller/pull/355#discussion_r585379259 + // See https://github.com/actions-runner-controller/actions-runner-controller/pull/355#discussion_r585379259 if err := r.Client.Update(ctx, updateSet); err != nil { log.Error(err, "Failed to update runnerreplicaset resource") diff --git a/controllers/runnerdeployment_controller_test.go b/controllers/runnerdeployment_controller_test.go index 7e2c63aa..7b0166fb 100644 --- a/controllers/runnerdeployment_controller_test.go +++ b/controllers/runnerdeployment_controller_test.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" ) func TestNewRunnerReplicaSet(t *testing.T) { diff --git a/controllers/runnerreplicaset_controller.go b/controllers/runnerreplicaset_controller.go index 457f1e52..d2bd102d 100644 --- a/controllers/runnerreplicaset_controller.go +++ b/controllers/runnerreplicaset_controller.go @@ -35,8 +35,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/github" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/github" ) // RunnerReplicaSetReconciler reconciles a Runner object @@ -231,7 +231,7 @@ func (r *RunnerReplicaSetReconciler) Reconcile(ctx context.Context, req ctrl.Req "Runner failed to register itself to GitHub in timely manner. "+ "Marking the runner for scale down. "+ "CAUTION: If you see this a lot, you should investigate the root cause. "+ - "See https://github.com/summerwind/actions-runner-controller/issues/288", + "See https://github.com/actions-runner-controller/actions-runner-controller/issues/288", "runnerCreationTimestamp", runner.CreationTimestamp, "currentTime", currentTime, "configuredRegistrationTimeout", registrationTimeout, diff --git a/controllers/runnerreplicaset_controller_test.go b/controllers/runnerreplicaset_controller_test.go index f1459b1c..a4a68f3a 100644 --- a/controllers/runnerreplicaset_controller_test.go +++ b/controllers/runnerreplicaset_controller_test.go @@ -18,8 +18,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/github/fake" + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/github/fake" ) var ( diff --git a/controllers/runnerset_controller.go b/controllers/runnerset_controller.go index b42dcd82..2e18b93e 100644 --- a/controllers/runnerset_controller.go +++ b/controllers/runnerset_controller.go @@ -34,8 +34,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/controllers/metrics" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/controllers/metrics" ) const ( diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 4d5dcd5d..d57d12bd 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -26,7 +26,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/github/fake/runners.go b/github/fake/runners.go index f6f77bf8..8eb5f886 100644 --- a/github/fake/runners.go +++ b/github/fake/runners.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "strconv" - "github.com/summerwind/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" "github.com/google/go-github/v33/github" "github.com/gorilla/mux" diff --git a/github/github.go b/github/github.go index 2872dd99..efbab49c 100644 --- a/github/github.go +++ b/github/github.go @@ -10,9 +10,9 @@ import ( "sync" "time" + "github.com/actions-runner-controller/actions-runner-controller/github/metrics" "github.com/bradleyfalzon/ghinstallation" "github.com/google/go-github/v33/github" - "github.com/summerwind/actions-runner-controller/github/metrics" "golang.org/x/oauth2" ) diff --git a/github/github_test.go b/github/github_test.go index 4672f65e..4756040b 100644 --- a/github/github_test.go +++ b/github/github_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/actions-runner-controller/actions-runner-controller/github/fake" "github.com/google/go-github/v33/github" - "github.com/summerwind/actions-runner-controller/github/fake" ) var server *httptest.Server diff --git a/go.mod b/go.mod index 700e54fb..316b262f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/summerwind/actions-runner-controller +module github.com/actions-runner-controller/actions-runner-controller go 1.15 diff --git a/main.go b/main.go index e6cb05cf..1401c199 100644 --- a/main.go +++ b/main.go @@ -23,10 +23,10 @@ import ( "strings" "time" + actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1" + "github.com/actions-runner-controller/actions-runner-controller/controllers" + "github.com/actions-runner-controller/actions-runner-controller/github" "github.com/kelseyhightower/envconfig" - actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1" - "github.com/summerwind/actions-runner-controller/controllers" - "github.com/summerwind/actions-runner-controller/github" zaplib "go.uber.org/zap" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" @@ -94,7 +94,7 @@ func main() { flag.StringVar(&c.AppPrivateKey, "github-app-private-key", c.AppPrivateKey, "The path of a private key file to authenticate as a GitHub App") flag.DurationVar(&gitHubAPICacheDuration, "github-api-cache-duration", 0, "The duration until the GitHub API cache expires. Setting this to e.g. 10m results in the controller tries its best not to make the same API call within 10m to reduce the chance of being rate-limited. Defaults to mostly the same value as sync-period. If you're tweaking this in order to make autoscaling more responsive, you'll probably want to tweak sync-period, too") flag.DurationVar(&syncPeriod, "sync-period", 10*time.Minute, "Determines the minimum frequency at which K8s resources managed by this controller are reconciled. When you use autoscaling, set to a lower value like 10 minute, because this corresponds to the minimum time to react on demand change. . If you're tweaking this in order to make autoscaling more responsive, you'll probably want to tweak github-api-cache-duration, too") - flag.Var(&commonRunnerLabels, "common-runner-labels", "Runner labels in the K1=V1,K2=V2,... format that are inherited all the runners created by the controller. See https://github.com/summerwind/actions-runner-controller/issues/321 for more information") + flag.Var(&commonRunnerLabels, "common-runner-labels", "Runner labels in the K1=V1,K2=V2,... format that are inherited all the runners created by the controller. See https://github.com/actions-runner-controller/actions-runner-controller/issues/321 for more information") flag.StringVar(&namespace, "watch-namespace", "", "The namespace to watch for custom resources. Set to empty for letting it watch for all namespaces.") flag.StringVar(&logLevel, "log-level", logLevelDebug, `The verbosity of the logging. Valid values are "debug", "info", "warn", "error". Defaults to "debug".`) flag.Parse() diff --git a/runner/entrypoint.sh b/runner/entrypoint.sh index 0d2a797f..8eefca89 100755 --- a/runner/entrypoint.sh +++ b/runner/entrypoint.sh @@ -43,7 +43,7 @@ if [ -z "${RUNNER_REPO}" ] && [ -n "${RUNNER_GROUP}" ];then RUNNER_GROUPS=${RUNNER_GROUP} fi -# Hack due to https://github.com/summerwind/actions-runner-controller/issues/252#issuecomment-758338483 +# Hack due to https://github.com/actions-runner-controller/actions-runner-controller/issues/252#issuecomment-758338483 if [ ! -d /runner ]; then echo "/runner should be an emptyDir mount. Please fix the pod spec." 1>&2 exit 1