public_git/actions-runner-controller
1
0
Fork 0
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git synced 2026-10-19 05:46:18 +02:00
Code Issues Projects Releases Wiki Activity

Renam Url to URL

Browse Source
This commit is contained in:
Nikola Jokic
2026-06-15 10:41:30 +02:00
parent 0e921def3b
commit 6089fcbb3f
11 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apis/actions.github.com/v1alpha1/autoscalingrunnerset_types.go
+8 -5
View File
@@ -179,9 +179,9 @@ func (c *ProxyConfig) ToHTTPProxyConfig(secretFetcher func(string) (*corev1.Secr
} }
if c.HTTP != nil { if c.HTTP != nil {
u, err := url.Parse(c.HTTP.Url) u, err := url.Parse(c.HTTP.URL)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse proxy http url %q: %w", c.HTTP.Url, err) return nil, fmt.Errorf("failed to parse proxy http url %q: %w", c.HTTP.URL, err)
} }
if c.HTTP.CredentialSecretRef != "" { if c.HTTP.CredentialSecretRef != "" {
@@ -204,9 +204,9 @@ func (c *ProxyConfig) ToHTTPProxyConfig(secretFetcher func(string) (*corev1.Secr
} }
if c.HTTPS != nil { if c.HTTPS != nil {
u, err := url.Parse(c.HTTPS.Url) u, err := url.Parse(c.HTTPS.URL)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse proxy https url %q: %w", c.HTTPS.Url, err) return nil, fmt.Errorf("failed to parse proxy https url %q: %w", c.HTTPS.URL, err)
} }
if c.HTTPS.CredentialSecretRef != "" { if c.HTTPS.CredentialSecretRef != "" {
@@ -260,7 +260,7 @@ func (c *ProxyConfig) ProxyFunc(secretFetcher func(string) (*corev1.Secret, erro
type ProxyServerConfig struct { type ProxyServerConfig struct {
// Required // Required
Url string `json:"url,omitempty"` URL string `json:"url,omitempty"`
// +optional // +optional
CredentialSecretRef string `json:"credentialSecretRef,omitempty"` CredentialSecretRef string `json:"credentialSecretRef,omitempty"`
@@ -324,10 +324,13 @@ type AutoscalingRunnerSetStatus struct {
// EphemeralRunner counts separated by the stage ephemeral runners are in, taken from the EphemeralRunnerSet // EphemeralRunner counts separated by the stage ephemeral runners are in, taken from the EphemeralRunnerSet
// +optional // +optional
// +kubebuilder:validation:Minimum=0
PendingEphemeralRunners int `json:"pendingEphemeralRunners"` PendingEphemeralRunners int `json:"pendingEphemeralRunners"`
// +optional // +optional
// +kubebuilder:validation:Minimum=0
RunningEphemeralRunners int `json:"runningEphemeralRunners"` RunningEphemeralRunners int `json:"runningEphemeralRunners"`
// +optional // +optional
// +kubebuilder:validation:Minimum=0
FailedEphemeralRunners int `json:"failedEphemeralRunners"` FailedEphemeralRunners int `json:"failedEphemeralRunners"`
} }
apis/actions.github.com/v1alpha1/proxy_config_test.go
+4 -4
View File
@@ -14,11 +14,11 @@ import (
func TestProxyConfig_ToSecret(t *testing.T) { func TestProxyConfig_ToSecret(t *testing.T) {
config := &v1alpha1.ProxyConfig{ config := &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: "http://proxy.example.com:8080", URL: "http://proxy.example.com:8080",
CredentialSecretRef: "my-secret", CredentialSecretRef: "my-secret",
}, },
HTTPS: &v1alpha1.ProxyServerConfig{ HTTPS: &v1alpha1.ProxyServerConfig{
Url: "https://proxy.example.com:8080", URL: "https://proxy.example.com:8080",
CredentialSecretRef: "my-secret", CredentialSecretRef: "my-secret",
}, },
NoProxy: []string{ NoProxy: []string{
@@ -48,11 +48,11 @@ func TestProxyConfig_ToSecret(t *testing.T) {
func TestProxyConfig_ProxyFunc(t *testing.T) { func TestProxyConfig_ProxyFunc(t *testing.T) {
config := &v1alpha1.ProxyConfig{ config := &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: "http://proxy.example.com:8080", URL: "http://proxy.example.com:8080",
CredentialSecretRef: "my-secret", CredentialSecretRef: "my-secret",
}, },
HTTPS: &v1alpha1.ProxyServerConfig{ HTTPS: &v1alpha1.ProxyServerConfig{
Url: "https://proxy.example.com:8080", URL: "https://proxy.example.com:8080",
CredentialSecretRef: "my-secret", CredentialSecretRef: "my-secret",
}, },
NoProxy: []string{ NoProxy: []string{
charts/gha-runner-scale-set-controller-experimental/crds/actions.github.com_autoscalingrunnersets.yaml
+3
View File
@@ -16547,12 +16547,15 @@ spec:
minimum: 0 minimum: 0
type: integer type: integer
failedEphemeralRunners: failedEphemeralRunners:
minimum: 0
type: integer type: integer
pendingEphemeralRunners: pendingEphemeralRunners:
minimum: 0
type: integer type: integer
phase: phase:
type: string type: string
runningEphemeralRunners: runningEphemeralRunners:
minimum: 0
type: integer type: integer
type: object type: object
type: object type: object
charts/gha-runner-scale-set-controller/crds/actions.github.com_autoscalingrunnersets.yaml
+3
View File
@@ -16547,12 +16547,15 @@ spec:
minimum: 0 minimum: 0
type: integer type: integer
failedEphemeralRunners: failedEphemeralRunners:
minimum: 0
type: integer type: integer
pendingEphemeralRunners: pendingEphemeralRunners:
minimum: 0
type: integer type: integer
phase: phase:
type: string type: string
runningEphemeralRunners: runningEphemeralRunners:
minimum: 0
type: integer type: integer
type: object type: object
type: object type: object
charts/gha-runner-scale-set/tests/template_test.go
+2 -2
View File
@@ -1364,11 +1364,11 @@ func TestTemplateRenderedWithProxy(t *testing.T) {
require.NotNil(t, ars.Spec.Proxy) require.NotNil(t, ars.Spec.Proxy)
require.NotNil(t, ars.Spec.Proxy.HTTP) require.NotNil(t, ars.Spec.Proxy.HTTP)
assert.Equal(t, "http://proxy.example.com", ars.Spec.Proxy.HTTP.Url) assert.Equal(t, "http://proxy.example.com", ars.Spec.Proxy.HTTP.URL)
assert.Equal(t, "http-secret", ars.Spec.Proxy.HTTP.CredentialSecretRef) assert.Equal(t, "http-secret", ars.Spec.Proxy.HTTP.CredentialSecretRef)
require.NotNil(t, ars.Spec.Proxy.HTTPS) require.NotNil(t, ars.Spec.Proxy.HTTPS)
assert.Equal(t, "https://proxy.example.com", ars.Spec.Proxy.HTTPS.Url) assert.Equal(t, "https://proxy.example.com", ars.Spec.Proxy.HTTPS.URL)
assert.Equal(t, "https-secret", ars.Spec.Proxy.HTTPS.CredentialSecretRef) assert.Equal(t, "https-secret", ars.Spec.Proxy.HTTPS.CredentialSecretRef)
require.NotNil(t, ars.Spec.Proxy.NoProxy) require.NotNil(t, ars.Spec.Proxy.NoProxy)
config/crd/bases/actions.github.com_autoscalingrunnersets.yaml
+3
View File
@@ -16547,12 +16547,15 @@ spec:
minimum: 0 minimum: 0
type: integer type: integer
failedEphemeralRunners: failedEphemeralRunners:
minimum: 0
type: integer type: integer
pendingEphemeralRunners: pendingEphemeralRunners:
minimum: 0
type: integer type: integer
phase: phase:
type: string type: string
runningEphemeralRunners: runningEphemeralRunners:
minimum: 0
type: integer type: integer
type: object type: object
type: object type: object
controllers/actions.github.com/autoscalinglistener_controller_test.go
+2 -2
View File
@@ -954,11 +954,11 @@ var _ = Describe("Test AutoScalingListener controller with proxy", func() {
proxy := &v1alpha1.ProxyConfig{ proxy := &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: "http://localhost:8080", URL: "http://localhost:8080",
CredentialSecretRef: "proxy-credentials", CredentialSecretRef: "proxy-credentials",
}, },
HTTPS: &v1alpha1.ProxyServerConfig{ HTTPS: &v1alpha1.ProxyServerConfig{
Url: "https://localhost:8443", URL: "https://localhost:8443",
CredentialSecretRef: "proxy-credentials", CredentialSecretRef: "proxy-credentials",
}, },
NoProxy: []string{ NoProxy: []string{
controllers/actions.github.com/autoscalingrunnerset_controller_test.go
+2 -2
View File
@@ -1353,7 +1353,7 @@ var _ = Describe("Test client optional configuration", Ordered, func() {
RunnerGroup: "testgroup", RunnerGroup: "testgroup",
Proxy: &v1alpha1.ProxyConfig{ Proxy: &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: proxy.URL, URL: proxy.URL,
}, },
}, },
Template: corev1.PodTemplateSpec{ Template: corev1.PodTemplateSpec{
@@ -1431,7 +1431,7 @@ var _ = Describe("Test client optional configuration", Ordered, func() {
RunnerGroup: "testgroup", RunnerGroup: "testgroup",
Proxy: &v1alpha1.ProxyConfig{ Proxy: &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: "http://test:password@" + proxy.Listener.Addr().String(), URL: "http://test:password@" + proxy.Listener.Addr().String(),
CredentialSecretRef: "proxy-credentials", CredentialSecretRef: "proxy-credentials",
}, },
}, },
controllers/actions.github.com/ephemeralrunner_controller_test.go
+3 -3
View File
@@ -1367,7 +1367,7 @@ var _ = Describe("EphemeralRunner", func() {
ephemeralRunner.Spec.GitHubConfigURL = "http://example.com/org/repo" ephemeralRunner.Spec.GitHubConfigURL = "http://example.com/org/repo"
ephemeralRunner.Spec.Proxy = &v1alpha1.ProxyConfig{ ephemeralRunner.Spec.Proxy = &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: proxy.URL, URL: proxy.URL,
CredentialSecretRef: "proxy-credentials", CredentialSecretRef: "proxy-credentials",
}, },
} }
@@ -1388,10 +1388,10 @@ var _ = Describe("EphemeralRunner", func() {
ephemeralRunner := newExampleRunner("test-runner", autoScalingNS.Name, configSecret.Name) ephemeralRunner := newExampleRunner("test-runner", autoScalingNS.Name, configSecret.Name)
ephemeralRunner.Spec.Proxy = &v1alpha1.ProxyConfig{ ephemeralRunner.Spec.Proxy = &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: "http://proxy.example.com:8080", URL: "http://proxy.example.com:8080",
}, },
HTTPS: &v1alpha1.ProxyServerConfig{ HTTPS: &v1alpha1.ProxyServerConfig{
Url: "http://proxy.example.com:8080", URL: "http://proxy.example.com:8080",
}, },
NoProxy: []string{"example.com"}, NoProxy: []string{"example.com"},
} }
controllers/actions.github.com/ephemeralrunnerset_controller_test.go
+3 -3
View File
@@ -1327,11 +1327,11 @@ var _ = Describe("Test EphemeralRunnerSet controller with proxy settings", func(
RunnerScaleSetID: 100, RunnerScaleSetID: 100,
Proxy: &v1alpha1.ProxyConfig{ Proxy: &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: "http://proxy.example.com", URL: "http://proxy.example.com",
CredentialSecretRef: secretCredentials.Name, CredentialSecretRef: secretCredentials.Name,
}, },
HTTPS: &v1alpha1.ProxyServerConfig{ HTTPS: &v1alpha1.ProxyServerConfig{
Url: "https://proxy.example.com", URL: "https://proxy.example.com",
CredentialSecretRef: secretCredentials.Name, CredentialSecretRef: secretCredentials.Name,
}, },
NoProxy: []string{"example.com", "example.org"}, NoProxy: []string{"example.com", "example.org"},
@@ -1510,7 +1510,7 @@ var _ = Describe("Test EphemeralRunnerSet controller with proxy settings", func(
RunnerScaleSetID: 100, RunnerScaleSetID: 100,
Proxy: &v1alpha1.ProxyConfig{ Proxy: &v1alpha1.ProxyConfig{
HTTP: &v1alpha1.ProxyServerConfig{ HTTP: &v1alpha1.ProxyServerConfig{
Url: proxy.URL, URL: proxy.URL,
CredentialSecretRef: "proxy-credentials", CredentialSecretRef: "proxy-credentials",
}, },
}, },
controllers/actions.github.com/secretresolver/secret_resolver.go
+4 -4
View File
@@ -85,9 +85,9 @@ func (sr *SecretResolver) GetActionsService(ctx context.Context, obj object.Acti
} }
if proxy.HTTP != nil { if proxy.HTTP != nil {
u, err := url.Parse(proxy.HTTP.Url) u, err := url.Parse(proxy.HTTP.URL)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse proxy http url %q: %w", proxy.HTTP.Url, err) return nil, fmt.Errorf("failed to parse proxy http url %q: %w", proxy.HTTP.URL, err)
} }
if ref := proxy.HTTP.CredentialSecretRef; ref != "" { if ref := proxy.HTTP.CredentialSecretRef; ref != "" {
@@ -101,9 +101,9 @@ func (sr *SecretResolver) GetActionsService(ctx context.Context, obj object.Acti
} }
if proxy.HTTPS != nil { if proxy.HTTPS != nil {
u, err := url.Parse(proxy.HTTPS.Url) u, err := url.Parse(proxy.HTTPS.URL)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to parse proxy https url %q: %w", proxy.HTTPS.Url, err) return nil, fmt.Errorf("failed to parse proxy https url %q: %w", proxy.HTTPS.URL, err)
} }
if ref := proxy.HTTPS.CredentialSecretRef; ref != "" { if ref := proxy.HTTPS.CredentialSecretRef; ref != "" {