From 88601bff4e172841015761a5e74f01c5cb128069 Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Wed, 28 Aug 2024 19:22:06 +0530 Subject: [PATCH] chore: drop calico from interactive installer Drop calico from interactive installer. Signed-off-by: Noel Georgi --- internal/pkg/tui/installer/state.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/internal/pkg/tui/installer/state.go b/internal/pkg/tui/installer/state.go index 421bc6b162..da6a054f39 100644 --- a/internal/pkg/tui/installer/state.go +++ b/internal/pkg/tui/installer/state.go @@ -24,14 +24,6 @@ import ( "github.com/siderolabs/talos/pkg/machinery/nethelpers" ) -const canalCustomCNI = "canal" - -var customCNIPresets = map[string][]string{ - canalCustomCNI: { - "https://docs.projectcalico.org/archive/v3.20/manifests/canal.yaml", - }, -} - // NewState creates new installer state. // //nolint:gocyclo @@ -154,7 +146,6 @@ func NewState(ctx context.Context, installer *Installer, conn *Connection) (*Sta &state.cni, components.NewTableHeaders("CNI", "description"), constants.FlannelCNI, "CNI used by Talos by default", - canalCustomCNI, "Canal v3.20", constants.NoneCNI, "CNI will not be installed", )) } @@ -226,11 +217,6 @@ func (s *State) GenConfig() (*machineapi.GenerateConfigurationResponse, error) { Name: s.cni, } - if urls, ok := customCNIPresets[s.cni]; ok { - cniConfig.Name = constants.CustomCNI - cniConfig.Urls = urls - } - s.opts.ClusterConfig.ClusterNetwork.CniConfig = cniConfig s.opts.OverrideTime = timestamppb.New(time.Now().UTC())