Skip to content

Commit 8b90b0f

Browse files
authored
Clean up import list (#645)
Resolves #644
1 parent a277489 commit 8b90b0f

35 files changed

+75
-73
lines changed

PROJECT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
domain: summerwind.dev
2-
repo: github.com/summerwind/actions-runner-controller
2+
repo: github.com/actions-runner-controller/actions-runner-controller
33
resources:
44
- group: actions
55
kind: Runner

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ kind: Runner
222222
metadata:
223223
name: example-runner
224224
spec:
225-
repository: summerwind/actions-runner-controller
225+
repository: actions-runner-controller/actions-runner-controller
226226
env: []
227227
```
228228
@@ -238,7 +238,7 @@ You can see that the Runner resource has been created.
238238
```shell
239239
$ kubectl get runners
240240
NAME REPOSITORY STATUS
241-
example-runner summerwind/actions-runner-controller Running
241+
example-runner actions-runner-controller/actions-runner-controller Running
242242
```
243243

244244
You can also see that the runner pod has been running.
@@ -390,7 +390,7 @@ metadata:
390390
spec:
391391
template:
392392
spec:
393-
repository: summerwind/actions-runner-controller
393+
repository: actions-runner-controller/actions-runner-controller
394394
---
395395
apiVersion: actions.summerwind.dev/v1alpha1
396396
kind: HorizontalRunnerAutoscaler
@@ -404,7 +404,7 @@ spec:
404404
metrics:
405405
- type: TotalNumberOfQueuedAndInProgressWorkflowRuns
406406
repositoryNames:
407-
- summerwind/actions-runner-controller
407+
- actions-runner-controller/actions-runner-controller
408408
```
409409

410410
Additionally, the `HorizontalRunnerAutoscaler` also has an anti-flapping option that prevents periodic loop of scaling up and down.
@@ -866,7 +866,7 @@ spec:
866866
replicas: 1
867867
template:
868868
spec:
869-
repository: summerwind/actions-runner-controller
869+
repository: actions-runner-controller/actions-runner-controller
870870
labels:
871871
- custom-runner
872872
```
@@ -971,7 +971,7 @@ kind: Runner
971971
metadata:
972972
name: custom-runner
973973
spec:
974-
repository: summerwind/actions-runner-controller
974+
repository: actions-runner-controller/actions-runner-controller
975975
image: YOUR_CUSTOM_DOCKER_IMAGE
976976
```
977977

@@ -1170,13 +1170,13 @@ If you don't want to use `make`, like when you're running tests from your IDE, i
11701170
sudo mkdir -p /usr/local/kubebuilder/bin
11711171
make kube-apiserver etcd
11721172
sudo mv test-assets/{etcd,kube-apiserver} /usr/local/kubebuilder/bin/
1173-
go test -v -run TestAPIs github.com/summerwind/actions-runner-controller/controllers
1173+
go test -v -run TestAPIs github.com/actions-runner-controller/actions-runner-controller/controllers
11741174
```
11751175

11761176
To run Ginkgo tests selectively, set the pattern of target test names to `GINKGO_FOCUS`.
11771177
All the Ginkgo test that matches `GINKGO_FOCUS` will be run.
11781178

11791179
```bash
11801180
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' \
1181-
go test -v -run TestAPIs github.com/summerwind/actions-runner-controller/controllers
1181+
go test -v -run TestAPIs github.com/actions-runner-controller/actions-runner-controller/controllers
11821182
```

charts/actions-runner-controller/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ _Default values are the defaults set in the charts values.yaml, some properties
2121
| `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`** | |
2222
| `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`** | |
2323
| `authSecret.github_token` | Your chosen GitHub PAT token. **This can't be set at the same time as the `authSecret.github_app_*`** | |
24-
| `image.repository` | The "repository/image" of the controller container | summerwind/actions-runner-controller |
24+
| `image.repository` | The "repository/image" of the controller container | actions-runner-controller/actions-runner-controller |
2525
| `image.tag` | The tag of the controller container | |
2626
| `image.dindSidecarRepositoryAndTag` | The "repository/image" of the dind sidecar container | docker:dind |
2727
| `image.pullPolicy` | The pull policy of the controller image | IfNotPresent |

charts/actions-runner-controller/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ authSecret:
2626
#github_token: ""
2727

2828
image:
29-
repository: summerwind/actions-runner-controller
29+
repository: actions-runner-controller/actions-runner-controller
3030
dindSidecarRepositoryAndTag: "docker:dind"
3131
pullPolicy: IfNotPresent
3232

cmd/githubwebhookserver/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"sync"
2626
"time"
2727

28-
actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1"
29-
"github.com/summerwind/actions-runner-controller/controllers"
28+
actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
29+
"github.com/actions-runner-controller/actions-runner-controller/controllers"
3030
zaplib "go.uber.org/zap"
3131
"k8s.io/apimachinery/pkg/runtime"
3232
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

config/samples/actions_v1alpha1_runner.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: Runner
33
metadata:
44
name: summerwind-actions-runner-controller
55
spec:
6-
repository: summerwind/actions-runner-controller
6+
repository: actions-runner-controller/actions-runner-controller

config/samples/actions_v1alpha1_runnerdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ spec:
66
replicas: 2
77
template:
88
spec:
9-
repository: summerwind/actions-runner-controller
9+
repository: actions-runner-controller/actions-runner-controller

config/samples/actions_v1alpha1_runnerreplicaset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ spec:
66
replicas: 2
77
template:
88
spec:
9-
repository: summerwind/actions-runner-controller
9+
repository: actions-runner-controller/actions-runner-controller

controllers/autoscaling.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
12+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
1313
kerrors "k8s.io/apimachinery/pkg/api/errors"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -142,7 +142,7 @@ func (r *HorizontalRunnerAutoscalerReconciler) suggestReplicasByQueuedAndInProgr
142142

143143
// In case it's an organizational runners deployment without any scaling metrics defined,
144144
// we assume that the desired replicas should always be `minReplicas + capacityReservedThroughWebhook`.
145-
// See https://github.com/summerwind/actions-runner-controller/issues/377#issuecomment-793372693
145+
// See https://github.com/actions-runner-controller/actions-runner-controller/issues/377#issuecomment-793372693
146146
if metrics == nil {
147147
return nil, nil
148148
}

controllers/autoscaling_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"net/url"
77
"testing"
88

9-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
10-
"github.com/summerwind/actions-runner-controller/github"
11-
"github.com/summerwind/actions-runner-controller/github/fake"
9+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
10+
"github.com/actions-runner-controller/actions-runner-controller/github"
11+
"github.com/actions-runner-controller/actions-runner-controller/github/fake"
1212
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1313
"k8s.io/apimachinery/pkg/runtime"
1414
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

controllers/horizontal_runner_autoscaler_webhook.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
ctrl "sigs.k8s.io/controller-runtime"
3636
"sigs.k8s.io/controller-runtime/pkg/client"
3737

38-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
38+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
3939
)
4040

4141
const (

controllers/horizontal_runner_autoscaler_webhook_on_check_run.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package controllers
22

33
import (
4+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
5+
"github.com/actions-runner-controller/actions-runner-controller/pkg/actionsglob"
46
"github.com/google/go-github/v33/github"
5-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
6-
"github.com/summerwind/actions-runner-controller/pkg/actionsglob"
77
)
88

99
func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchCheckRunEvent(event *github.CheckRunEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool {

controllers/horizontal_runner_autoscaler_webhook_on_pull_request.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package controllers
22

33
import (
4+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
45
"github.com/google/go-github/v33/github"
5-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
66
)
77

88
func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchPullRequestEvent(event *github.PullRequestEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool {

controllers/horizontal_runner_autoscaler_webhook_on_push.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package controllers
22

33
import (
4+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
45
"github.com/google/go-github/v33/github"
5-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
66
)
77

88
func (autoscaler *HorizontalRunnerAutoscalerGitHubWebhook) MatchPushEvent(event *github.PushEvent) func(scaleUpTrigger v1alpha1.ScaleUpTrigger) bool {

controllers/horizontal_runner_autoscaler_webhook_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ import (
44
"bytes"
55
"encoding/json"
66
"fmt"
7-
"github.com/go-logr/logr"
8-
"github.com/google/go-github/v33/github"
9-
actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1"
107
"io"
118
"io/ioutil"
12-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13-
"k8s.io/apimachinery/pkg/runtime"
14-
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
159
"net/http"
1610
"net/http/httptest"
1711
"net/url"
1812
"os"
19-
"sigs.k8s.io/controller-runtime/pkg/client/fake"
2013
"testing"
2114
"time"
15+
16+
actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
17+
"github.com/go-logr/logr"
18+
"github.com/google/go-github/v33/github"
19+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
20+
"k8s.io/apimachinery/pkg/runtime"
21+
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
22+
"sigs.k8s.io/controller-runtime/pkg/client/fake"
2223
)
2324

2425
var (

controllers/horizontalrunnerautoscaler_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
corev1 "k8s.io/api/core/v1"
2626

27-
"github.com/summerwind/actions-runner-controller/github"
27+
"github.com/actions-runner-controller/actions-runner-controller/github"
2828
"k8s.io/apimachinery/pkg/types"
2929

3030
"github.com/go-logr/logr"
@@ -35,8 +35,8 @@ import (
3535

3636
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3737

38-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
39-
"github.com/summerwind/actions-runner-controller/controllers/metrics"
38+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
39+
"github.com/actions-runner-controller/actions-runner-controller/controllers/metrics"
4040
)
4141

4242
const (

controllers/horizontalrunnerautoscaler_controller_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package controllers
22

33
import (
4-
"github.com/google/go-cmp/cmp"
5-
actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1"
6-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
74
"testing"
85
"time"
6+
7+
actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
8+
"github.com/google/go-cmp/cmp"
9+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
910
)
1011

1112
func TestGetValidCacheEntries(t *testing.T) {

controllers/integration_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"net/http/httptest"
88
"time"
99

10+
github2 "github.com/actions-runner-controller/actions-runner-controller/github"
1011
"github.com/google/go-github/v33/github"
11-
github2 "github.com/summerwind/actions-runner-controller/github"
1212

13-
"github.com/summerwind/actions-runner-controller/github/fake"
13+
"github.com/actions-runner-controller/actions-runner-controller/github/fake"
1414

1515
corev1 "k8s.io/api/core/v1"
1616
"k8s.io/apimachinery/pkg/types"
@@ -23,7 +23,7 @@ import (
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"sigs.k8s.io/controller-runtime/pkg/client"
2525

26-
actionsv1alpha1 "github.com/summerwind/actions-runner-controller/api/v1alpha1"
26+
actionsv1alpha1 "github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
2727
)
2828

2929
type testEnvironment struct {

controllers/metrics/horizontalrunnerautoscaler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package metrics
22

33
import (
4+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
45
"github.com/prometheus/client_golang/prometheus"
5-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
66
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
77
)
88

controllers/metrics/runnerdeployment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package metrics
22

33
import (
4+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
45
"github.com/prometheus/client_golang/prometheus"
5-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
66
)
77

88
const (

controllers/metrics/runnerset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package metrics
22

33
import (
4+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
45
"github.com/prometheus/client_golang/prometheus"
5-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
66
)
77

88
const (

controllers/pod_runner_token_injector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"net/http"
77
"time"
88

9+
"github.com/actions-runner-controller/actions-runner-controller/github"
910
"github.com/go-logr/logr"
10-
"github.com/summerwind/actions-runner-controller/github"
1111
"gomodules.xyz/jsonpatch/v2"
1212
admissionv1 "k8s.io/api/admission/v1"
1313
corev1 "k8s.io/api/core/v1"

controllers/runner_controller.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"strings"
2424
"time"
2525

26+
"github.com/actions-runner-controller/actions-runner-controller/hash"
2627
gogithub "github.com/google/go-github/v33/github"
27-
"github.com/summerwind/actions-runner-controller/hash"
2828
"k8s.io/apimachinery/pkg/util/wait"
2929

3030
"github.com/go-logr/logr"
@@ -37,8 +37,8 @@ import (
3737
corev1 "k8s.io/api/core/v1"
3838
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3939

40-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
41-
"github.com/summerwind/actions-runner-controller/github"
40+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
41+
"github.com/actions-runner-controller/actions-runner-controller/github"
4242
)
4343

4444
const (
@@ -395,7 +395,7 @@ func (r *RunnerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
395395
"Runner failed to register itself to GitHub in timely manner. "+
396396
"Recreating the pod to see if it resolves the issue. "+
397397
"CAUTION: If you see this a lot, you should investigate the root cause. "+
398-
"See https://github.com/summerwind/actions-runner-controller/issues/288",
398+
"See https://github.com/actions-runner-controller/actions-runner-controller/issues/288",
399399
"podCreationTimestamp", pod.CreationTimestamp,
400400
"currentTime", currentTime,
401401
"configuredRegistrationTimeout", registrationTimeout,
@@ -588,7 +588,7 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
588588
// A registered runner's session and the a registration token seem to have two different and independent
589589
// lifecycles.
590590
//
591-
// See https://github.com/summerwind/actions-runner-controller/issues/143 for more context.
591+
// See https://github.com/actions-runner-controller/actions-runner-controller/issues/143 for more context.
592592
labels[LabelKeyPodTemplateHash] = hash.FNVHashStringObjects(
593593
filterLabels(runner.ObjectMeta.Labels, LabelKeyRunnerTemplateHash),
594594
runner.ObjectMeta.Annotations,
@@ -937,7 +937,7 @@ func newRunnerPod(template corev1.Pod, runnerSpec v1alpha1.RunnerConfig, default
937937
}...)
938938

939939
// Determine the volume mounts assigned to the docker sidecar. In case extra mounts are included in the RunnerSpec, append them to the standard
940-
// set of mounts. See https://github.com/summerwind/actions-runner-controller/issues/435 for context.
940+
// set of mounts. See https://github.com/actions-runner-controller/actions-runner-controller/issues/435 for context.
941941
dockerVolumeMounts := []corev1.VolumeMount{
942942
{
943943
Name: "work",

controllers/runnerdeployment_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
corev1 "k8s.io/api/core/v1"
3838
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3939

40-
"github.com/summerwind/actions-runner-controller/api/v1alpha1"
41-
"github.com/summerwind/actions-runner-controller/controllers/metrics"
40+
"github.com/actions-runner-controller/actions-runner-controller/api/v1alpha1"
41+
"github.com/actions-runner-controller/actions-runner-controller/controllers/metrics"
4242
)
4343

4444
const (
@@ -154,7 +154,7 @@ func (r *RunnerDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Req
154154
// A selector update change doesn't trigger replicaset replacement,
155155
// but we still need to update the existing replicaset with it.
156156
// Otherwise selector-based runner query will never work on replicasets created before the controller v0.17.0
157-
// See https://github.com/summerwind/actions-runner-controller/pull/355#discussion_r585379259
157+
// See https://github.com/actions-runner-controller/actions-runner-controller/pull/355#discussion_r585379259
158158
if err := r.Client.Update(ctx, updateSet); err != nil {
159159
log.Error(err, "Failed to update runnerreplicaset resource")
160160

0 commit comments

Comments
 (0)