YuzuZensai/netbird-kubernetes-operator
1
0
Fork 0
mirror of https://github.com/YuzuZensai/netbird-kubernetes-operator.git synced 2026-09-13 10:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump sigs.k8s.io/structured-merge-diff/v6 from 6.4.0 to 6.4.2 (#361)

Browse Source 
Bumps
[sigs.k8s.io/structured-merge-diff/v6](https://github.com/kubernetes-sigs/structured-merge-diff)
from 6.4.0 to 6.4.2.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/15d075473efece0367330fd20a7cc2aad2eeb998"><code>15d0754</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/structured-merge-diff/issues/334">#334</a>
from jpbetz/revert-306-master</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/f23ab84798fce0a45604c17df89bb4571b3e8b39"><code>f23ab84</code></a>
Revert <a
href="https://redirect.github.com/kubernetes-sigs/structured-merge-diff/issues/306">#306</a>,
keep Nullable schema field</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/281dabaec60e83c069d7fe093ee77a565e7cca2b"><code>281daba</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/structured-merge-diff/issues/332">#332</a>
from jpbetz/nullable-empty-container-preservation</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/d28d362d1b58542b2ce0f3c6da0695623190829f"><code>d28d362</code></a>
Add nullable type support</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/e570f92e979c81a3efbbaa9ea6c0c047dd5a8321"><code>e570f92</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/structured-merge-diff/issues/328">#328</a>
from lalitc375/fix-deserailezed-tests</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/ba35bbdc545b46ad1d62788870dcd1a594b7c232"><code>ba35bbd</code></a>
Address feedbacks</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/3001c6e9a9734f32a978ed125b0d1ac04b999bf8"><code>3001c6e</code></a>
Harden path element deserialization trailing data validation</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/3ce9bc1df2300a14b00190d2f476bda722ee6baf"><code>3ce9bc1</code></a>
Add edge-case tests for DeserializePathElement</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/2ad5e4f059c73f49f9c851b392ca3d4335c1c67e"><code>2ad5e4f</code></a>
Merge pull request <a
href="https://redirect.github.com/kubernetes-sigs/structured-merge-diff/issues/326">#326</a>
from benluddy/unstructured-converter-with-error</li>
<li><a
href="https://github.com/kubernetes-sigs/structured-merge-diff/commit/f772c7a17577b4b784a9b7bb0f7060dbc9e6f661"><code>f772c7a</code></a>
Add value.UnstructuredConverter sibling interface that can fail.</li>
<li>Additional commits viewable in <a
href="https://github.com/kubernetes-sigs/structured-merge-diff/compare/v6.4.0...v6.4.2">compare
view</a></li>
</ul>
</details>
<br />

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot]
2026-07-08 12:44:44 +02:00
committed by GitHub
co-authored by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
parent 01f9b343ec
commit b8dd58a42d
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -18,7 +18,7 @@ require (
k8s.io/client-go v0.36.2 k8s.io/client-go v0.36.2
sigs.k8s.io/controller-runtime v0.24.1 sigs.k8s.io/controller-runtime v0.24.1
sigs.k8s.io/gateway-api v1.5.1 sigs.k8s.io/gateway-api v1.5.1
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 sigs.k8s.io/structured-merge-diff/v6 v6.4.2
) )
require ( require (
go.sum
+2 -2
View File
@@ -602,7 +602,7 @@ sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5E
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 h1:qmp2e3ZfFi1/jJbDGpD4mt3wyp6PE1NfKHCYLqgNQJo= sigs.k8s.io/structured-merge-diff/v6 v6.4.2 h1:qdOxHwrl2Kaag1aQEarlYcOA9vSyGCp3CIki3aW8c4Q=
sigs.k8s.io/structured-merge-diff/v6 v6.4.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= sigs.k8s.io/structured-merge-diff/v6 v6.4.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
test/e2e/go.mod
+1 -1
View File
@@ -143,7 +143,7 @@ require (
sigs.k8s.io/kustomize/api v0.21.1 // indirect sigs.k8s.io/kustomize/api v0.21.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect sigs.k8s.io/yaml v1.6.0 // indirect
) )
test/e2e/go.sum
+2 -2
View File
@@ -689,7 +689,7 @@ sigs.k8s.io/kustomize/kyaml v0.21.1 h1:IVlbmhC076nf6foyL6Taw4BkrLuEsXUXNpsE+ScX7
sigs.k8s.io/kustomize/kyaml v0.21.1/go.mod h1:hmxADesM3yUN2vbA5z1/YTBnzLJ1dajdqpQonwBL1FQ= sigs.k8s.io/kustomize/kyaml v0.21.1/go.mod h1:hmxADesM3yUN2vbA5z1/YTBnzLJ1dajdqpQonwBL1FQ=
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 h1:qmp2e3ZfFi1/jJbDGpD4mt3wyp6PE1NfKHCYLqgNQJo= sigs.k8s.io/structured-merge-diff/v6 v6.4.2 h1:qdOxHwrl2Kaag1aQEarlYcOA9vSyGCp3CIki3aW8c4Q=
sigs.k8s.io/structured-merge-diff/v6 v6.4.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= sigs.k8s.io/structured-merge-diff/v6 v6.4.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=