fix backporting features

Signed-off-by: Chanwit Kaewkasi <chanwit@gmail.com>

Author: chanwit

api/v1alpha1/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/v1alpha1/zz_generated.deepcopy.go

@@ -174,12 +174,15 @@ func (r *TerraformReconciler) writeOutput(ctx context.Context, terraform infrav1
 	}
 
 	writeOutputsReply, err := runnerClient.WriteOutputs(ctx, &runner.WriteOutputsRequest{
-		Namespace:  terraform.Namespace,
-		Name:       terraform.Name,
-		SecretName: terraform.Spec.WriteOutputsToSecret.Name,
-		Uuid:       string(terraform.UID),
-		Data:       data,
+		Namespace:   terraform.Namespace,
+		Name:        terraform.Name,
+		SecretName:  terraform.Spec.WriteOutputsToSecret.Name,
+		Uuid:        string(terraform.UID),
+		Data:        data,
+		Labels:      terraform.Spec.WriteOutputsToSecret.Labels,
+		Annotations: terraform.Spec.WriteOutputsToSecret.Annotations,
 	})
+
 	if err != nil {
 		return infrav1.TerraformNotReady(
 			terraform,

api/v1alpha2/zz_generated.deepcopy.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/fluxcd/pkg/runtime/logger"
 	errors2 "github.com/pkg/errors"
-	"github.com/weaveworks/tf-controller/api/v1alpha1"
+	infrav1 "github.com/weaveworks/tf-controller/api/v1alpha1"
 	"github.com/weaveworks/tf-controller/mtls"
 	"github.com/weaveworks/tf-controller/runner"
 	"google.golang.org/grpc"
@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func getRunnerPodObjectKey(terraform v1alpha1.Terraform) types.NamespacedName {
+func getRunnerPodObjectKey(terraform infrav1.Terraform) types.NamespacedName {
 	return types.NamespacedName{Namespace: terraform.Namespace, Name: fmt.Sprintf("%s-tf-runner", terraform.Name)}
 }
 
@@ -154,7 +154,7 @@ func (r *TerraformReconciler) getRunnerConnection(ctx context.Context, tlsSecret
 	)
 }
 
-func (r *TerraformReconciler) runnerPodSpec(terraform v1alpha1.Terraform, tlsSecretName string) v1.PodSpec {
+func (r *TerraformReconciler) runnerPodSpec(terraform infrav1.Terraform, tlsSecretName string) v1.PodSpec {
 	serviceAccountName := terraform.Spec.ServiceAccountName
 	if serviceAccountName == "" {
 		serviceAccountName = "tf-runner"
@@ -463,7 +463,7 @@ func (r *TerraformReconciler) reconcileRunnerPod(ctx context.Context, terraform
 // if the cert is not present in the secret or is invalid, it will generate a new cert and
 // write it to the secret. One secret per namespace is created in order to sidestep the need
 // for specifying a pod ip in the certificate SAN field.
-func (r *TerraformReconciler) reconcileRunnerSecret(ctx context.Context, terraform *v1alpha1.Terraform) (*v1.Secret, error) {
+func (r *TerraformReconciler) reconcileRunnerSecret(ctx context.Context, terraform *infrav1.Terraform) (*v1.Secret, error) {
 	log := controllerruntime.LoggerFrom(ctx)
 
 	log.Info("trigger namespace tls secret generation")