Add env vars to the whisker deployment

Author: WilliamTigera

pkg/controller/whisker/controller.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"fmt"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -26,7 +27,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
+	v3 "github.com/tigera/api/pkg/apis/projectcalico/v3"
 	operatorv1 "github.com/tigera/operator/api/v1"
+
 	"github.com/tigera/operator/pkg/common"
 	"github.com/tigera/operator/pkg/controller/certificatemanager"
 	"github.com/tigera/operator/pkg/controller/options"
@@ -197,6 +200,14 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 	)
 	if err != nil {
 		r.status.SetDegraded(operatorv1.ResourceCreateError, "Unable to create the trusted bundle", err, reqLogger)
+		return reconcile.Result{}, err
+	}
+
+	clusterInfo := &v3.ClusterInformation{ObjectMeta: metav1.ObjectMeta{Name: "default"}}
+	err = r.cli.Get(ctx, client.ObjectKeyFromObject(clusterInfo), clusterInfo)
+	if err != nil {
+		r.status.SetDegraded(operatorv1.ResourceReadError, "Failed to get ClusterInformation: ", err, reqLogger)
+		return reconcile.Result{}, err
 	}
 
 	ch := utils.NewComponentHandler(log, r.cli, r.scheme, whiskerCR)
@@ -206,6 +217,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 		Installation:          installation,
 		TrustedCertBundle:     trustedBundle,
 		WhiskerBackendKeyPair: backendKeyPair,
+		WhiskerID:             clusterInfo.Spec.ClusterGUID,
+		ClusterType:           clusterInfo.Spec.ClusterType,
+		CalicoVersion:         clusterInfo.Spec.CalicoVersion,
 	}
 
 	certComponent := rcertificatemanagement.CertificateManagement(&rcertificatemanagement.Config{

pkg/render/whisker/component.go

@@ -64,6 +64,10 @@ type Configuration struct {
 	Installation          *operatorv1.InstallationSpec
 	TrustedCertBundle     certificatemanagement.TrustedBundleRO
 	WhiskerBackendKeyPair certificatemanagement.KeyPairInterface
+
+	WhiskerID     string
+	CalicoVersion string
+	ClusterType   string
 }
 
 type Component struct {
@@ -133,6 +137,9 @@ func (c *Component) whiskerContainer() corev1.Container {
 		ImagePullPolicy: render.ImagePullPolicy(),
 		Env: []corev1.EnvVar{
 			{Name: "LOG_LEVEL", Value: "INFO"},
+			{Name: "CALICO_VERSION", Value: c.cfg.CalicoVersion},
+			{Name: "WHISKER_ID", Value: c.cfg.WhiskerID},
+			{Name: "CLUSTER_TYPE", Value: string(c.cfg.ClusterType)},
 		},
 		SecurityContext: securitycontext.NewNonRootContext(),
 	}

pkg/render/whisker/component_test.go

@@ -86,6 +86,9 @@ var _ = Describe("ComponentRendering", func() {
 				},
 				TrustedCertBundle:     defaultTrustedCertBundle,
 				WhiskerBackendKeyPair: defaultTLSKeyPair,
+				WhiskerID:             "test-whisker-id",
+				CalicoVersion:         "test-calico-version",
+				ClusterType:           "test-cluster-type",
 			},
 			&appsv1.Deployment{
 				TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: "apps/v1"},
@@ -112,6 +115,9 @@ var _ = Describe("ComponentRendering", func() {
 									ImagePullPolicy: render.ImagePullPolicy(),
 									Env: []corev1.EnvVar{
 										{Name: "LOG_LEVEL", Value: "INFO"},
+										{Name: "CALICO_VERSION", Value: "test-calico-version"},
+										{Name: "WHISKER_ID", Value: "test-whisker-id"},
+										{Name: "CLUSTER_TYPE", Value: "test-cluster-type"},
 									},
 									SecurityContext: securitycontext.NewNonRootContext(),
 								},