Merge pull request #633 from weaveworks/host-alias-runner-pod

add host aliases to the runner pod template

Author: Chanwit Kaewkasi

api/v1alpha2/reference_types.go

@@ -202,6 +202,10 @@ type RunnerPodSpec struct {
 	// Set up Init Containers for the Runner
 	// +optional
 	InitContainers []corev1.Container `json:"initContainers,omitempty"`
+
+	// Set host aliases for the Runner Pod
+	// +optional
+	HostAliases []corev1.HostAlias `json:"hostAliases,omitempty"`
 }
 
 func (in HealthCheck) GetTimeout() time.Duration {

api/v1alpha2/zz_generated.deepcopy.go

@@ -2,5 +2,5 @@ apiVersion: v2
 name: tf-controller
 description: The Helm chart for Weave GitOps Terraform Controller
 type: application
-version: 0.14.0
+version: 0.15.0
 appVersion: "v0.15.0-rc.1"

charts/tf-controller/Chart.yaml

@@ -1,6 +1,6 @@
 # Weave GitOps Terraform Controller
 
-![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.0-rc.1](https://img.shields.io/badge/AppVersion-v0.15.0--rc.1-informational?style=flat-square)
+![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.15.0-rc.1](https://img.shields.io/badge/AppVersion-v0.15.0--rc.1-informational?style=flat-square)
 
 The Helm chart for Weave GitOps Terraform Controller
 

charts/tf-controller/README.md

@@ -6307,6 +6307,23 @@ spec:
                               x-kubernetes-map-type: atomic
                           type: object
                         type: array
+                      hostAliases:
+                        description: Set host aliases for the Runner Pod
+                        items:
+                          description: HostAlias holds the mapping between IP and
+                            hostnames that will be injected as an entry in the pod's
+                            hosts file.
+                          properties:
+                            hostnames:
+                              description: Hostnames for the above IP address.
+                              items:
+                                type: string
+                              type: array
+                            ip:
+                              description: IP address of the host file entry.
+                              type: string
+                          type: object
+                        type: array
                       image:
                         description: Runner pod image to use other than default
                         type: string

charts/tf-controller/templates/crds.yaml

@@ -6305,6 +6305,23 @@ spec:
                               x-kubernetes-map-type: atomic
                           type: object
                         type: array
+                      hostAliases:
+                        description: Set host aliases for the Runner Pod
+                        items:
+                          description: HostAlias holds the mapping between IP and
+                            hostnames that will be injected as an entry in the pod's
+                            hosts file.
+                          properties:
+                            hostnames:
+                              description: Hostnames for the above IP address.
+                              items:
+                                type: string
+                              type: array
+                            ip:
+                              description: IP address of the host file entry.
+                              type: string
+                          type: object
+                        type: array
                       image:
                         description: Runner pod image to use other than default
                         type: string

config/crd/bases/infra.contrib.fluxcd.io_terraforms.yaml

@@ -44,3 +44,6 @@ spec:
         instance: helloworld-tf # This is the name of the Terraform resource
     spec:
       image: localhost:5000/weaveworks/tf-runner
+      hostAliases:
+      - hostnames:
+        - host.docker.internal

config/tilt/test/tf-dev-subject.yaml

@@ -60,6 +60,11 @@ func Test_000260_runner_pod_test(t *testing.T) {
 				},
 				Spec: infrav1.RunnerPodSpec{
 					Image: runnerPodImage,
+					HostAliases: []corev1.HostAlias{
+						{
+							Hostnames: []string{"foo", "bar"},
+						},
+					},
 				},
 			},
 		},
@@ -68,6 +73,7 @@ func Test_000260_runner_pod_test(t *testing.T) {
 	spec := reconciler.runnerPodSpec(helloWorldTF, "runner.tls-123")
 	g.Expect(spec.ServiceAccountName).To(Equal(serviceAccountName))
 	g.Expect(spec.Containers[0].Image).To(Equal(runnerPodImage))
+	g.Expect(spec.HostAliases[0].Hostnames).To(Equal([]string{"foo", "bar"}))
 
 	podTemplate, err := runnerPodTemplate(helloWorldTF, "runner.tls-123", revision)
 	g.Expect(err).ToNot(HaveOccurred())

controllers/tc000260_runner_pod_test.go

@@ -276,6 +276,7 @@ func (r *TerraformReconciler) runnerPodSpec(terraform infrav1.Terraform, tlsSecr
 		NodeSelector:       terraform.Spec.RunnerPodTemplate.Spec.NodeSelector,
 		Affinity:           terraform.Spec.RunnerPodTemplate.Spec.Affinity,
 		Tolerations:        terraform.Spec.RunnerPodTemplate.Spec.Tolerations,
+		HostAliases:        terraform.Spec.RunnerPodTemplate.Spec.HostAliases,
 	}
 }