From 52c1fc545f6b8df5769441695fb5035e09a00b94 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Thu, 25 Apr 2024 01:10:43 +0300 Subject: [PATCH] Update sigs.k8s.io/controller-runtime to v0.18.0 Signed-off-by: Stefan Prodan --- kustomize/go.mod | 4 +--- kustomize/go.sum | 4 ++-- oci/go.mod | 4 +--- oci/go.sum | 4 ++-- oci/tests/integration/go.mod | 4 +--- oci/tests/integration/go.sum | 4 ++-- runtime/go.mod | 6 ++---- runtime/go.sum | 8 ++++---- ssa/go.mod | 6 ++---- ssa/go.sum | 8 ++++---- 10 files changed, 21 insertions(+), 31 deletions(-) diff --git a/kustomize/go.mod b/kustomize/go.mod index 0babf36d..340ee1f3 100644 --- a/kustomize/go.mod +++ b/kustomize/go.mod @@ -19,9 +19,7 @@ require ( k8s.io/apiextensions-apiserver v0.30.0 k8s.io/apimachinery v0.30.0 k8s.io/client-go v0.30.0 - // Required due to breaking change in Kubernetes 1.30 client-go/tools/leaderelection - // Update to latest stable when https://github.com/kubernetes-sigs/controller-runtime/pull/2693 is released - sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 + sigs.k8s.io/controller-runtime v0.18.0 sigs.k8s.io/kustomize/api v0.17.0 sigs.k8s.io/kustomize/kyaml v0.17.0 sigs.k8s.io/yaml v1.4.0 diff --git a/kustomize/go.sum b/kustomize/go.sum index c662e5c8..d0357b01 100644 --- a/kustomize/go.sum +++ b/kustomize/go.sum @@ -281,8 +281,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 h1:YFdhDEsxtg5aLJyyW2zx8PMudon27yVnV2j+wxY61Mo= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= +sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.17.0 h1:AygX5EzZ+2NDxCWkeHy4IK2oftvl4odZZJmq1rK4HYU= diff --git a/oci/go.mod b/oci/go.mod index dd87f280..2f0e0f7b 100644 --- a/oci/go.mod +++ b/oci/go.mod @@ -24,9 +24,7 @@ require ( github.com/onsi/gomega v1.32.0 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/sirupsen/logrus v1.9.3 - // Required due to breaking change in Kubernetes 1.30 client-go/tools/leaderelection - // Update to latest stable when https://github.com/kubernetes-sigs/controller-runtime/pull/2693 is released - sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 + sigs.k8s.io/controller-runtime v0.18.0 ) require ( diff --git a/oci/go.sum b/oci/go.sum index c1a9fe0f..b3fbc568 100644 --- a/oci/go.sum +++ b/oci/go.sum @@ -422,8 +422,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 h1:YFdhDEsxtg5aLJyyW2zx8PMudon27yVnV2j+wxY61Mo= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= +sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/oci/tests/integration/go.mod b/oci/tests/integration/go.mod index 88738e04..346fae0e 100644 --- a/oci/tests/integration/go.mod +++ b/oci/tests/integration/go.mod @@ -13,9 +13,7 @@ require ( github.com/onsi/gomega v1.32.0 k8s.io/api v0.30.0 k8s.io/apimachinery v0.30.0 - // Required due to breaking change in Kubernetes 1.30 client-go/tools/leaderelection - // Update to latest stable when https://github.com/kubernetes-sigs/controller-runtime/pull/2693 is released - sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 + sigs.k8s.io/controller-runtime v0.18.0 ) require ( diff --git a/oci/tests/integration/go.sum b/oci/tests/integration/go.sum index 36ef28ce..5c07ef7c 100644 --- a/oci/tests/integration/go.sum +++ b/oci/tests/integration/go.sum @@ -357,8 +357,8 @@ k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7F k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 h1:YFdhDEsxtg5aLJyyW2zx8PMudon27yVnV2j+wxY61Mo= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= +sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/runtime/go.mod b/runtime/go.mod index 58e1e907..e05d3fc5 100644 --- a/runtime/go.mod +++ b/runtime/go.mod @@ -10,7 +10,7 @@ replace ( require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 - github.com/fluxcd/cli-utils v0.36.0-flux.6 + github.com/fluxcd/cli-utils v0.36.0-flux.7 github.com/fluxcd/pkg/apis/acl v0.2.0 github.com/fluxcd/pkg/apis/event v0.8.0 github.com/fluxcd/pkg/apis/meta v1.4.0 @@ -30,9 +30,7 @@ require ( k8s.io/client-go v0.30.0 k8s.io/component-base v0.30.0 k8s.io/klog/v2 v2.120.1 - // Required due to breaking change in Kubernetes 1.30 client-go/tools/leaderelection - // Update to latest stable when https://github.com/kubernetes-sigs/controller-runtime/pull/2693 is released - sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 + sigs.k8s.io/controller-runtime v0.18.0 sigs.k8s.io/yaml v1.4.0 ) diff --git a/runtime/go.sum b/runtime/go.sum index 4d51455e..a70d7750 100644 --- a/runtime/go.sum +++ b/runtime/go.sum @@ -29,8 +29,8 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4= github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= -github.com/fluxcd/cli-utils v0.36.0-flux.6 h1:SQuBgZFGPJbksLEA1gYkfqmIorhcZDd2QuDcmwL53h8= -github.com/fluxcd/cli-utils v0.36.0-flux.6/go.mod h1:zH0+K5kx9Lp9ZGlei5LdTXw96HX0K/kzOTbLYuVW+I8= +github.com/fluxcd/cli-utils v0.36.0-flux.7 h1:81zEo/LNmIRWMgtsZy/8L13TMUZHmmJib4gHRvKwVE8= +github.com/fluxcd/cli-utils v0.36.0-flux.7/go.mod h1:TcfLhvBjtQnqxYMsHQUAEB2c5WJRVuibtas2Izz5ZTs= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= @@ -247,8 +247,8 @@ k8s.io/kubectl v0.30.0 h1:xbPvzagbJ6RNYVMVuiHArC1grrV5vSmmIcSZuCdzRyk= k8s.io/kubectl v0.30.0/go.mod h1:zgolRw2MQXLPwmic2l/+iHs239L49fhSeICuMhQQXTI= k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 h1:YFdhDEsxtg5aLJyyW2zx8PMudon27yVnV2j+wxY61Mo= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= +sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.17.1 h1:MYJBOP/yQ3/5tp4/sf6HiiMfNNyO97LmtnirH9SLNr4= diff --git a/ssa/go.mod b/ssa/go.mod index e1bf5d74..32f08f71 100644 --- a/ssa/go.mod +++ b/ssa/go.mod @@ -4,7 +4,7 @@ go 1.22.0 require ( github.com/evanphx/json-patch/v5 v5.9.0 - github.com/fluxcd/cli-utils v0.36.0-flux.6 + github.com/fluxcd/cli-utils v0.36.0-flux.7 github.com/google/go-cmp v0.6.0 github.com/onsi/gomega v1.32.0 // TODO: unpin when https://github.com/wI2L/jsondiff/pull/14 has ended up in a release. @@ -14,9 +14,7 @@ require ( k8s.io/apimachinery v0.30.0 k8s.io/client-go v0.30.0 k8s.io/utils v0.0.0-20240310230437-4693a0247e57 - // Required due to breaking change in Kubernetes 1.30 client-go/tools/leaderelection - // Update to latest stable when https://github.com/kubernetes-sigs/controller-runtime/pull/2693 is released - sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 + sigs.k8s.io/controller-runtime v0.18.0 sigs.k8s.io/structured-merge-diff/v4 v4.4.1 sigs.k8s.io/yaml v1.4.0 ) diff --git a/ssa/go.sum b/ssa/go.sum index d832e924..e7e14f95 100644 --- a/ssa/go.sum +++ b/ssa/go.sum @@ -37,8 +37,8 @@ github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0 github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/fluxcd/cli-utils v0.36.0-flux.6 h1:SQuBgZFGPJbksLEA1gYkfqmIorhcZDd2QuDcmwL53h8= -github.com/fluxcd/cli-utils v0.36.0-flux.6/go.mod h1:zH0+K5kx9Lp9ZGlei5LdTXw96HX0K/kzOTbLYuVW+I8= +github.com/fluxcd/cli-utils v0.36.0-flux.7 h1:81zEo/LNmIRWMgtsZy/8L13TMUZHmmJib4gHRvKwVE8= +github.com/fluxcd/cli-utils v0.36.0-flux.7/go.mod h1:TcfLhvBjtQnqxYMsHQUAEB2c5WJRVuibtas2Izz5ZTs= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= @@ -309,8 +309,8 @@ k8s.io/kubectl v0.30.0 h1:xbPvzagbJ6RNYVMVuiHArC1grrV5vSmmIcSZuCdzRyk= k8s.io/kubectl v0.30.0/go.mod h1:zgolRw2MQXLPwmic2l/+iHs239L49fhSeICuMhQQXTI= k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606 h1:YFdhDEsxtg5aLJyyW2zx8PMudon27yVnV2j+wxY61Mo= -sigs.k8s.io/controller-runtime v0.17.1-0.20240419092505-a92b9612b606/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= +sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= +sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.17.1 h1:MYJBOP/yQ3/5tp4/sf6HiiMfNNyO97LmtnirH9SLNr4=