Remove ingress and node-services during reconcile

controllers/solrcloud_controller.go

@@ -167,6 +167,21 @@ func (r *SolrCloudReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 				}
 			}
 		}
+	} else {
+		// Need no individual services per onde, delete if found
+		for _, nodeName := range solrNodeNames {
+			serviceName := nodeName
+			foundService := &corev1.Service{}
+			err = r.Get(ctx, types.NamespacedName{Name: serviceName, Namespace: instance.Namespace}, foundService)
+			if err == nil {
+				err = r.Delete(ctx, foundService)
+				if err != nil {
+					return requeueOrNot, err
+				}
+			} else if !errors.IsNotFound(err) {
+				return requeueOrNot, err
+			}
+		}
 	}
 
 	// Generate HeadlessService
@@ -347,6 +362,16 @@ func (r *SolrCloudReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		if err != nil {
 			return requeueOrNot, err
 		}
+	} else {
+		// If ingress exists, delete it
+		foundIngress := &netv1.Ingress{}
+		err = r.Get(ctx, types.NamespacedName{Name: instance.CommonIngressName(), Namespace: instance.GetNamespace()}, foundIngress)
+		if err == nil {
+			err = r.Delete(ctx, foundIngress)
+			if err != nil {
+				return requeueOrNot, err
+			}
+		}
 	}
 
 	var statefulSet *appsv1.StatefulSet

helm/solr-operator/Chart.yaml

@@ -61,6 +61,13 @@ annotations:
           url: https://github.com/apache/solr-operator/issues/624
         - name: Github PR
           url: https://github.com/apache/solr-operator/pull/648
+    - kind: fixed
+      description: The operator will now delete ingress and per-node services when external ingress is disabled.
+      links:
+        - name: Github Issue
+          url: https://github.com/apache/solr-operator/issues/673
+        - name: Github PR
+          url: https://github.com/apache/solr-operator/pull/674
   artifacthub.io/images: |
     - name: solr-operator
       image: apache/solr-operator:v0.9.0-prerelease