fix(olm): delete api services upon CSV deletion

operator-framework · Mar 8, 2019 · 79b314d · 79b314d
1 parent 69848a8
commit 79b314d
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/pkg/controller/operators/olm/operator.go b/pkg/controller/operators/olm/operator.go
@@ -346,7 +346,7 @@ func (a *Operator) handleClusterServiceVersionDeletion(obj interface{}) {
 	defer func(csv v1alpha1.ClusterServiceVersion) {
 		logger.Debug("removing csv from queue set")
 		a.csvQueueSet.Remove(csv.GetName(), csv.GetNamespace())
-		
+
 		// Requeue all OperatorGroups in the namespace
 		logger.Debug("requeueing operatorgroups in namespace")
 		operatorGroups, err := a.lister.OperatorsV1alpha2().OperatorGroupLister().OperatorGroups(csv.GetNamespace()).List(labels.Everything())
@@ -406,6 +406,26 @@ func (a *Operator) handleClusterServiceVersionDeletion(obj interface{}) {
 			a.csvQueueSet.Requeue(clusterServiceVersion.GetName(), namespace)
 		}
 	}
+
+	for _, desc := range clusterServiceVersion.Spec.APIServiceDefinitions.Owned {
+		apiServiceName := fmt.Sprintf("%s.%s", desc.Version, desc.Group)
+		fetched, err := a.lister.APIRegistrationV1().APIServiceLister().Get(apiServiceName)
+		if k8serrors.IsNotFound(err) {
+			continue
+		}
+		if err != nil {
+			logger.WithError(err).Warn("api service get failure")
+			continue
+		}
+		apiServiceLabels := fetched.GetLabels()
+		if clusterServiceVersion.GetName() == apiServiceLabels[ownerutil.OwnerKey] && clusterServiceVersion.GetNamespace() == apiServiceLabels[ownerutil.OwnerNamespaceKey] {
+			logger.Infof("gcing api service %v", apiServiceName)
+			err := a.OpClient.DeleteAPIService(apiServiceName, &metav1.DeleteOptions{})
+			if err != nil {
+				logger.WithError(err).Warn("cannot delete orphaned api service")
+			}
+		}
+	}
 }
 
 func (a *Operator) removeDanglingChildCSVs(csv *v1alpha1.ClusterServiceVersion) error {
@@ -548,9 +568,9 @@ func (a *Operator) operatorGroupForActiveCSV(logger *logrus.Entry, csv *v1alpha1
 		logger.Info("no olm.targetNamespaces annotation")
 		return nil
 	}
-	
+
 	// Target namespaces don't match
-	if  targets != strings.Join(operatorGroup.Status.Namespaces, ",") {
+	if targets != strings.Join(operatorGroup.Status.Namespaces, ",") {
 		logger.Info("olm.targetNamespaces annotation doesn't match operatorgroup status")
 		return nil
 	}
@@ -636,7 +656,7 @@ func (a *Operator) transitionCSVState(in v1alpha1.ClusterServiceVersion) (out *v
 	targets, ok := out.GetAnnotations()[v1alpha2.OperatorGroupTargetsAnnotationKey]
 	if ok {
 		namespaces := strings.Split(targets, ",")
-		
+
 		if err := modeSet.Supports(out.GetNamespace(), namespaces); err != nil {
 			logger.WithField("reason", err.Error()).Info("installmodeset does not support operatorgroups namespace selection")
 			if out.Status.Reason != v1alpha1.CSVReasonUnsupportedOperatorGroup {