kubernetes
diff --git a/‎staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
+33-8Lines changed: 33 additions & 8 deletions b/‎staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
+33-8Lines changed: 33 additions & 8 deletions
diff --git a/‎staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go
Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go
+35Lines changed: 35 additions & 0 deletions b/‎staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go
Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go
+35Lines changed: 35 additions & 0 deletions
@@ -359,14 +359,6 @@ func addHealthChecksWithoutLivez(c *server.Config, healthChecks ...healthz.Healt
 }
 
 func (s *EtcdOptions) addEtcdHealthEndpoint(c *server.Config) error {
-	if s.EtcdServersOverrides != nil {
-		for _, override := range s.EtcdServersOverrides {
-			tokens := strings.Split(override, "#")
-			servers := strings.Split(tokens[1], ";")
-			s.StorageConfig.Transport.ServerList = append(s.StorageConfig.Transport.ServerList, servers...)
-		}
-	}
-
 	healthCheck, err := storagefactory.CreateHealthCheck(s.StorageConfig, c.DrainedNotify())
 	if err != nil {
 		return err
@@ -383,6 +375,39 @@ func (s *EtcdOptions) addEtcdHealthEndpoint(c *server.Config) error {
 		return readyCheck()
 	}))
 
+	if s.EtcdServersOverrides != nil {
+		if err := s.addOverrideEtcdHealthEndpoint(c); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (s *EtcdOptions) addOverrideEtcdHealthEndpoint(c *server.Config) error {
+	sc := s.StorageConfig.DeepCopy()
+	for _, override := range s.EtcdServersOverrides {
+		tokens := strings.Split(override, "#")
+		servers := strings.Split(tokens[1], ";")
+		s.StorageConfig.Transport.ServerList = append(sc.Transport.ServerList, servers...)
+	}
+
+	healthCheck, err := storagefactory.CreateHealthCheck(*sc, c.DrainedNotify())
+	if err != nil {
+		return err
+	}
+	c.AddHealthChecks(healthz.NamedCheck("etcd-override", func(r *http.Request) error {
+		return healthCheck()
+	}))
+
+	readyCheck, err := storagefactory.CreateReadyCheck(*sc, c.DrainedNotify())
+	if err != nil {
+		return err
+	}
+	c.AddReadyzChecks(healthz.NamedCheck("etcd-override-readiness", func(r *http.Request) error {
+		return readyCheck()
+	}))
+
 	return nil
 }
 
 
@@ -125,3 +125,38 @@ func NewDefaultConfig(prefix string, codec runtime.Codec) *Config {
 		Transport:            TransportConfig{TracerProvider: noopoteltrace.NewTracerProvider()},
 	}
 }
+
+// DeepCopy returns a deep copy of the Config.
+func (c *Config) DeepCopy() *Config {
+	if c == nil {
+		return nil
+	}
+	// Deep copy the transport config
+	transport := c.Transport
+	transportCopy := TransportConfig{
+		ServerList:     make([]string, len(transport.ServerList)),
+		KeyFile:        transport.KeyFile,
+		CertFile:       transport.CertFile,
+		TrustedCAFile:  transport.TrustedCAFile,
+		EgressLookup:   transport.EgressLookup,
+		TracerProvider: transport.TracerProvider,
+	}
+	copy(transportCopy.ServerList, transport.ServerList)
+
+	return &Config{
+		Type:                      c.Type,
+		Prefix:                    c.Prefix,
+		Transport:                 transportCopy,
+		Codec:                     c.Codec,
+		EncodeVersioner:           c.EncodeVersioner,
+		Transformer:               c.Transformer,
+		CompactionInterval:        c.CompactionInterval,
+		CountMetricPollPeriod:     c.CountMetricPollPeriod,
+		DBMetricPollInterval:      c.DBMetricPollInterval,
+		EventsHistoryWindow:       c.EventsHistoryWindow,
+		HealthcheckTimeout:        c.HealthcheckTimeout,
+		ReadycheckTimeout:         c.ReadycheckTimeout,
+		LeaseManagerConfig:        c.LeaseManagerConfig,
+		StorageObjectCountTracker: c.StorageObjectCountTracker,
+	}
+}