Skip to content

Commit 36e955e

Browse files
committed
chore(deps): Update k8s.io/kubernetes go module
After updating containerd there was a compatibility problem related to the structured-merge-diff/v4 vs structured-merge-diff/v6 which caused problems build kubectl using tools/kubectl/go.mod. This should fix that. I decided to update all the other mod files similarly so we're using the same version everywhere. Hopefully that won't introduce any other compatibility problems, but let's see. Done like this: for d in . acceptance tools tools/kubectl; do (cd $d; go get k8s.io/kubernetes && go mod tidy); done for d in . acceptance tools tools/kubectl; do (cd $d; go get k8s.io/apiextensions-apiserver && go mod tidy); done for d in . acceptance tools tools/kubectl; do (cd $d; go get k8s.io/kubectl && go mod tidy); done Not sure if that was the optimal way to do it, but I was aiming to get rid of all the 0.31.0 k8s deps.
1 parent caa8b84 commit 36e955e

File tree

9 files changed

+187
-214
lines changed

9 files changed

+187
-214
lines changed

acceptance/go.mod

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ require (
3434
github.com/yudai/gojsondiff v1.0.0
3535
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
3636
gopkg.in/go-jose/go-jose.v2 v2.6.3
37-
k8s.io/api v0.34.1
38-
k8s.io/apimachinery v0.34.1
39-
k8s.io/client-go v0.34.1
37+
k8s.io/api v0.34.2
38+
k8s.io/apimachinery v0.34.2
39+
k8s.io/client-go v0.34.2
4040
oras.land/oras-go/v2 v2.6.0
4141
sigs.k8s.io/kind v0.26.0
42-
sigs.k8s.io/kustomize/api v0.18.0
43-
sigs.k8s.io/kustomize/kyaml v0.18.1
42+
sigs.k8s.io/kustomize/api v0.20.1
43+
sigs.k8s.io/kustomize/kyaml v0.20.1
4444
sigs.k8s.io/yaml v1.6.0
4545
)
4646

@@ -79,7 +79,7 @@ require (
7979
github.com/cpuguy83/dockercfg v0.3.2 // indirect
8080
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
8181
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
82-
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
82+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
8383
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8484
github.com/digitorus/pkcs7 v0.0.0-20230818184609-3a137a874352 // indirect
8585
github.com/digitorus/timestamp v0.0.0-20231217203849-220c5c2851b7 // indirect
@@ -125,12 +125,11 @@ require (
125125
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
126126
github.com/golang/protobuf v1.5.4 // indirect
127127
github.com/golang/snappy v0.0.4 // indirect
128-
github.com/google/cel-go v0.22.0 // indirect
128+
github.com/google/cel-go v0.26.0 // indirect
129129
github.com/google/certificate-transparency-go v1.2.1 // indirect
130130
github.com/google/gnostic-models v0.7.0 // indirect
131131
github.com/google/go-cmp v0.7.0 // indirect
132132
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 // indirect
133-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
134133
github.com/google/uuid v1.6.0 // indirect
135134
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
136135
github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect
@@ -143,7 +142,7 @@ require (
143142
github.com/inconshreveable/mousetrap v1.1.0 // indirect
144143
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
145144
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
146-
github.com/jonboulle/clockwork v0.4.0 // indirect
145+
github.com/jonboulle/clockwork v0.5.0 // indirect
147146
github.com/josharian/intern v1.0.0 // indirect
148147
github.com/json-iterator/go v1.1.12 // indirect
149148
github.com/kevinburke/ssh_config v1.2.0 // indirect
@@ -227,7 +226,6 @@ require (
227226
go.mongodb.org/mongo-driver v1.16.1 // indirect
228227
go.opencensus.io v0.24.0 // indirect
229228
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
230-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
231229
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
232230
go.opentelemetry.io/otel v1.37.0 // indirect
233231
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
@@ -257,16 +255,14 @@ require (
257255
gopkg.in/warnings.v0 v0.1.2 // indirect
258256
gopkg.in/yaml.v2 v2.4.0 // indirect
259257
gopkg.in/yaml.v3 v3.0.1 // indirect
260-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
261-
k8s.io/apiserver v0.32.3 // indirect
262-
k8s.io/component-base v0.32.3 // indirect
258+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
259+
k8s.io/cli-runtime v0.34.2 // indirect
263260
k8s.io/klog/v2 v2.130.1 // indirect
264261
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
265262
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
266263
knative.dev/pkg v0.0.0-20240815051656-89743d9bbf7c // indirect
267264
sigs.k8s.io/controller-runtime v0.19.0 // indirect
268265
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
269266
sigs.k8s.io/randfill v1.0.0 // indirect
270-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
271267
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
272268
)

acceptance/go.sum

Lines changed: 34 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6a
250250
github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
251251
github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8=
252252
github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU=
253-
github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
254253
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
255254
github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
256255
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
@@ -273,8 +272,8 @@ github.com/cucumber/messages/go/v21 v21.0.1/go.mod h1:zheH/2HS9JLVFukdrsPWoPdmUt
273272
github.com/cucumber/messages/go/v22 v22.0.0/go.mod h1:aZipXTKc0JnjCsXrJnuZpWhtay93k7Rn3Dee7iyPJjs=
274273
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f h1:eHnXnuK47UlSTOQexbzxAZfekVz6i+LKRdj1CU5DPaM=
275274
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=
276-
github.com/cyphar/filepath-securejoin v0.3.1 h1:1V7cHiaW+C+39wEfpH6XlLBQo3j/PciWFrgfCLS8XrE=
277-
github.com/cyphar/filepath-securejoin v0.3.1/go.mod h1:F7i41x/9cBF7lzCrVsYs9fuzwRZm4NQsGTBdpp6mETc=
275+
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
276+
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
278277
github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
279278
github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8=
280279
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -431,8 +430,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
431430
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
432431
github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
433432
github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
434-
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
435-
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
433+
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
434+
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
436435
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
437436
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
438437
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -471,8 +470,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
471470
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
472471
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
473472
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
474-
github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g=
475-
github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
473+
github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI=
474+
github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
476475
github.com/google/certificate-transparency-go v1.2.1 h1:4iW/NwzqOqYEEoCBEFP+jPbBXbLqMpq3CifMyOnDUME=
477476
github.com/google/certificate-transparency-go v1.2.1/go.mod h1:bvn/ytAccv+I6+DGkqpvSsEdiVGramgaSC6RD3tEmeE=
478477
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
@@ -516,8 +515,6 @@ github.com/google/s2a-go v0.1.8 h1:zZDs9gcbt9ZPLV0ndSyQk6Kacx2g/X+SKYovpnz3SMM=
516515
github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA=
517516
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962 h1:+9C/TgFfcCmZBV7Fjb3kQCGlkpFrhtvFDgbdQHB9RaA=
518517
github.com/google/safetext v0.0.0-20240722112252-5a72de7e7962/go.mod h1:H3K1Iu/utuCfa10JO+GsmKUYSWi7ug57Rk6GaDRHaaQ=
519-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
520-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
521518
github.com/google/tink/go v1.7.0 h1:6Eox8zONGebBFcCBqkVmt60LaWZa6xg1cl/DwAh/J1w=
522519
github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcgTJZStM=
523520
github.com/google/trillian v1.6.0 h1:jMBeDBIkINFvS2n6oV5maDqfRlxREAc6CW9QYWQ0qT4=
@@ -595,8 +592,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y
595592
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
596593
github.com/jmhodges/clock v1.2.0 h1:eq4kys+NI0PLngzaHEe7AmPT90XMGIEySD1JfV1PDIs=
597594
github.com/jmhodges/clock v1.2.0/go.mod h1:qKjhA7x7u/lQpPB1XAqX1b1lCI/w3/fNuYpI/ZjLynI=
598-
github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4=
599-
github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
595+
github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
596+
github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
600597
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
601598
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
602599
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -968,12 +965,12 @@ github.com/zalando/go-keyring v0.2.3 h1:v9CUu9phlABObO4LPWycf+zwMG7nlbb3t/B5wa97
968965
github.com/zalando/go-keyring v0.2.3/go.mod h1:HL4k+OXQfJUWaMnqyuSOc0drfGPX2b51Du6K+MRgZMk=
969966
github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
970967
github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
971-
go.etcd.io/etcd/api/v3 v3.5.16 h1:WvmyJVbjWqK4R1E+B12RRHz3bRGy9XVfh++MgbN+6n0=
972-
go.etcd.io/etcd/api/v3 v3.5.16/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28=
973-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 h1:ZgY48uH6UvB+/7R9Yf4x574uCO3jIx0TRDyetSfId3Q=
974-
go.etcd.io/etcd/client/pkg/v3 v3.5.16/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E=
975-
go.etcd.io/etcd/client/v3 v3.5.16 h1:sSmVYOAHeC9doqi0gv7v86oY/BTld0SEFGaxsU9eRhE=
976-
go.etcd.io/etcd/client/v3 v3.5.16/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50=
968+
go.etcd.io/etcd/api/v3 v3.6.4 h1:7F6N7toCKcV72QmoUKa23yYLiiljMrT4xCeBL9BmXdo=
969+
go.etcd.io/etcd/api/v3 v3.6.4/go.mod h1:eFhhvfR8Px1P6SEuLT600v+vrhdDTdcfMzmnxVXXSbk=
970+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 h1:9HBYrjppeOfFjBjaMTRxT3R7xT0GLK8EJMVC4xg6ok0=
971+
go.etcd.io/etcd/client/pkg/v3 v3.6.4/go.mod h1:sbdzr2cl3HzVmxNw//PH7aLGVtY4QySjQFuaCgcRFAI=
972+
go.etcd.io/etcd/client/v3 v3.6.4 h1:YOMrCfMhRzY8NgtzUsHl8hC2EBSnuqbR3dh84Uryl7A=
973+
go.etcd.io/etcd/client/v3 v3.6.4/go.mod h1:jaNNHCyg2FdALyKWnd7hxZXZxZANb0+KGY+YQaEMISo=
977974
go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
978975
go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
979976
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -1414,20 +1411,20 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
14141411
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
14151412
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
14161413
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
1417-
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
1418-
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
1419-
k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk=
1420-
k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk=
1421-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
1422-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
1423-
k8s.io/apiserver v0.32.3 h1:kOw2KBuHOA+wetX1MkmrxgBr648ksz653j26ESuWNY8=
1424-
k8s.io/apiserver v0.32.3/go.mod h1:q1x9B8E/WzShF49wh3ADOh6muSfpmFL0I2t+TG0Zdgc=
1425-
k8s.io/cli-runtime v0.29.8 h1:kVErAPf1v7MOwNO6rBYnf2i4kQ2668Y9pHGO5C1/wSo=
1426-
k8s.io/cli-runtime v0.29.8/go.mod h1:c00Fk85K05DtEknMAi1t7ao1MR4nmQ9YlvC+QluvNoY=
1427-
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
1428-
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
1429-
k8s.io/component-base v0.32.3 h1:98WJvvMs3QZ2LYHBzvltFSeJjEx7t5+8s71P7M74u8k=
1430-
k8s.io/component-base v0.32.3/go.mod h1:LWi9cR+yPAv7cu2X9rZanTiFKB2kHA+JjmhkKjCZRpI=
1414+
k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
1415+
k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
1416+
k8s.io/apiextensions-apiserver v0.34.2 h1:WStKftnGeoKP4AZRz/BaAAEJvYp4mlZGN0UCv+uvsqo=
1417+
k8s.io/apiextensions-apiserver v0.34.2/go.mod h1:398CJrsgXF1wytdaanynDpJ67zG4Xq7yj91GrmYN2SE=
1418+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
1419+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
1420+
k8s.io/apiserver v0.34.2 h1:2/yu8suwkmES7IzwlehAovo8dDE07cFRC7KMDb1+MAE=
1421+
k8s.io/apiserver v0.34.2/go.mod h1:gqJQy2yDOB50R3JUReHSFr+cwJnL8G1dzTA0YLEqAPI=
1422+
k8s.io/cli-runtime v0.34.2 h1:cct1GEuWc3IyVT8MSCoIWzRGw9HJ/C5rgP32H60H6aE=
1423+
k8s.io/cli-runtime v0.34.2/go.mod h1:X13tsrYexYUCIq8MarCBy8lrm0k0weFPTpcaNo7lms4=
1424+
k8s.io/client-go v0.34.2 h1:Co6XiknN+uUZqiddlfAjT68184/37PS4QAzYvQvDR8M=
1425+
k8s.io/client-go v0.34.2/go.mod h1:2VYDl1XXJsdcAxw7BenFslRQX28Dxz91U9MWKjX97fE=
1426+
k8s.io/component-base v0.34.2 h1:HQRqK9x2sSAsd8+R4xxRirlTjowsg6fWCPwWYeSvogQ=
1427+
k8s.io/component-base v0.34.2/go.mod h1:9xw2FHJavUHBFpiGkZoKuYZ5pdtLKe97DEByaA+hHbM=
14311428
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
14321429
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
14331430
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
@@ -1447,27 +1444,24 @@ oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1
14471444
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
14481445
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
14491446
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1450-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
1451-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
1447+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
1448+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
14521449
sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q=
14531450
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
14541451
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
14551452
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
14561453
sigs.k8s.io/kind v0.26.0 h1:8fS6I0Q5WGlmLprSpH0DarlOSdcsv0txnwc93J2BP7M=
14571454
sigs.k8s.io/kind v0.26.0/go.mod h1:t7ueEpzPYJvHA8aeLtI52rtFftNgUYUaCwvxjk7phfw=
1458-
sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo=
1459-
sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U=
1460-
sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=
1461-
sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo=
1455+
sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I=
1456+
sigs.k8s.io/kustomize/api v0.20.1/go.mod h1:t6hUFxO+Ph0VxIk1sKp1WS0dOjbPCtLJ4p8aADLwqjM=
1457+
sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78=
1458+
sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po=
14621459
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
14631460
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
14641461
sigs.k8s.io/release-utils v0.8.4 h1:4QVr3UgbyY/d9p74LBhg0njSVQofUsAZqYOzVZBhdBw=
14651462
sigs.k8s.io/release-utils v0.8.4/go.mod h1:m1bHfscTemQp+z+pLCZnkXih9n0+WukIUU70n6nFnU0=
1466-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
1467-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
14681463
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco=
14691464
sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
1470-
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
14711465
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
14721466
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
14731467
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=

build.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,17 @@ echo "BUILDS=$BUILDS"
4747

4848
export GO_COMPLIANCE_INFO=0
4949

50+
# When building inside the container we're expecting these to be
51+
# mounted volumes
52+
if [[ -d "/go/cache" ]]; then
53+
export GOCACHE=/go/cache
54+
fi
55+
if [[ -d "/go/mod" ]]; then
56+
export GOMODCACHE=/go/mod
57+
fi
58+
5059
build_ec() {
51-
GOOS="$1" GOARCH="$2" go build \
60+
GOOS="$1" GOARCH="$2" GOCACHE="$GOCACHE" GOMODCACHE="$GOMODCACHE" go build \
5261
-trimpath \
5362
--mod=readonly \
5463
-ldflags="-s -w -X github.com/conforma/cli/internal/version.Version=$4" \
@@ -57,7 +66,7 @@ build_ec() {
5766
}
5867

5968
build_kubectl() {
60-
GOOS="$1" GOARCH="$2" go install \
69+
GOOS="$1" GOARCH="$2" GOCACHE="$GOCACHE" GOMODCACHE="$GOMODCACHE" go install \
6170
-modfile tools/kubectl/go.mod \
6271
-trimpath \
6372
--mod=readonly \

go.mod

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ require (
5050
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0
5151
golang.org/x/net v0.44.0
5252
golang.org/x/sync v0.17.0
53-
k8s.io/apiextensions-apiserver v0.31.0
54-
k8s.io/apimachinery v0.34.1
55-
k8s.io/client-go v0.34.1
53+
k8s.io/apiextensions-apiserver v0.34.2
54+
k8s.io/apimachinery v0.34.2
55+
k8s.io/client-go v0.34.2
5656
k8s.io/klog/v2 v2.130.1
5757
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
5858
oras.land/oras-go/v2 v2.6.0
@@ -67,7 +67,7 @@ require (
6767
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
6868
golang.org/x/text v0.29.0
6969
gopkg.in/yaml.v3 v3.0.1
70-
k8s.io/api v0.34.1
70+
k8s.io/api v0.34.2
7171
)
7272

7373
require (
@@ -170,7 +170,7 @@ require (
170170
github.com/cpuguy83/dockercfg v0.3.2 // indirect
171171
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
172172
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
173-
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
173+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
174174
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
175175
github.com/dgraph-io/badger/v4 v4.7.0 // indirect
176176
github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect
@@ -220,7 +220,7 @@ require (
220220
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
221221
github.com/golang/protobuf v1.5.4 // indirect
222222
github.com/golang/snappy v0.0.4 // indirect
223-
github.com/google/cel-go v0.21.0 // indirect
223+
github.com/google/cel-go v0.26.0 // indirect
224224
github.com/google/certificate-transparency-go v1.2.1 // indirect
225225
github.com/google/flatbuffers v25.2.10+incompatible // indirect
226226
github.com/google/gnostic-models v0.7.0 // indirect
@@ -346,8 +346,6 @@ require (
346346
github.com/yusufpapurcu/wmi v1.2.3 // indirect
347347
github.com/zclconf/go-cty v1.16.2 // indirect
348348
github.com/zeebo/errs v1.4.0 // indirect
349-
go.etcd.io/etcd/client/pkg/v3 v3.6.3 // indirect
350-
go.etcd.io/etcd/client/v3 v3.6.3 // indirect
351349
go.mongodb.org/mongo-driver v1.16.1 // indirect
352350
go.opencensus.io v0.24.0 // indirect
353351
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
@@ -395,6 +393,5 @@ require (
395393
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
396394
sigs.k8s.io/randfill v1.0.0 // indirect
397395
sigs.k8s.io/release-utils v0.8.4 // indirect
398-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
399396
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
400397
)

0 commit comments

Comments
 (0)