Move ovndb client type to neutron

olliewalsh · Feb 21, 2024 · 4433035 · 4433035
1 parent fc61039
commit 4433035
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/modules/common/service/types.go b/modules/common/service/types.go
@@ -52,8 +52,6 @@ const (
 	ProtocolHTTPS Protocol = "https"
 	// ProtocolNone -
 	ProtocolNone Protocol = ""
-	// OvnDbCA - fake endpoint for OVN DB internal CA
-	OvnDbCA Endpoint = "ovndb"
 )
 
 func (e *Endpoint) String() string {

diff --git a/modules/common/tls/tls.go b/modules/common/tls/tls.go
@@ -106,11 +106,6 @@ type APIService struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// Internal GenericService - holds the secret for the internal endpoint
 	Internal GenericService `json:"internal,omitempty"`
-
-	// +kubebuilder:validation:optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec
-	// OVNDb GenericService - holds the secret for the OVNDb client cert
-	OvnDb GenericService `json:"ovndb,omitempty"`
 }
 
 // GenericService contains server-specific TLS secret or issuer
@@ -168,7 +163,7 @@ func (a *APIService) ValidateCertSecrets(
 ) (string, ctrl.Result, error) {
 	var svc GenericService
 	certHashes := map[string]env.Setter{}
-	for _, endpt := range []service.Endpoint{service.EndpointInternal, service.EndpointPublic, service.OvnDbCA} {
+	for _, endpt := range []service.Endpoint{service.EndpointInternal, service.EndpointPublic} {
 		switch endpt {
 		case service.EndpointPublic:
 			if !a.Enabled(service.EndpointPublic) {
@@ -183,13 +178,6 @@ func (a *APIService) ValidateCertSecrets(
 			}
 
 			svc = a.Internal
-
-		case service.OvnDbCA:
-			if !a.Enabled(service.EndpointInternal) {
-				continue
-			}
-
-			svc = a.OvnDb
 		}
 
 		hash, ctrlResult, err := svc.ValidateCertSecret(ctx, h, namespace)

diff --git a/modules/common/tls/zz_generated.deepcopy.go b/modules/common/tls/zz_generated.deepcopy.go