Skip to content

Commit 0a58f28

Browse files
tmshorttmshort
authored
Use rukpak as a library (#821)
Signed-off-by: Todd Short <[email protected]>
1 parent 04348ac commit 0a58f28

File tree

22 files changed

+168
-1393
lines changed

22 files changed

+168
-1393
lines changed

‎cmd/manager/main.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package main
1818

1919
import (
20+
"crypto/x509"
2021
"flag"
2122
"fmt"
2223
"net/http"
@@ -34,14 +35,14 @@ import (
3435
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
3536

3637
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
38+
"github.com/operator-framework/rukpak/pkg/source"
39+
"github.com/operator-framework/rukpak/pkg/storage"
40+
"github.com/operator-framework/rukpak/pkg/util"
3741

3842
"github.com/operator-framework/operator-controller/internal/catalogmetadata/cache"
3943
catalogclient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"
4044
"github.com/operator-framework/operator-controller/internal/controllers"
41-
"github.com/operator-framework/operator-controller/internal/rukpak/handler"
42-
"github.com/operator-framework/operator-controller/internal/rukpak/source"
43-
"github.com/operator-framework/operator-controller/internal/rukpak/storage"
44-
"github.com/operator-framework/operator-controller/internal/rukpak/util"
45+
"github.com/operator-framework/operator-controller/internal/handler"
4546
"github.com/operator-framework/operator-controller/pkg/features"
4647
"github.com/operator-framework/operator-controller/pkg/scheme"
4748
)
@@ -109,7 +110,7 @@ func main() {
109110
cl := mgr.GetClient()
110111
catalogClient := catalogclient.New(cl, cache.NewFilesystemCache(cachePath, &http.Client{Timeout: 10 * time.Second}))
111112

112-
cfgGetter, err := helmclient.NewActionConfigGetter(mgr.GetConfig(), mgr.GetRESTMapper(), mgr.GetLogger(), helmclient.StorageNamespaceMapper(func(o client.Object) (string, error) {
113+
cfgGetter, err := helmclient.NewActionConfigGetter(mgr.GetConfig(), mgr.GetRESTMapper(), helmclient.StorageNamespaceMapper(func(o client.Object) (string, error) {
113114
return systemNamespace, nil
114115
}))
115116
if err != nil {
@@ -127,7 +128,7 @@ func main() {
127128
systemNamespace = util.PodNamespace()
128129
}
129130

130-
unpacker, err := source.NewDefaultUnpacker(mgr, systemNamespace, unpackImage)
131+
unpacker, err := source.NewDefaultUnpacker(mgr, systemNamespace, unpackImage, (*x509.CertPool)(nil))
131132
if err != nil {
132133
setupLog.Error(err, "unable to create unpacker")
133134
os.Exit(1)

‎go.mod

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,20 @@ require (
99
github.com/blang/semver/v4 v4.0.0
1010
github.com/go-logr/logr v1.4.1
1111
github.com/google/go-cmp v0.6.0
12-
github.com/nlepage/go-tarfs v1.2.1
13-
github.com/operator-framework/api v0.23.0
1412
github.com/operator-framework/catalogd v0.12.0
1513
github.com/operator-framework/deppy v0.3.0
16-
github.com/operator-framework/helm-operator-plugins v0.1.3
14+
github.com/operator-framework/helm-operator-plugins v0.2.1
1715
github.com/operator-framework/operator-registry v1.40.0
18-
github.com/operator-framework/rukpak v0.19.0
16+
github.com/operator-framework/rukpak v0.20.1-0.20240502203826-72cffe62499b
1917
github.com/spf13/pflag v1.0.5
2018
github.com/stretchr/testify v1.9.0
2119
github.com/vmware-tanzu/carvel-kapp-controller v0.51.0
2220
go.uber.org/zap v1.27.0
2321
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
2422
gopkg.in/yaml.v2 v2.4.0
25-
helm.sh/helm/v3 v3.14.3
23+
helm.sh/helm/v3 v3.14.4
2624
k8s.io/api v0.29.3
27-
k8s.io/apiextensions-apiserver v0.29.3
2825
k8s.io/apimachinery v0.29.3
29-
k8s.io/cli-runtime v0.29.2
3026
k8s.io/client-go v0.29.3
3127
k8s.io/component-base v0.29.3
3228
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
@@ -36,6 +32,7 @@ require (
3632

3733
require (
3834
carvel.dev/vendir v0.40.0 // indirect
35+
dario.cat/mergo v1.0.0 // indirect
3936
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4037
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
4138
github.com/BurntSushi/toml v1.3.2 // indirect
@@ -45,12 +42,14 @@ require (
4542
github.com/Masterminds/squirrel v1.5.4 // indirect
4643
github.com/Microsoft/go-winio v0.6.1 // indirect
4744
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
45+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
4846
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
4947
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5048
github.com/beorn7/perks v1.0.1 // indirect
5149
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5250
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5351
github.com/chai2010/gettext-go v1.0.2 // indirect
52+
github.com/cloudflare/circl v1.3.7 // indirect
5453
github.com/containerd/cgroups/v3 v3.0.2 // indirect
5554
github.com/containerd/containerd v1.7.15 // indirect
5655
github.com/containerd/continuity v0.4.2 // indirect
@@ -74,6 +73,7 @@ require (
7473
github.com/docker/go-metrics v0.0.1 // indirect
7574
github.com/docker/go-units v0.5.0 // indirect
7675
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
76+
github.com/emirpasic/gods v1.18.1 // indirect
7777
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
7878
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
7979
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
@@ -84,7 +84,7 @@ require (
8484
github.com/go-errors/errors v1.4.2 // indirect
8585
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
8686
github.com/go-git/go-billy/v5 v5.5.0 // indirect
87-
github.com/go-git/go-git/v5 v5.11.0 // indirect
87+
github.com/go-git/go-git/v5 v5.12.0 // indirect
8888
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
8989
github.com/go-logr/stdr v1.2.2 // indirect
9090
github.com/go-logr/zapr v1.3.0 // indirect
@@ -118,6 +118,7 @@ require (
118118
github.com/joelanford/ignore v0.1.0 // indirect
119119
github.com/josharian/intern v1.0.0 // indirect
120120
github.com/json-iterator/go v1.1.12 // indirect
121+
github.com/kevinburke/ssh_config v1.2.0 // indirect
121122
github.com/klauspost/compress v1.17.7 // indirect
122123
github.com/klauspost/pgzip v1.2.6 // indirect
123124
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
@@ -142,30 +143,36 @@ require (
142143
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
143144
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
144145
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
145-
github.com/onsi/gomega v1.33.0 // indirect
146+
github.com/nlepage/go-tarfs v1.2.1 // indirect
147+
github.com/onsi/gomega v1.33.1 // indirect
146148
github.com/opencontainers/go-digest v1.0.0 // indirect
147149
github.com/opencontainers/image-spec v1.1.0 // indirect
148150
github.com/opencontainers/runtime-spec v1.2.0 // indirect
151+
github.com/operator-framework/api v0.23.0 // indirect
149152
github.com/operator-framework/operator-lib v0.12.0 // indirect
150153
github.com/otiai10/copy v1.14.0 // indirect
151154
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
155+
github.com/pjbgf/sha1cd v0.3.0 // indirect
152156
github.com/pkg/errors v0.9.1 // indirect
153157
github.com/pmezard/go-difflib v1.0.0 // indirect
154-
github.com/prometheus/client_golang v1.18.0 // indirect
158+
github.com/prometheus/client_golang v1.19.0 // indirect
155159
github.com/prometheus/client_model v0.6.0 // indirect
156-
github.com/prometheus/common v0.47.0 // indirect
160+
github.com/prometheus/common v0.48.0 // indirect
157161
github.com/prometheus/procfs v0.12.0 // indirect
158162
github.com/rivo/uniseg v0.4.4 // indirect
159163
github.com/rubenv/sql-migrate v1.5.2 // indirect
160164
github.com/russross/blackfriday/v2 v2.1.0 // indirect
165+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
161166
github.com/shopspring/decimal v1.3.1 // indirect
162167
github.com/sirupsen/logrus v1.9.3 // indirect
168+
github.com/skeema/knownhosts v1.2.2 // indirect
163169
github.com/spf13/cast v1.5.0 // indirect
164170
github.com/spf13/cobra v1.8.0 // indirect
165171
github.com/stoewer/go-strcase v1.3.0 // indirect
166172
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
167173
github.com/ulikunitz/xz v0.5.11 // indirect
168174
github.com/vbatts/tar-split v0.11.5 // indirect
175+
github.com/xanzy/ssh-agent v0.3.3 // indirect
169176
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
170177
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
171178
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -191,7 +198,7 @@ require (
191198
golang.org/x/term v0.19.0 // indirect
192199
golang.org/x/text v0.14.0 // indirect
193200
golang.org/x/time v0.5.0 // indirect
194-
golang.org/x/tools v0.19.0 // indirect
201+
golang.org/x/tools v0.20.0 // indirect
195202
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
196203
google.golang.org/appengine v1.6.8 // indirect
197204
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
@@ -202,10 +209,12 @@ require (
202209
gopkg.in/inf.v0 v0.9.1 // indirect
203210
gopkg.in/warnings.v0 v0.1.2 // indirect
204211
gopkg.in/yaml.v3 v3.0.1 // indirect
212+
k8s.io/apiextensions-apiserver v0.29.3 // indirect
205213
k8s.io/apiserver v0.29.3 // indirect
214+
k8s.io/cli-runtime v0.29.3 // indirect
206215
k8s.io/klog/v2 v2.120.1 // indirect
207216
k8s.io/kube-openapi v0.0.0-20240221221325-2ac9dc51f3f1 // indirect
208-
k8s.io/kubectl v0.29.2 // indirect
217+
k8s.io/kubectl v0.29.3 // indirect
209218
oras.land/oras-go v1.2.5 // indirect
210219
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
211220
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

0 commit comments

Comments
 (0)