mirror of
https://github.com/storytold/irsa-manager.git
synced 2026-10-23 08:05:25 +00:00
irsa deletion
This commit is contained in:
@@ -117,14 +117,21 @@ func (r *IRSAReconciler) reconcileDelete(ctx context.Context, obj *irsav1alpha1.
|
|||||||
if !obj.Spec.Cleanup {
|
if !obj.Spec.Cleanup {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
serviceAccount := obj.Spec.ServiceAccount
|
||||||
|
kubeHandler := handler.NewKubernetesHandler(kubeClient)
|
||||||
|
for _, ns := range serviceAccount.Namespaces {
|
||||||
|
sa := manifests.NewServiceAccountBuilder().Build(types.NamespacedName{
|
||||||
|
Name: serviceAccount.Name,
|
||||||
|
Namespace: ns,
|
||||||
|
})
|
||||||
|
kubeHandler.Append(sa)
|
||||||
|
|
||||||
|
}
|
||||||
|
err := kubeHandler.DeleteAll(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
// kubeHandler := handler.NewKubernetesHandler(kubeClient)
|
|
||||||
// kubeHandler.Append(secret)
|
|
||||||
// err := kubeHandler.DeleteAll(ctx)
|
|
||||||
// if err != nil {
|
|
||||||
// return err
|
|
||||||
// }
|
|
||||||
// return selfhosted.Delete(ctx, factory)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *IRSAReconciler) reconcile(ctx context.Context, obj *irsav1alpha1.IRSA, kubeClient *kubernetes.KubernetesClient) error {
|
func (r *IRSAReconciler) reconcile(ctx context.Context, obj *irsav1alpha1.IRSA, kubeClient *kubernetes.KubernetesClient) error {
|
||||||
@@ -167,7 +174,6 @@ func (r *IRSAReconciler) reconcile(ctx context.Context, obj *irsav1alpha1.IRSA,
|
|||||||
Namespace: ns,
|
Namespace: ns,
|
||||||
})
|
})
|
||||||
kubeHandler.Append(sa)
|
kubeHandler.Append(sa)
|
||||||
|
|
||||||
}
|
}
|
||||||
return kubeHandler.ApplyAll(ctx)
|
return kubeHandler.ApplyAll(ctx)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -120,11 +120,11 @@ var _ = Describe("IRSA Controller", func() {
|
|||||||
f: func(r *IRSAReconciler, obj *irsav1alpha1.IRSA) {
|
f: func(r *IRSAReconciler, obj *irsav1alpha1.IRSA) {
|
||||||
expected := []expectedResource{
|
expected := []expectedResource{
|
||||||
{
|
{
|
||||||
NamespacedName: types.NamespacedName{Name: "sa-1", Namespace: "kube-system"},
|
NamespacedName: types.NamespacedName{Name: "sa-2", Namespace: "kube-system"},
|
||||||
f: newServiceAccount,
|
f: newServiceAccount,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
NamespacedName: types.NamespacedName{Name: "sa-1", Namespace: "default"},
|
NamespacedName: types.NamespacedName{Name: "sa-2", Namespace: "default"},
|
||||||
f: newServiceAccount,
|
f: newServiceAccount,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user