remove unused code

tigera · Feb 21, 2025 · d88add3 · d88add3
1 parent 1258982
commit d88add3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/pkg/controller/whisker/whisker_controller.go b/pkg/controller/whisker/whisker_controller.go
@@ -18,9 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -168,18 +166,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
 		return result, err
 	}
 
-	linseedCASecret, err := utils.GetIfExists[corev1.Secret](ctx,
-		types.NamespacedName{Name: render.VoltronLinseedPublicCert, Namespace: common.OperatorNamespace()}, r.cli)
-	if err != nil {
-		return result, err
-	}
-
 	ch := utils.NewComponentHandler(log, r.cli, r.scheme, whiskerCR)
 	cfg := &whisker.Configuration{
-		PullSecrets:           pullSecrets,
-		OpenShift:             r.provider.IsOpenShift(),
-		Installation:          installation,
-		LinseedPublicCASecret: linseedCASecret,
+		PullSecrets:  pullSecrets,
+		OpenShift:    r.provider.IsOpenShift(),
+		Installation: installation,
 	}
 
 	components := []render.Component{whisker.Whisker(cfg)}

diff --git a/pkg/render/whisker/component.go b/pkg/render/whisker/component.go
@@ -15,8 +15,6 @@
 package whisker
 
 import (
-	"fmt"
-
 	"github.com/tigera/operator/pkg/components"
 
 	"github.com/tigera/operator/pkg/common"
@@ -56,10 +54,9 @@ func Whisker(cfg *Configuration) render.Component {
 
 // Configuration contains all the config information needed to render the component.
 type Configuration struct {
-	PullSecrets           []*corev1.Secret
-	OpenShift             bool
-	Installation          *operatorv1.InstallationSpec
-	LinseedPublicCASecret *corev1.Secret
+	PullSecrets  []*corev1.Secret
+	OpenShift    bool
+	Installation *operatorv1.InstallationSpec
 }
 
 type Component struct {
@@ -237,20 +234,6 @@ func (c *Component) deployment() *appsv1.Deployment {
 	}
 }
 
-func secretMount(path string, scrt *corev1.Secret) corev1.VolumeMount {
-	return corev1.VolumeMount{
-		Name:      fmt.Sprintf("%s-%s", scrt.Name, "scrt"),
-		MountPath: path,
-	}
-}
-
-func secretVolume(scrt *corev1.Secret) corev1.Volume {
-	return corev1.Volume{
-		Name:         fmt.Sprintf("%s-%s", scrt.Name, "scrt"),
-		VolumeSource: corev1.VolumeSource{Secret: &corev1.SecretVolumeSource{SecretName: scrt.Name}},
-	}
-}
-
 func (c *Component) clusterRoleBinding() *rbacv1.ClusterRoleBinding {
 	return &rbacv1.ClusterRoleBinding{
 		TypeMeta: metav1.TypeMeta{Kind: "ClusterRoleBinding", APIVersion: "rbac.authorization.k8s.io/v1"},