Skip to content

Commit 545a890

Browse files
authored
Delete secrets on tenant deletion (#253)
1 parent 4b42308 commit 545a890

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

k8s/operator-console/base/console-cluster-role.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ rules:
1414
- list
1515
- patch
1616
- update
17+
- deletecollection
1718
- apiGroups:
1819
- ""
1920
resources:
@@ -22,6 +23,7 @@ rules:
2223
- services
2324
- events
2425
- resourcequotas
26+
- nodes
2527
verbs:
2628
- get
2729
- watch
@@ -34,6 +36,8 @@ rules:
3436
- persistentvolumeclaims
3537
verbs:
3638
- deletecollection
39+
- list
40+
- get
3741
- apiGroups:
3842
- "storage.k8s.io"
3943
resources:

restapi/admin_tenants.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,12 @@ func deleteTenantAction(
189189
opts := metav1.ListOptions{
190190
LabelSelector: fmt.Sprintf("%s=%s", operator.TenantLabel, tenantName),
191191
}
192-
return clientset.PersistentVolumeClaims(namespace).DeleteCollection(ctx, metav1.DeleteOptions{}, opts)
192+
err = clientset.PersistentVolumeClaims(namespace).DeleteCollection(ctx, metav1.DeleteOptions{}, opts)
193+
if err != nil {
194+
return err
195+
}
196+
// delete all tenant's secrets only if deletePvcs = true
197+
return clientset.Secrets(namespace).DeleteCollection(ctx, metav1.DeleteOptions{}, opts)
193198
}
194199
return nil
195200
}

0 commit comments

Comments
 (0)