Fix runner pod dnsConfig (#1227)
Fixes #1226 Fixes #1224 Signed-off-by: Jeff Billimek <jeff@billimek.com>
This commit is contained in:
		
							parent
							
								
									cb4e1fa8f2
								
							
						
					
					
						commit
						13bfa2da4e
					
				|  | @ -153,7 +153,7 @@ type RunnerPodSpec struct { | |||
| 	RuntimeClassName *string `json:"runtimeClassName,omitempty"` | ||||
| 
 | ||||
| 	// +optional
 | ||||
| 	DnsConfig []corev1.PodDNSConfig `json:"dnsConfig,omitempty"` | ||||
| 	DnsConfig *corev1.PodDNSConfig `json:"dnsConfig,omitempty"` | ||||
| } | ||||
| 
 | ||||
| // ValidateRepository validates repository field.
 | ||||
|  |  | |||
|  | @ -738,10 +738,8 @@ func (in *RunnerPodSpec) DeepCopyInto(out *RunnerPodSpec) { | |||
| 	} | ||||
| 	if in.DnsConfig != nil { | ||||
| 		in, out := &in.DnsConfig, &out.DnsConfig | ||||
| 		*out = make([]v1.PodDNSConfig, len(*in)) | ||||
| 		for i := range *in { | ||||
| 			(*in)[i].DeepCopyInto(&(*out)[i]) | ||||
| 		} | ||||
| 		*out = new(v1.PodDNSConfig) | ||||
| 		(*in).DeepCopyInto(*out) | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
|  |  | |||
|  | @ -1354,7 +1354,6 @@ spec: | |||
|                             type: object | ||||
|                           type: array | ||||
|                         dnsConfig: | ||||
|                           items: | ||||
|                           description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. | ||||
|                           properties: | ||||
|                             nameservers: | ||||
|  | @ -1380,7 +1379,6 @@ spec: | |||
|                                 type: string | ||||
|                               type: array | ||||
|                           type: object | ||||
|                           type: array | ||||
|                         dockerEnabled: | ||||
|                           type: boolean | ||||
|                         dockerEnv: | ||||
|  |  | |||
|  | @ -1351,7 +1351,6 @@ spec: | |||
|                             type: object | ||||
|                           type: array | ||||
|                         dnsConfig: | ||||
|                           items: | ||||
|                           description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. | ||||
|                           properties: | ||||
|                             nameservers: | ||||
|  | @ -1377,7 +1376,6 @@ spec: | |||
|                                 type: string | ||||
|                               type: array | ||||
|                           type: object | ||||
|                           type: array | ||||
|                         dockerEnabled: | ||||
|                           type: boolean | ||||
|                         dockerEnv: | ||||
|  |  | |||
|  | @ -1292,7 +1292,6 @@ spec: | |||
|                     type: object | ||||
|                   type: array | ||||
|                 dnsConfig: | ||||
|                   items: | ||||
|                   description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. | ||||
|                   properties: | ||||
|                     nameservers: | ||||
|  | @ -1318,7 +1317,6 @@ spec: | |||
|                         type: string | ||||
|                       type: array | ||||
|                   type: object | ||||
|                   type: array | ||||
|                 dockerEnabled: | ||||
|                   type: boolean | ||||
|                 dockerEnv: | ||||
|  |  | |||
|  | @ -1354,7 +1354,6 @@ spec: | |||
|                             type: object | ||||
|                           type: array | ||||
|                         dnsConfig: | ||||
|                           items: | ||||
|                           description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. | ||||
|                           properties: | ||||
|                             nameservers: | ||||
|  | @ -1380,7 +1379,6 @@ spec: | |||
|                                 type: string | ||||
|                               type: array | ||||
|                           type: object | ||||
|                           type: array | ||||
|                         dockerEnabled: | ||||
|                           type: boolean | ||||
|                         dockerEnv: | ||||
|  |  | |||
|  | @ -1351,7 +1351,6 @@ spec: | |||
|                             type: object | ||||
|                           type: array | ||||
|                         dnsConfig: | ||||
|                           items: | ||||
|                           description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. | ||||
|                           properties: | ||||
|                             nameservers: | ||||
|  | @ -1377,7 +1376,6 @@ spec: | |||
|                                 type: string | ||||
|                               type: array | ||||
|                           type: object | ||||
|                           type: array | ||||
|                         dockerEnabled: | ||||
|                           type: boolean | ||||
|                         dockerEnv: | ||||
|  |  | |||
|  | @ -1292,7 +1292,6 @@ spec: | |||
|                     type: object | ||||
|                   type: array | ||||
|                 dnsConfig: | ||||
|                   items: | ||||
|                   description: PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy. | ||||
|                   properties: | ||||
|                     nameservers: | ||||
|  | @ -1318,7 +1317,6 @@ spec: | |||
|                         type: string | ||||
|                       type: array | ||||
|                   type: object | ||||
|                   type: array | ||||
|                 dockerEnabled: | ||||
|                   type: boolean | ||||
|                 dockerEnv: | ||||
|  |  | |||
|  | @ -453,6 +453,10 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) { | |||
| 		pod.Spec.HostAliases = runnerSpec.HostAliases | ||||
| 	} | ||||
| 
 | ||||
| 	if runnerSpec.DnsConfig != nil { | ||||
| 		pod.Spec.DNSConfig = runnerSpec.DnsConfig | ||||
| 	} | ||||
| 
 | ||||
| 	if runnerSpec.RuntimeClassName != nil { | ||||
| 		pod.Spec.RuntimeClassName = runnerSpec.RuntimeClassName | ||||
| 	} | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue