Skip to content

update: remove ondelete not used for cleanup steps #1621

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

Merged
zdtsw merged 2 commits into from
Feb 13, 2025
Merged

update: remove ondelete not used for cleanup steps #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ec7300
update: remove ondelete not used for cleanup steps
zdtsw Feb 5, 2025
2d12306
update: review comments
zdtsw Feb 7, 2025
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: 0 additions & 6 deletions controllers/dscinitialization/servicemesh_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,6 @@ func (r *DSCInitializationReconciler) authorizationFeatures(instance *dsciv1.DSC
).
PostConditions(
feature.WaitForPodsToBeReady(serviceMeshSpec.ControlPlane.Namespace),
).
OnDelete(
servicemesh.RemoveExtensionProvider(
Comment thread
zdtsw marked this conversation as resolved.
instance.Spec.ServiceMesh.ControlPlane,
instance.Spec.ApplicationsNamespace+"-auth-provider",
),
),

// We do not have the control over deployment resource creation.
Expand Down
68 changes: 0 additions & 68 deletions pkg/feature/servicemesh/cleanup.go
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions tests/integration/features/servicemesh_feature_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

corev1 "k8s.io/api/core/v1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/yaml"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -262,12 +261,6 @@ var _ = Describe("Service Mesh setup", func() {
).
WithData(
servicemesh.FeatureData.ControlPlane.Define(&dsci.Spec).AsAction(),
).
OnDelete(
servicemesh.RemoveExtensionProvider(
dsci.Spec.ServiceMesh.ControlPlane,
dsci.Spec.ApplicationsNamespace+"-auth-provider",
),
))
})

Expand All @@ -293,31 +286,6 @@ var _ = Describe("Service Mesh setup", func() {
}
Expect(envoyExtAuthzGrpc["service"]).To(Equal("authorino-authorino-authorization.auth-provider.svc.cluster.local"))
})

// then
By("verifying that extension provider has been removed and namespace is gone too", func() {
Expect(handler.Delete(ctx, envTestClient)).To(Succeed())
Eventually(func(ctx context.Context) []any {

serviceMeshControlPlane, err := getServiceMeshControlPlane(ctx, namespace, name)
Expect(err).ToNot(HaveOccurred())

extensionProviders, found, err := unstructured.NestedSlice(serviceMeshControlPlane.Object, "spec", "techPreview", "meshConfig", "extensionProviders")
Expect(err).ToNot(HaveOccurred())
Expect(found).To(BeTrue())

_, err = fixtures.GetNamespace(ctx, envTestClient, serviceMeshSpec.Auth.Namespace)
Expect(k8serr.IsNotFound(err)).To(BeTrue())

return extensionProviders

}).
WithTimeout(fixtures.Timeout).
WithPolling(fixtures.Interval).
WithContext(ctx).
Should(BeEmpty())
})

})

})
Expand Down