Add helm values

sapcc · Feb 15, 2024 · 514a82a · 514a82a
1 parent 3a502fc
commit 514a82a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/pkg/controller/ground.go b/pkg/controller/ground.go
@@ -301,7 +301,7 @@ func (op *GroundControl) handler(key string) error {
 				if err != nil {
 					return err
 				}
-				err = op.reconcileSeed(kluster, projectClient, helmValues)
+				err = op.reconcileSeed(kluster, projectClient, helmValues, klusterSecret)
 				if err != nil {
 					return err
 				}
@@ -345,7 +345,7 @@ func (op *GroundControl) handler(key string) error {
 				if err != nil {
 					return err
 				}
-				if err := op.reconcileSeed(kluster, projectClient, helmValues); err != nil {
+				if err := op.reconcileSeed(kluster, projectClient, helmValues, klusterSecret); err != nil {
 					op.Logger.Log(
 						"msg", "Failed seed reconciliation",
 						"kluster", kluster.GetName(),
@@ -475,7 +475,7 @@ func (op *GroundControl) handler(key string) error {
 	return nil
 }
 
-func (op *GroundControl) reconcileSeed(kluster *v1.Kluster, projectClient project.ProjectClient, helmValues map[string]interface{}) error {
+func (op *GroundControl) reconcileSeed(kluster *v1.Kluster, projectClient project.ProjectClient, helmValues map[string]interface{}, secret *v1.Secret) error {
 	isNetErr := func(err error) bool {
 		current := err
 		for current != nil {
@@ -489,7 +489,7 @@ func (op *GroundControl) reconcileSeed(kluster *v1.Kluster, projectClient projec
 	}
 
 	seedReconciler := ground.NewSeedReconciler(&op.Clients, kluster, op.Logger)
-	if err := seedReconciler.EnrichHelmValuesForSeed(projectClient, helmValues, kluster.Spec.CustomCNI, kluster.Spec.SeedKubeadm); err != nil {
+	if err := seedReconciler.EnrichHelmValuesForSeed(projectClient, helmValues, kluster, secret); err != nil {
 		if !isNetErr(err) {
 			metrics.SeedReconciliationFailuresTotal.With(prometheus.Labels{"kluster_name": kluster.Spec.Name}).Inc()
 		}

diff --git a/pkg/controller/ground/reconciler.go b/pkg/controller/ground/reconciler.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	jsonpatch "github.com/evanphx/json-patch"
@@ -62,7 +63,7 @@ type SeedReconciler struct {
 	Logger  log.Logger
 }
 
-func (sr *SeedReconciler) EnrichHelmValuesForSeed(client project.ProjectClient, values map[string]interface{}, customCNI, seedKubeadm bool) error {
+func (sr *SeedReconciler) EnrichHelmValuesForSeed(client project.ProjectClient, values map[string]interface{}, kluster *v1.Kluster, secret *v1.Secret) error {
 	metadata, err := client.GetMetadata()
 	if err != nil {
 		return err
@@ -95,8 +96,11 @@ func (sr *SeedReconciler) EnrichHelmValuesForSeed(client project.ProjectClient,
 		"domain":  sr.Kluster.Spec.DNSDomain,
 		"kube":    isKubeDns,
 	}
-	values["customCNI"] = customCNI
-	values["seedKubeadm"] = seedKubeadm
+	values["customCNI"] = kluster.Spec.CustomCNI
+	values["seedKubeadm"] = kluster.Spec.SeedKubeadm
+	idx := strings.LastIndex(kluster.Spec.Name, "-")
+	values["shortName"] = kluster.Spec.Name[:idx]
+	values["tlsCaCert"] = secret.TLSCACertificate
 	return nil
 }