From aaaefcaea7b0e843ea45ca69c254dfba1f0541ac Mon Sep 17 00:00:00 2001 From: "renovate-rancher[bot]" <119870437+renovate-rancher[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 04:35:56 +0000 Subject: [PATCH 1/2] chore(deps): update module sigs.k8s.io/structured-merge-diff/v4 to v4.4.3 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4ad07ce4..4941b8ca 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.3 replace ( // sigs.k8s.io/structured-merge-diff/v4 v4.4.2 breaks make gen. // https://github.com/kubernetes-sigs/structured-merge-diff/issues/268 - sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1 + sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.3 ) require ( From c7b50bcd96b89d9a004cd35bc6e74aa01ebe85c3 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Fri, 15 Nov 2024 10:08:37 +0000 Subject: [PATCH 2/2] build: Bump sigs.k8s.io/structured-merge-diff/v4 Signed-off-by: Paulo Gomes --- go.mod | 8 +------- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 4941b8ca..d9ab5d3e 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,6 @@ go 1.23 toolchain go1.23.3 -replace ( - // sigs.k8s.io/structured-merge-diff/v4 v4.4.2 breaks make gen. - // https://github.com/kubernetes-sigs/structured-merge-diff/issues/268 - sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.3 -) - require ( github.com/blang/semver v3.5.1+incompatible github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.78.1 @@ -106,6 +100,6 @@ require ( k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect sigs.k8s.io/controller-runtime v0.19.1 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 9cd6e0bf..c900fc2a 100644 --- a/go.sum +++ b/go.sum @@ -485,8 +485,8 @@ sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7np sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/structured-merge-diff/v4 v4.4.3 h1:sCP7Vv3xx/CWIuTPVN38lUPx0uw0lcLfzaiDa8Ja01A= +sigs.k8s.io/structured-merge-diff/v4 v4.4.3/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=