public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix runner pod dnsConfig (#1227) 

Fixes #1226
Fixes #1224

Signed-off-by: Jeff Billimek <jeff@billimek.com>
This commit is contained in:
Jeff Billimek 2022-04-19 21:55:20 -04:00 committed by GitHub
parent cb4e1fa8f2
commit 13bfa2da4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 157 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1alpha1/runner_types.go
View File

@ -153,7 +153,7 @@ type RunnerPodSpec struct {
RuntimeClassName *string `json:"runtimeClassName,omitempty"` RuntimeClassName *string `json:"runtimeClassName,omitempty"`
// +optional // +optional
DnsConfig []corev1.PodDNSConfig `json:"dnsConfig,omitempty"` DnsConfig *corev1.PodDNSConfig `json:"dnsConfig,omitempty"`
} }
// ValidateRepository validates repository field. // ValidateRepository validates repository field.

6
api/v1alpha1/zz_generated.deepcopy.go
View File

@ -738,10 +738,8 @@ func (in *RunnerPodSpec) DeepCopyInto(out *RunnerPodSpec) {
} }
if in.DnsConfig != nil { if in.DnsConfig != nil {
in, out := &in.DnsConfig, &out.DnsConfig in, out := &in.DnsConfig, &out.DnsConfig
*out = make([]v1.PodDNSConfig, len(*in)) *out = new(v1.PodDNSConfig)
for i := range *in { (*in).DeepCopyInto(*out)
(*in)[i].DeepCopyInto(&(*out)[i])
}
} }
} }

2
charts/actions-runner-controller/crds/actions.summerwind.dev_runnerdeployments.yaml
View File

@ -1354,7 +1354,6 @@ spec:
type: object type: object
type: array type: array
dnsConfig: dnsConfig:
items:
description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
properties: properties:
nameservers: nameservers:
@ -1380,7 +1379,6 @@ spec:
type: string type: string
type: array type: array
type: object type: object
type: array
dockerEnabled: dockerEnabled:
type: boolean type: boolean
dockerEnv: dockerEnv:

2
charts/actions-runner-controller/crds/actions.summerwind.dev_runnerreplicasets.yaml
View File

@ -1351,7 +1351,6 @@ spec:
type: object type: object
type: array type: array
dnsConfig: dnsConfig:
items:
description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
properties: properties:
nameservers: nameservers:
@ -1377,7 +1376,6 @@ spec:
type: string type: string
type: array type: array
type: object type: object
type: array
dockerEnabled: dockerEnabled:
type: boolean type: boolean
dockerEnv: dockerEnv:

2
charts/actions-runner-controller/crds/actions.summerwind.dev_runners.yaml
View File

@ -1292,7 +1292,6 @@ spec:
type: object type: object
type: array type: array
dnsConfig: dnsConfig:
items:
description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
properties: properties:
nameservers: nameservers:
@ -1318,7 +1317,6 @@ spec:
type: string type: string
type: array type: array
type: object type: object
type: array
dockerEnabled: dockerEnabled:
type: boolean type: boolean
dockerEnv: dockerEnv:

2
config/crd/bases/actions.summerwind.dev_runnerdeployments.yaml
View File

@ -1354,7 +1354,6 @@ spec:
type: object type: object
type: array type: array
dnsConfig: dnsConfig:
items:
description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
properties: properties:
nameservers: nameservers:
@ -1380,7 +1379,6 @@ spec:
type: string type: string
type: array type: array
type: object type: object
type: array
dockerEnabled: dockerEnabled:
type: boolean type: boolean
dockerEnv: dockerEnv:

2
config/crd/bases/actions.summerwind.dev_runnerreplicasets.yaml
View File

@ -1351,7 +1351,6 @@ spec:
type: object type: object
type: array type: array
dnsConfig: dnsConfig:
items:
description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
properties: properties:
nameservers: nameservers:
@ -1377,7 +1376,6 @@ spec:
type: string type: string
type: array type: array
type: object type: object
type: array
dockerEnabled: dockerEnabled:
type: boolean type: boolean
dockerEnv: dockerEnv:

2
config/crd/bases/actions.summerwind.dev_runners.yaml
View File

@ -1292,7 +1292,6 @@ spec:
type: object type: object
type: array type: array
dnsConfig: dnsConfig:
items:
description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.
properties: properties:
nameservers: nameservers:
@ -1318,7 +1317,6 @@ spec:
type: string type: string
type: array type: array
type: object type: object
type: array
dockerEnabled: dockerEnabled:
type: boolean type: boolean
dockerEnv: dockerEnv:

4
controllers/runner_controller.go
View File

@ -453,6 +453,10 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
pod.Spec.HostAliases = runnerSpec.HostAliases pod.Spec.HostAliases = runnerSpec.HostAliases
} }
if runnerSpec.DnsConfig != nil {
pod.Spec.DNSConfig = runnerSpec.DnsConfig
}
if runnerSpec.RuntimeClassName != nil { if runnerSpec.RuntimeClassName != nil {
pod.Spec.RuntimeClassName = runnerSpec.RuntimeClassName pod.Spec.RuntimeClassName = runnerSpec.RuntimeClassName
} }