Skip to content

add crossplane removal mode #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
piotr-kotara-ibm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add crossplane removal mode #85

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e381d1
add crossplane removal mode
piotr-kotara-ibm Sep 21, 2022
5c12ebc
rename flag to be more relevant
piotr-kotara-ibm Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions internal/controller/apiextensions/composite/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ package composite

import (
"context"
"os"
"time"

"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
unstructuredv1 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
Expand Down Expand Up @@ -498,6 +501,25 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
return reconcile.Result{RequeueAfter: shortWait}, nil
}

watchNamespace := os.Getenv("WATCH_NAMESPACE")

cm := &unstructuredv1.Unstructured{}
cm.SetGroupVersionKind(schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"})

if err := r.client.Get(ctx, types.NamespacedName{Namespace: watchNamespace, Name: "cf-crossplane"}, cm); err != nil {
log.Debug(errGet, "error", err)
return reconcile.Result{}, errors.Wrap(resource.IgnoreNotFound(err), errGet)
}

data := cm.Object["data"].(map[string]interface{})

flag := data["removeFinalizersFromObjects"]
removeFinalizer := false

if flag != nil {
removeFinalizer = flag.(string) == "true"
}

// We apply all of our composed resources before we observe them and update
// the composite resource accordingly in the loop below. This ensures that
// issues observing and processing one composed resource won't block the
Expand All @@ -508,6 +530,11 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
if !cd.rendered {
continue
}
if removeFinalizer {
log.Debug("Removing finalizer")
cds[i].resource.SetFinalizers([]string{})
}

// IBM Patch: Do not require that cd is controlled by cr
if err := r.client.Apply(ctx, cd.resource, mergeOptions(cd.appliedPatches)...); err != nil {
log.Debug(errApply, "error", err)
Expand Down