Skip to content

Commit 9e2fd41

Browse files
committed
Update boxcutter to v0.3.0, add TrackingCache to Runnables
1 parent 6cd5b57 commit 9e2fd41

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

cmd/operator-controller/main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ func run() error {
512512
}
513513

514514
trackingCache, err := managedcache.NewTrackingCache(
515-
ctrl.Log.WithName("accessmanager"),
515+
ctrl.Log.WithName("trackingCache"),
516516
restConfig,
517517
crcache.Options{
518518
Scheme: mgr.GetScheme(), Mapper: mgr.GetRESTMapper(),
@@ -521,6 +521,9 @@ func run() error {
521521
if err != nil {
522522
setupLog.Error(err, "unable to create boxcutter tracking cache")
523523
}
524+
if err := mgr.Add(trackingCache); err != nil {
525+
setupLog.Error(err, "unable to set up tracking cache")
526+
}
524527

525528
if err = (&controllers.ClusterExtensionRevisionReconciler{
526529
Client: cl,

go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,23 @@ require (
3232
golang.org/x/tools v0.35.0
3333
gopkg.in/yaml.v2 v2.4.0
3434
helm.sh/helm/v3 v3.18.4
35-
k8s.io/api v0.33.2
36-
k8s.io/apiextensions-apiserver v0.33.2
37-
k8s.io/apimachinery v0.33.2
35+
k8s.io/api v0.33.3
36+
k8s.io/apiextensions-apiserver v0.33.3
37+
k8s.io/apimachinery v0.33.3
3838
k8s.io/apiserver v0.33.2
3939
k8s.io/cli-runtime v0.33.2
40-
k8s.io/client-go v0.33.2
40+
k8s.io/client-go v0.33.3
4141
k8s.io/component-base v0.33.2
4242
k8s.io/klog/v2 v2.130.1
4343
k8s.io/kubernetes v1.33.2
4444
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
45-
pkg.package-operator.run/boxcutter v0.1.2
45+
pkg.package-operator.run/boxcutter v0.3.0
4646
sigs.k8s.io/controller-runtime v0.21.0
4747
sigs.k8s.io/controller-tools v0.18.0
4848
sigs.k8s.io/crdify v0.4.1-0.20250613143457-398e4483fb58
49-
sigs.k8s.io/yaml v1.5.0
49+
sigs.k8s.io/yaml v1.6.0
5050
)
5151

52-
replace pkg.package-operator.run/boxcutter => github.com/perdasilva/boxcutter v0.0.0-20250715101157-18ea858f54bd
53-
5452
require (
5553
k8s.io/component-helpers v0.33.2 // indirect
5654
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
@@ -104,7 +102,7 @@ require (
104102
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
105103
github.com/fatih/color v1.18.0 // indirect
106104
github.com/felixge/httpsnoop v1.0.4 // indirect
107-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
105+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
108106
github.com/go-errors/errors v1.4.2 // indirect
109107
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
110108
github.com/go-git/go-billy/v5 v5.6.2 // indirect
@@ -193,7 +191,7 @@ require (
193191
github.com/sirupsen/logrus v1.9.3 // indirect
194192
github.com/smallstep/pkcs7 v0.2.1 // indirect
195193
github.com/spf13/cast v1.7.1 // indirect
196-
github.com/spf13/pflag v1.0.6 // indirect
194+
github.com/spf13/pflag v1.0.7 // indirect
197195
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
198196
github.com/stoewer/go-strcase v1.3.1 // indirect
199197
github.com/stretchr/objx v0.5.2 // indirect

go.sum

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
146146
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
147147
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
148148
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
149-
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
150-
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
149+
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
150+
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
151151
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
152152
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
153153
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
@@ -380,8 +380,6 @@ github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
380380
github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
381381
github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
382382
github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
383-
github.com/perdasilva/boxcutter v0.0.0-20250715101157-18ea858f54bd h1:CEXvUTPMkCMX+0q9cqwaFAl51s71qESI1V2wRK/8xsg=
384-
github.com/perdasilva/boxcutter v0.0.0-20250715101157-18ea858f54bd/go.mod h1:74MfxxOWGkveUl9Iv2/01tg/IULlWnHEaVv2dfR4/b8=
385383
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
386384
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
387385
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI=
@@ -441,8 +439,9 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
441439
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
442440
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
443441
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
444-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
445442
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
443+
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
444+
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
446445
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLyeX7o/5aX8qUQ69P/mLojDqwda8hFOCBTmP/6hw=
447446
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=
448447
github.com/stoewer/go-strcase v1.3.1 h1:iS0MdW+kVTxgMoE1LAZyMiYJFKlOzLooE4MxjirtkAs=
@@ -761,6 +760,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
761760
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
762761
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
763762
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
763+
pkg.package-operator.run/boxcutter v0.3.0 h1:Pkfu6jKi7cLINCM1PzLz1rManawxPQFEGflSouqzeww=
764+
pkg.package-operator.run/boxcutter v0.3.0/go.mod h1:Q0TEZgWu6nAhTSI4NbvKulp0v/sxHoAVfRCQeLHV9v8=
764765
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 h1:qPrZsv1cwQiFeieFlRqT627fVZ+tyfou/+S5S0H5ua0=
765766
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
766767
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
@@ -783,5 +784,5 @@ sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxO
783784
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
784785
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
785786
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
786-
sigs.k8s.io/yaml v1.5.0 h1:M10b2U7aEUY6hRtU870n2VTPgR5RZiL/I6Lcc2F4NUQ=
787-
sigs.k8s.io/yaml v1.5.0/go.mod h1:wZs27Rbxoai4C0f8/9urLZtZtF3avA3gKvGyPdDqTO4=
787+
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
788+
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=

0 commit comments

Comments
 (0)