Merge pull request #7595 from twz123/external-etcd-without-component

Don't use etcd component at all when external etcd is used

Author: twz123

cmd/controller/controller.go

@@ -242,18 +242,23 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions, de
 			K0sVars: c.K0sVars,
 		}
 	case v1beta1.EtcdStorageType:
-		storageBackend = &controller.Etcd{
-			CertManager: certificateManager,
-			Config:      nodeConfig.Spec.Storage.Etcd,
-			JoinClient:  joinClient,
-			K0sVars:     c.K0sVars,
-			LogLevel:    c.LogLevels.Etcd,
+		config := nodeConfig.Spec.Storage.Etcd
+		if !config.IsExternalClusterUsed() {
+			storageBackend = &controller.Etcd{
+				CertManager: certificateManager,
+				Config:      config,
+				JoinClient:  joinClient,
+				K0sVars:     c.K0sVars,
+				LogLevel:    c.LogLevels.Etcd,
+			}
 		}
 	default:
 		return fmt.Errorf("invalid storage type: %s", nodeConfig.Spec.Storage.Type)
 	}
-	logrus.Infof("using storage backend %s", nodeConfig.Spec.Storage.Type)
-	nodeComponents.Add(ctx, storageBackend)
+	if storageBackend != nil {
+		logrus.Infof("using storage backend %s", nodeConfig.Spec.Storage.Type)
+		nodeComponents.Add(ctx, storageBackend)
+	}
 
 	controllerMode := flags.Mode()
 	// Will the cluster support multiple controllers, or just a single one?
@@ -306,7 +311,6 @@ func (c *command) start(ctx context.Context, flags *config.ControllerOptions, de
 		ClusterConfig:      nodeConfig,
 		K0sVars:            c.K0sVars,
 		LogLevel:           c.LogLevels.KubeAPIServer,
-		Storage:            storageBackend,
 		EnableKonnectivity: enableKonnectivity,
 		StopTimeout:        flags.APIServerStopTimeout,
 

pkg/component/controller/apiserver.go

@@ -36,7 +36,6 @@ type APIServer struct {
 	ClusterConfig             *v1beta1.ClusterConfig
 	K0sVars                   *config.CfgVars
 	LogLevel                  string
-	Storage                   manager.Component
 	EnableKonnectivity        bool
 	DisableEndpointReconciler bool
 	StopTimeout               time.Duration

pkg/component/controller/etcd.go

@@ -140,10 +140,6 @@ func (e *Etcd) syncEtcdConfig(ctx context.Context, etcdRequest v1beta1.EtcdReque
 
 // Run runs etcd if external cluster is not configured
 func (e *Etcd) Start(ctx context.Context) error {
-	if e.Config.IsExternalClusterUsed() {
-		return nil
-	}
-
 	etcdCaCert := filepath.Join(e.K0sVars.EtcdCertDir, "ca.crt")
 	etcdCaCertKey := filepath.Join(e.K0sVars.EtcdCertDir, "ca.key")
 	etcdServerCert := filepath.Join(e.K0sVars.EtcdCertDir, "server.crt")