From 336227e3042d7c73610f767e98b9d8cd090e6c18 Mon Sep 17 00:00:00 2001 From: Jakob Schrettenbrunner Date: Fri, 18 Oct 2024 12:37:57 +0200 Subject: [PATCH] bump ipam in-cluster to latest version fixes an issue with reconciliation of IP Claims of deleted clusters  Conflicts:  go.mod  go.sum --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index ad7e614..0f36131 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,9 @@ require ( k8s.io/apimachinery v0.31.1 k8s.io/client-go v0.31.1 k8s.io/klog/v2 v2.130.1 - k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 - sigs.k8s.io/cluster-api v1.8.3 - sigs.k8s.io/cluster-api-ipam-provider-in-cluster v1.0.0-rc.0 + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 + sigs.k8s.io/cluster-api v1.8.4 + sigs.k8s.io/cluster-api-ipam-provider-in-cluster v1.0.0-rc.2 sigs.k8s.io/cluster-api-provider-vsphere v1.10.2 sigs.k8s.io/controller-runtime v0.19.0 ) @@ -33,7 +33,7 @@ require ( github.com/metal3-io/ip-address-manager/api v1.7.0 // indirect github.com/shopspring/decimal v1.4.0 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect ) diff --git a/go.sum b/go.sum index b986b80..1405ad3 100644 --- a/go.sum +++ b/go.sum @@ -197,8 +197,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -288,14 +288,14 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo= k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= -k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 h1:b2FmK8YH+QEwq/Sy2uAEhmqL5nPfGYbJOcaqjeYYZoA= -k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.8.3 h1:N6i25rF5QMadwVg2UPfuO6CzmNXjqnF2r1MAO+kcsro= -sigs.k8s.io/cluster-api v1.8.3/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= -sigs.k8s.io/cluster-api-ipam-provider-in-cluster v1.0.0-rc.0 h1:dpZy9nvkLoOV8EmK6LznYC2ZZwGRxBXhI/zeh023WAY= -sigs.k8s.io/cluster-api-ipam-provider-in-cluster v1.0.0-rc.0/go.mod h1:w2pPcrYAYyGVDudaHUi6CO4JIiTo5w0yVENVYOE+yFE= +sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= +sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/cluster-api-ipam-provider-in-cluster v1.0.0-rc.2 h1:IFYfS7bwMcESo+whIX8lNwTfXtSncqoVt4pAZ7RownY= +sigs.k8s.io/cluster-api-ipam-provider-in-cluster v1.0.0-rc.2/go.mod h1:9gAG7Smqu4K4n6gZtCZn4qVSfdQyjx7Ifvn/Jri12X4= sigs.k8s.io/cluster-api-provider-vsphere v1.10.2 h1:2Yc07zX4BUWDHqm8318+JXNTmST76JFntshy6u8s67o= sigs.k8s.io/cluster-api-provider-vsphere v1.10.2/go.mod h1:3UbtBrFU3FR/pJ7XjsRi06pTnLyAjdahhhU7zotln0g= sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=