remove etcd.deploy.headlessService.enabled field

loft-sh · Nov 27, 2024 · a75c712 · a75c712
1 parent 1bf4fc7
commit a75c712
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 17 deletions.
diff --git a/chart/templates/etcd-headless-service.yaml b/chart/templates/etcd-headless-service.yaml
@@ -1,6 +1,5 @@
 {{- if not .Values.experimental.isolatedControlPlane.headless }}
 {{- if or .Values.controlPlane.backingStore.etcd.deploy.enabled (include "vcluster.etcd.embedded.migrate" .) }}
-{{- if .Values.controlPlane.backingStore.etcd.deploy.headlessService.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -33,4 +32,3 @@ spec:
     release: "{{ .Release.Name }}"
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -1022,10 +1022,6 @@
     },
     "EtcdDeployHeadlessService": {
       "properties": {
-        "enabled": {
-          "type": "boolean",
-          "description": "Enabled defines if the etcd headless service should be deployed"
-        },
         "annotations": {
           "additionalProperties": {
             "type": "string"

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -390,7 +390,6 @@ controlPlane:
           annotations: {}
         # HeadlessService holds options for the external etcd headless service.
         headlessService:
-          enabled: true
           annotations: {}
 
   # Proxy defines options for the virtual cluster control plane proxy that is used to do authentication and intercept requests.

diff --git a/config/config.go b/config/config.go
@@ -958,9 +958,6 @@ type EtcdDeployService struct {
 }
 
 type EtcdDeployHeadlessService struct {
-	// Enabled defines if the etcd headless service should be deployed
-	Enabled bool `json:"enabled,omitempty"`
-
 	// Annotations are extra annotations for the external etcd headless service
 	Annotations map[string]string `json:"annotations,omitempty"`
 }

diff --git a/config/legacyconfig/migrate.go b/config/legacyconfig/migrate.go
@@ -140,7 +140,6 @@ func convertEtcd(oldConfig EtcdValues, newConfig *config.Config) error {
 	if oldConfig.Disabled {
 		newConfig.ControlPlane.BackingStore.Etcd.Deploy.StatefulSet.Enabled = false
 		newConfig.ControlPlane.BackingStore.Etcd.Deploy.Service.Enabled = false
-		newConfig.ControlPlane.BackingStore.Etcd.Deploy.HeadlessService.Enabled = false
 	}
 	if oldConfig.ImagePullPolicy != "" {
 		newConfig.ControlPlane.BackingStore.Etcd.Deploy.StatefulSet.ImagePullPolicy = oldConfig.ImagePullPolicy

diff --git a/config/values.yaml b/config/values.yaml
@@ -214,7 +214,6 @@ controlPlane:
           enabled: true
           annotations: {}
         headlessService:
-          enabled: true
           annotations: {}
 
   proxy:

diff --git a/pkg/k0s/k0s.go b/pkg/k0s/k0s.go
@@ -68,7 +68,7 @@ spec:
       externalCluster:
         {{- if .Values.controlPlane.backingStore.etcd.deploy.service.enabled }}
         endpoints: ["{{ .Release.Name }}-etcd:2379"]
-        {{- else if .Values.controlPlane.backingStore.etcd.deploy.headlessService.enabled }}
+        {{- else }}
 		endpoints: ["{{ .Release.Name }}-etcd-headless:2379"]
         {{- end }}
         caFile: /data/k0s/pki/etcd/ca.crt
@@ -103,7 +103,7 @@ func StartK0S(ctx context.Context, cancel context.CancelFunc, vConfig *config.Vi
 		var etcdEndpoint string
 		if vConfig.ControlPlane.BackingStore.Etcd.Deploy.Service.Enabled {
 			etcdEndpoint = "https://" + vConfig.Name + "-etcd:2379"
-		} else if vConfig.ControlPlane.BackingStore.Etcd.Deploy.HeadlessService.Enabled {
+		} else {
 			etcdEndpoint = "https://" + vConfig.Name + "-etcd-headless:2379"
 		}
 

diff --git a/pkg/k3s/k3s.go b/pkg/k3s/k3s.go
@@ -53,7 +53,7 @@ func StartK3S(ctx context.Context, vConfig *config.VirtualClusterConfig, service
 			var etcdEndpoint string
 			if vConfig.ControlPlane.BackingStore.Etcd.Deploy.Service.Enabled {
 				etcdEndpoint = "https://" + vConfig.Name + "-etcd:2379"
-			} else if vConfig.ControlPlane.BackingStore.Etcd.Deploy.HeadlessService.Enabled {
+			} else {
 				etcdEndpoint = "https://" + vConfig.Name + "-etcd-headless:2379"
 			}
 

diff --git a/pkg/k8s/k8s.go b/pkg/k8s/k8s.go
@@ -88,7 +88,7 @@ func StartK8S(
 			etcdEndpoints = "https://127.0.0.1:2379"
 		} else if vConfig.ControlPlane.BackingStore.Etcd.Deploy.Service.Enabled {
 			etcdEndpoints = "https://" + vConfig.Name + "-etcd:2379"
-		} else if vConfig.ControlPlane.BackingStore.Etcd.Deploy.HeadlessService.Enabled {
+		} else {
 			etcdEndpoints = "https://" + vConfig.Name + "-etcd-headless:2379"
 		}
 	}

diff --git a/pkg/setup/initialize.go b/pkg/setup/initialize.go
@@ -63,7 +63,7 @@ func initialize(ctx context.Context, parentCtx context.Context, options *config.
 	if options.ControlPlane.BackingStore.Etcd.Embedded.Enabled && options.ControlPlane.BackingStore.Etcd.Embedded.MigrateFromDeployedEtcd {
 		if options.ControlPlane.BackingStore.Etcd.Deploy.Service.Enabled {
 			migrateFrom = "https://" + options.Name + "-etcd:2379"
-		} else if options.ControlPlane.BackingStore.Etcd.Deploy.HeadlessService.Enabled {
+		} else {
 			migrateFrom = "https://" + options.Name + "-etcd-headless:2379"
 		}
 	}