Skip to content

Commit 4ba9b2b

Browse files
thetechnickthetechnick
committed
Update boxcutter to v0.3.0, add TrackingCache to Runnables
1 parent 5298c4b commit 4ba9b2b

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
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: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require (
99
github.com/cert-manager/cert-manager v1.18.2
1010
github.com/containerd/containerd v1.7.28
1111
github.com/containers/image/v5 v5.36.1
12+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1213
github.com/fsnotify/fsnotify v1.9.0
1314
github.com/go-logr/logr v1.4.3
1415
github.com/golang-jwt/jwt/v5 v5.3.0
@@ -31,25 +32,24 @@ require (
3132
golang.org/x/sync v0.16.0
3233
golang.org/x/tools v0.36.0
3334
gopkg.in/yaml.v2 v2.4.0
34-
helm.sh/helm/v3 v3.18.5
35+
helm.sh/helm/v3 v3.18.4
3536
k8s.io/api v0.33.3
3637
k8s.io/apiextensions-apiserver v0.33.3
3738
k8s.io/apimachinery v0.33.3
38-
k8s.io/apiserver v0.33.3
39-
k8s.io/cli-runtime v0.33.3
39+
k8s.io/apiserver v0.33.2
40+
k8s.io/cli-runtime v0.33.2
4041
k8s.io/client-go v0.33.3
41-
k8s.io/component-base v0.33.3
42+
k8s.io/component-base v0.33.2
4243
k8s.io/klog/v2 v2.130.1
4344
k8s.io/kubernetes v1.33.2
4445
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
46+
pkg.package-operator.run/boxcutter v0.3.0
4547
sigs.k8s.io/controller-runtime v0.21.0
4648
sigs.k8s.io/controller-tools v0.18.0
4749
sigs.k8s.io/crdify v0.4.1-0.20250613143457-398e4483fb58
4850
sigs.k8s.io/yaml v1.6.0
4951
)
5052

51-
replace pkg.package-operator.run/boxcutter => github.com/perdasilva/boxcutter v0.0.0-20250715101157-18ea858f54bd
52-
5353
require (
5454
k8s.io/component-helpers v0.33.2 // indirect
5555
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
@@ -90,7 +90,6 @@ require (
9090
github.com/containers/storage v1.59.1 // indirect
9191
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
9292
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
93-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9493
github.com/distribution/reference v0.6.0 // indirect
9594
github.com/docker/cli v28.3.2+incompatible // indirect
9695
github.com/docker/distribution v2.8.3+incompatible // indirect
@@ -104,7 +103,7 @@ require (
104103
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
105104
github.com/fatih/color v1.18.0 // indirect
106105
github.com/felixge/httpsnoop v1.0.4 // indirect
107-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
106+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
108107
github.com/go-errors/errors v1.4.2 // indirect
109108
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
110109
github.com/go-git/go-billy/v5 v5.6.2 // indirect
@@ -184,7 +183,6 @@ require (
184183
github.com/rivo/uniseg v0.4.7 // indirect
185184
github.com/rubenv/sql-migrate v1.8.0 // indirect
186185
github.com/russross/blackfriday/v2 v2.1.0 // indirect
187-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
188186
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
189187
github.com/shopspring/decimal v1.4.0 // indirect
190188
github.com/sigstore/fulcio v1.7.1 // indirect
@@ -202,6 +200,9 @@ require (
202200
github.com/vbatts/tar-split v0.12.1 // indirect
203201
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
204202
github.com/x448/float16 v0.8.4 // indirect
203+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
204+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
205+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
205206
github.com/xlab/treeprint v1.2.0 // indirect
206207
go.etcd.io/bbolt v1.4.2 // indirect
207208
go.opencensus.io v0.24.0 // indirect

‎go.sum‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ github.com/distribution/distribution/v3 v3.0.0 h1:q4R8wemdRQDClzoNNStftB2ZAfqOiN
108108
github.com/distribution/distribution/v3 v3.0.0/go.mod h1:tRNuFoZsUdyRVegq8xGNeds4KLjwLCRin/tTo6i1DhU=
109109
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
110110
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
111-
github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
112-
github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
113111
github.com/docker/cli v28.3.2+incompatible h1:mOt9fcLE7zaACbxW1GeS65RI67wIJrTnqS3hP2huFsY=
114112
github.com/docker/cli v28.3.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
115113
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
@@ -148,8 +146,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
148146
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
149147
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
150148
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
151-
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
152-
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=
153151
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
154152
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
155153
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
@@ -476,6 +474,13 @@ github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4
476474
github.com/vbauerster/mpb/v8 v8.10.2/go.mod h1:+Ja4P92E3/CorSZgfDtK46D7AVbDqmBQRTmyTqPElo0=
477475
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
478476
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
477+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
478+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
479+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
480+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
481+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
482+
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
483+
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
479484
github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
480485
github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
481486
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -725,8 +730,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
725730
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
726731
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
727732
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
728-
helm.sh/helm/v3 v3.18.5 h1:Cc3Z5vd6kDrZq9wO9KxKLNEickiTho6/H/dBNRVSos4=
729-
helm.sh/helm/v3 v3.18.5/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg=
733+
helm.sh/helm/v3 v3.18.4 h1:pNhnHM3nAmDrxz6/UC+hfjDY4yeDATQCka2/87hkZXQ=
734+
helm.sh/helm/v3 v3.18.4/go.mod h1:WVnwKARAw01iEdjpEkP7Ii1tT1pTPYfM1HsakFKM3LI=
730735
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
731736
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
732737
k8s.io/api v0.33.2 h1:YgwIS5jKfA+BZg//OQhkJNIfie/kmRsO0BmNaVSimvY=
@@ -759,6 +764,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
759764
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
760765
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
761766
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
767+
pkg.package-operator.run/boxcutter v0.3.0 h1:Pkfu6jKi7cLINCM1PzLz1rManawxPQFEGflSouqzeww=
768+
pkg.package-operator.run/boxcutter v0.3.0/go.mod h1:Q0TEZgWu6nAhTSI4NbvKulp0v/sxHoAVfRCQeLHV9v8=
762769
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 h1:qPrZsv1cwQiFeieFlRqT627fVZ+tyfou/+S5S0H5ua0=
763770
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
764771
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=

0 commit comments

Comments
 (0)