Skip to content

Commit e3af123

Browse files
authored
Merge pull request #303 from kubernetes-sigs/fix/ipaddressclaims-finalizers
🐛 Fix missing ipaddressclaims/finalizers permissions
2 parents f818228 + 65fae21 commit e3af123

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

config/rbac/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ rules:
7777
- apiGroups:
7878
- ipam.cluster.x-k8s.io
7979
resources:
80-
- ipaddressclaims/status
80+
- ipaddressclaims/finalizers
8181
- ipaddresses/finalizers
8282
verbs:
8383
- update

internal/controllers/ipaddressclaim.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ import (
4444
pooltypes "sigs.k8s.io/cluster-api-ipam-provider-in-cluster/pkg/types"
4545
)
4646

47-
const (
48-
// ReleaseAddressFinalizer is used to release an IP address before cleaning up the claim.
49-
ReleaseAddressFinalizer = "ipam.cluster.x-k8s.io/ReleaseAddress"
50-
51-
// ProtectAddressFinalizer is used to prevent deletion of an IPAddress object while its claim is not deleted.
52-
ProtectAddressFinalizer = "ipam.cluster.x-k8s.io/ProtectAddress"
53-
)
54-
5547
type genericInClusterPool interface {
5648
client.Object
5749
PoolSpec() *v1alpha2.InClusterIPPoolSpec
@@ -166,7 +158,7 @@ func (i *InClusterProviderAdapter) ClaimHandlerFor(_ client.Client, claim *ipamv
166158
//+kubebuilder:rbac:groups=ipam.cluster.x-k8s.io,resources=ipaddressclaims,verbs=get;list;watch;update;patch
167159
//+kubebuilder:rbac:groups=ipam.cluster.x-k8s.io,resources=ipaddresses,verbs=get;list;watch;create;update;patch;delete
168160
//+kubebuilder:rbac:groups=ipam.cluster.x-k8s.io,resources=ipaddressclaims/status;ipaddresses/status,verbs=get;update;patch
169-
//+kubebuilder:rbac:groups=ipam.cluster.x-k8s.io,resources=ipaddressclaims/status;ipaddresses/finalizers,verbs=update
161+
//+kubebuilder:rbac:groups=ipam.cluster.x-k8s.io,resources=ipaddressclaims/finalizers;ipaddresses/finalizers,verbs=update
170162
//+kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters,verbs=get;list;watch
171163

172164
// FetchPool fetches the (Global)InClusterIPPool.

0 commit comments

Comments
 (0)