Skip to content

Commit 7a5996f

Browse files
authored
Remove old githubrunnerscalesetlistener, remove warning and fix config bug (#3937)
1 parent 87938ee commit 7a5996f

22 files changed

Lines changed: 18 additions & 3618 deletions

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ RUN --mount=target=. \
3737
--mount=type=cache,mode=0777,target=${GOCACHE} \
3838
export GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} && \
3939
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 && \
40-
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/github-runnerscaleset-listener ./cmd/githubrunnerscalesetlistener && \
4140
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 && \
4241
go build -trimpath -ldflags="-s -w" -o /out/github-webhook-server ./cmd/githubwebhookserver && \
4342
go build -trimpath -ldflags="-s -w" -o /out/actions-metrics-server ./cmd/actionsmetricsserver && \
@@ -52,7 +51,6 @@ WORKDIR /
5251
COPY --from=builder /out/manager .
5352
COPY --from=builder /out/github-webhook-server .
5453
COPY --from=builder /out/actions-metrics-server .
55-
COPY --from=builder /out/github-runnerscaleset-listener .
5654
COPY --from=builder /out/ghalistener .
5755
COPY --from=builder /out/sleep .
5856

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ test-with-deps: kube-apiserver etcd kubectl
8787
# Build manager binary
8888
manager: generate fmt vet
8989
go build -o bin/manager main.go
90-
go build -o bin/github-runnerscaleset-listener ./cmd/githubrunnerscalesetlistener
90+
go build -o bin/github-runnerscaleset-listener ./cmd/ghalistener
9191

9292
# Run against the configured Kubernetes cluster in ~/.kube/config
9393
run: generate fmt vet manifests
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
Thank you for installing {{ .Chart.Name }}.
22

33
Your release is named {{ .Release.Name }}.
4-
5-
WARNING: Older version of the listener (githubrunnerscalesetlistener) is deprecated and will be removed in the future gha-runner-scale-set-0.10.0 release. If you are using environment variable override to force the old listener, please remove the environment variable and use the new listener (ghalistener) instead.

cmd/ghalistener/config/config.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ import (
1616
)
1717

1818
type Config struct {
19-
ConfigureUrl string `json:"configureUrl"`
20-
AppID int64 `json:"appID"`
21-
AppInstallationID int64 `json:"appInstallationID"`
22-
AppPrivateKey string `json:"appPrivateKey"`
19+
ConfigureUrl string `json:"configure_url"`
20+
AppID int64 `json:"app_id"`
21+
AppInstallationID int64 `json:"app_installation_id"`
22+
AppPrivateKey string `json:"app_private_key"`
2323
Token string `json:"token"`
24-
EphemeralRunnerSetNamespace string `json:"ephemeralRunnerSetNamespace"`
25-
EphemeralRunnerSetName string `json:"ephemeralRunnerSetName"`
26-
MaxRunners int `json:"maxRunners"`
27-
MinRunners int `json:"minRunners"`
28-
RunnerScaleSetId int `json:"runnerScaleSetId"`
29-
RunnerScaleSetName string `json:"runnerScaleSetName"`
30-
ServerRootCA string `json:"serverRootCA"`
31-
LogLevel string `json:"logLevel"`
32-
LogFormat string `json:"logFormat"`
33-
MetricsAddr string `json:"metricsAddr"`
34-
MetricsEndpoint string `json:"metricsEndpoint"`
24+
EphemeralRunnerSetNamespace string `json:"ephemeral_runner_set_namespace"`
25+
EphemeralRunnerSetName string `json:"ephemeral_runner_set_name"`
26+
MaxRunners int `json:"max_runners"`
27+
MinRunners int `json:"min_runners"`
28+
RunnerScaleSetId int `json:"runner_scale_set_id"`
29+
RunnerScaleSetName string `json:"runner_scale_set_name"`
30+
ServerRootCA string `json:"server_root_ca"`
31+
LogLevel string `json:"log_level"`
32+
LogFormat string `json:"log_format"`
33+
MetricsAddr string `json:"metrics_addr"`
34+
MetricsEndpoint string `json:"metrics_endpoint"`
3535
}
3636

3737
func Read(path string) (Config, error) {

cmd/githubrunnerscalesetlistener/autoScalerKubernetesManager.go

Lines changed: 0 additions & 129 deletions
This file was deleted.

cmd/githubrunnerscalesetlistener/autoScalerMessageListener.go

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)