Skip to content
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

cluster: handle deletes properly #5624

Merged
merged 1 commit into from
Mar 23, 2022
Merged

cluster: handle deletes properly #5624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion internal/controllers/core/cluster/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,13 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) (
var obj v1alpha1.Cluster
err := r.ctrlClient.Get(ctx, nn, &obj)
if err != nil && !apierrors.IsNotFound(err) {
return ctrl.Result{}, err
}

if apierrors.IsNotFound(err) || !obj.ObjectMeta.DeletionTimestamp.IsZero() {
r.store.Dispatch(clusters.NewClusterDeleteAction(request.Name))
r.connManager.delete(nn)
return ctrl.Result{}, err
return ctrl.Result{}, nil
}

// The apiserver is the source of truth, and will ensure the engine state is up to date.
Expand Down
22 changes: 22 additions & 0 deletions internal/controllers/core/cluster/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -45,6 +46,27 @@ func TestKubernetesError(t *testing.T) {
f.assertSteadyState(cluster)
}

func TestKubernetesDelete(t *testing.T) {
f := newFixture(t)
cluster := &v1alpha1.Cluster{
ObjectMeta: metav1.ObjectMeta{Name: "default"},
Spec: v1alpha1.ClusterSpec{
Connection: &v1alpha1.ClusterConnection{
Kubernetes: &v1alpha1.KubernetesClusterConnection{},
},
},
}
nn := apis.Key(cluster)

f.Create(cluster)
_, ok := f.r.connManager.load(nn)
require.True(t, ok, "Connection was not present in connection manager")

f.Delete(cluster)
_, ok = f.r.connManager.load(nn)
require.False(t, ok, "Connection was not removed from connection manager")
}

func TestKubernetesArch(t *testing.T) {
f := newFixture(t)
cluster := &v1alpha1.Cluster{
Expand Down