Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bentito/operator-registry
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: operator-framework/operator-registry
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
13 contributors
Loading
Showing with 3,827 additions and 1,859 deletions.
  1. +9 −3 .bingo/Variables.mk
  2. +1 −1 .bingo/ginkgo.mod
  3. +6 −0 .bingo/ginkgo.sum
  4. +5 −0 .bingo/golangci-lint.mod
  5. +1,071 −0 .bingo/golangci-lint.sum
  6. +3 −1 .bingo/variables.env
  7. +8 −0 .github/dependabot.yml
  8. +0 −17 .github/stale.yml
  9. +22 −0 .github/workflows/go-verdiff.yaml
  10. +53 −0 .github/workflows/stale.yml
  11. +2 −5 .github/workflows/test.yml
  12. +83 −0 .golangci.yaml
  13. +17 −15 Makefile
  14. +6 −11 OWNERS
  15. +2 −3 alpha/action/migrate_test.go
  16. +4 −2 alpha/action/migrations/migrations_test.go
  17. +12 −27 alpha/action/render.go
  18. +8 −11 alpha/action/render_test.go
  19. +1 −2 alpha/declcfg/declcfg.go
  20. +1 −1 alpha/declcfg/declcfg_to_model.go
  21. +1 −2 alpha/declcfg/declcfg_to_model_test.go
  22. +4 −4 alpha/declcfg/helpers_test.go
  23. +14 −9 alpha/declcfg/load.go
  24. +19 −5 alpha/declcfg/load_benchmark_test.go
  25. +10 −10 alpha/declcfg/load_test.go
  26. +2 −0 alpha/declcfg/model_to_declcfg.go
  27. +2 −1 alpha/declcfg/model_to_declcfg_test.go
  28. +19 −17 alpha/declcfg/write.go
  29. +2 −2 alpha/declcfg/write_test.go
  30. +5 −2 alpha/model/error.go
  31. +1 −0 alpha/model/model.go
  32. +3 −1 alpha/model/model_test.go
  33. +3 −1 alpha/property/property.go
  34. +2 −1 alpha/template/converter/converter.go
  35. +4 −1 alpha/template/semver/semver.go
  36. +0 −2 alpha/template/semver/semver_test.go
  37. +2 −0 cmd/configmap-server/main.go
  38. +2 −1 cmd/opm/alpha/bundle/build.go
  39. +1 −1 cmd/opm/alpha/bundle/extract.go
  40. +1 −0 cmd/opm/alpha/bundle/unpack.go
  41. +2 −2 cmd/opm/alpha/bundle/validate.go
  42. +0 −1 cmd/opm/alpha/convert-template/convert.go
  43. +9 −3 cmd/opm/alpha/list/cmd.go
  44. +3 −1 cmd/opm/alpha/template/basic.go
  45. +3 −1 cmd/opm/alpha/template/semver.go
  46. +1 −1 cmd/opm/generate/cmd.go
  47. +1 −2 cmd/opm/index/add.go
  48. +0 −1 cmd/opm/index/delete.go
  49. +0 −1 cmd/opm/index/export.go
  50. +0 −1 cmd/opm/index/prune.go
  51. +0 −1 cmd/opm/index/prunestranded.go
  52. +7 −19 cmd/opm/internal/util/util.go
  53. +7 −4 cmd/opm/main.go
  54. +10 −1 cmd/opm/registry/serve.go
  55. +3 −1 cmd/opm/render/cmd.go
  56. +13 −10 cmd/opm/serve/serve.go
  57. +166 −135 go.mod
  58. +417 −294 go.sum
  59. +153 −0 hack/tools/check-go-version.sh
  60. +35 −0 internal/testutil/image/registry.go
  61. +1 −0 pkg/api/api_to_model.go
  62. +7 −7 pkg/api/conversion_test.go
  63. +13 −8 pkg/api/model_to_api.go
  64. +0 −1 pkg/cache/cache.go
  65. +13 −13 pkg/cache/cache_test.go
  66. +2 −2 pkg/cache/json.go
  67. +1 −1 pkg/cache/json_test.go
  68. +2 −0 pkg/cache/pkgs.go
  69. +6 −6 pkg/cache/pogrebv1.go
  70. +1 −1 pkg/cache/pogrebv1_test.go
  71. +1 −1 pkg/cache/tar.go
  72. +1 −2 pkg/cache/tar_test.go
  73. +4 −1 pkg/client/client.go
  74. +4 −0 pkg/client/client_test.go
  75. +1 −0 pkg/client/errors.go
  76. +6 −4 pkg/client/kubeclient.go
  77. +14 −9 pkg/configmap/configmap.go
  78. +27 −21 pkg/configmap/configmap_test.go
  79. +1 −1 pkg/configmap/configmap_writer.go
  80. +9 −6 pkg/containertools/containertool.go
  81. +16 −12 pkg/containertools/containertoolsfakes/fake_command_runner.go
  82. +4 −3 pkg/containertools/containertoolsfakes/fake_dockerfile_generator.go
  83. +4 −3 pkg/containertools/containertoolsfakes/fake_label_reader.go
  84. +5 −3 pkg/containertools/dockerfilegenerator.go
  85. +2 −2 pkg/containertools/dockerfilegenerator_test.go
  86. +1 −0 pkg/containertools/labelreader.go
  87. +4 −4 pkg/containertools/labelreader_test.go
  88. +13 −6 pkg/containertools/runner.go
  89. +14 −7 pkg/image/containerdregistry/options.go
  90. +25 −13 pkg/image/containerdregistry/registry.go
  91. +294 −0 pkg/image/containersimageregistry/registry.go
  92. +1 −1 pkg/image/execregistry/registry.go
  93. +1 −1 pkg/image/mock.go
  94. +1 −1 pkg/image/mock_test.go
  95. +146 −71 pkg/image/registry_test.go
  96. +1 −0 pkg/lib/bundle/build.go
  97. +1 −0 pkg/lib/bundle/errors.go
  98. +0 −1 pkg/lib/bundle/exporter.go
  99. +5 −4 pkg/lib/bundle/exporter_test.go
  100. +10 −2 pkg/lib/bundle/generate.go
  101. +13 −13 pkg/lib/bundle/generate_test.go
  102. +4 −3 pkg/lib/bundle/interpreter.go
  103. +4 −0 pkg/lib/bundle/supported_resources.go
  104. +3 −14 pkg/lib/bundle/utils_test.go
  105. +16 −2 pkg/lib/bundle/validate.go
  106. +1 −1 pkg/lib/bundle/validate_test.go
  107. +1 −0 pkg/lib/dns/nsswitch.go
  108. +1 −1 pkg/lib/dns/nsswitch_test.go
  109. +0 −215 pkg/lib/image/registry.go
  110. +12 −9 pkg/lib/indexer/indexer.go
  111. +3 −3 pkg/lib/indexer/indexer_test.go
  112. +4 −3 pkg/lib/indexer/indexerfakes/fake_index_adder.go
  113. +4 −3 pkg/lib/indexer/indexerfakes/fake_index_deleter.go
  114. +4 −3 pkg/lib/indexer/indexerfakes/fake_index_exporter.go
  115. +2 −1 pkg/lib/indexer/interfaces.go
  116. +5 −4 pkg/lib/registry/registry.go
  117. +20 −18 pkg/lib/registry/registry_test.go
  118. +4 −3 pkg/lib/registry/registryfakes/fake_registry_adder.go
  119. +4 −3 pkg/lib/registry/registryfakes/fake_registry_deleter.go
  120. +2 −0 pkg/lib/semver/semver.go
  121. +1 −1 pkg/lib/tmp/copy.go
  122. +3 −3 pkg/lib/unstructured/unstructured.go
  123. +7 −3 pkg/lib/validation/bundle.go
  124. +2 −2 pkg/lib/validation/bundle_test.go
  125. +9 −5 pkg/mirror/mirror_test.go
  126. +14 −14 pkg/mirror/options.go
  127. +7 −8 pkg/prettyunmarshaler/prettyunmarshaler.go
  128. +11 −4 pkg/prettyunmarshaler/prettyunmarshaler_test.go
  129. +15 −6 pkg/registry/bundle.go
  130. +7 −6 pkg/registry/bundle_test.go
  131. +4 −1 pkg/registry/bundlegraphloader.go
  132. +40 −41 pkg/registry/bundlegraphloader_test.go
  133. +1 −0 pkg/registry/channelupdateoptions.go
  134. +29 −31 pkg/registry/csv.go
  135. +77 −77 pkg/registry/csv_test.go
  136. +10 −12 pkg/registry/decode.go
  137. +7 −7 pkg/registry/decode_test.go
  138. +3 −3 pkg/registry/directoryGraphLoader.go
  139. +16 −16 pkg/registry/directoryGraphLoader_test.go
  140. +7 −6 pkg/registry/empty.go
  141. +1 −1 pkg/registry/graph.go
  142. +3 −3 pkg/registry/helper_test.go
  143. +2 −1 pkg/registry/imageinput.go
  144. +5 −1 pkg/registry/parse.go
  145. +2 −4 pkg/registry/parse_test.go
  146. +4 −0 pkg/registry/populator.go
  147. +57 −52 pkg/registry/populator_test.go
  148. +2 −1 pkg/registry/registry_to_model.go
  149. +3 −2 pkg/registry/registry_to_model_test.go
  150. +4 −3 pkg/registry/registryfakes/fake_graph_loader.go
  151. +9 −0 pkg/registry/types.go
  152. +5 −5 pkg/registry/types_test.go
  153. +25 −22 pkg/server/server_test.go
  154. +8 −8 pkg/sqlite/configmap.go
  155. +20 −16 pkg/sqlite/configmap_test.go
  156. +3 −1 pkg/sqlite/conversion.go
  157. +11 −11 pkg/sqlite/conversion_test.go
  158. +2 −0 pkg/sqlite/db_options.go
  159. +1 −0 pkg/sqlite/deprecate.go
  160. +1 −1 pkg/sqlite/deprecationmessage.go
  161. +5 −4 pkg/sqlite/directory.go
  162. +6 −5 pkg/sqlite/directory_test.go
  163. +13 −13 pkg/sqlite/graphloader_test.go
  164. +35 −26 pkg/sqlite/load.go
  165. +16 −17 pkg/sqlite/load_test.go
  166. +3 −1 pkg/sqlite/loadprocs.go
  167. +7 −7 pkg/sqlite/migrations/001_related_images.go
  168. +9 −9 pkg/sqlite/migrations/001_related_images_test.go
  169. +8 −5 pkg/sqlite/migrations/002_bundle_path_test.go
  170. +20 −20 pkg/sqlite/migrations/003_required_apis.go
  171. +10 −10 pkg/sqlite/migrations/003_required_apis_test.go
  172. +24 −18 pkg/sqlite/migrations/004_cascade_delete_test.go
  173. +2 −2 pkg/sqlite/migrations/005_version_skiprange.go
  174. +6 −6 pkg/sqlite/migrations/005_version_skiprange_test.go
  175. +2 −2 pkg/sqlite/migrations/006_associate_apis_with_bundle.go
  176. +21 −21 pkg/sqlite/migrations/006_associate_apis_with_bundle_test.go
  177. +8 −6 pkg/sqlite/migrations/007_replaces_skips.go
  178. +10 −10 pkg/sqlite/migrations/007_replaces_skips_test.go
  179. +7 −6 pkg/sqlite/migrations/008_dependencies_test.go
  180. +3 −2 pkg/sqlite/migrations/009_properties.go
  181. +7 −6 pkg/sqlite/migrations/009_properties_test.go
  182. +4 −4 pkg/sqlite/migrations/010_set_bundlepath_pkg_property.go
  183. +4 −3 pkg/sqlite/migrations/010_set_bundlepath_pkg_property_test.go
  184. +2 −2 pkg/sqlite/migrations/011_substitutes_for_test.go
  185. +1 −0 pkg/sqlite/migrations/012_deprecated.go
  186. +1 −1 pkg/sqlite/migrations/012_deprecated_test.go
  187. +2 −1 pkg/sqlite/migrations/013_rm_truncated_deprecations_test.go
  188. +1 −0 pkg/sqlite/migrations/migrations.go
  189. +10 −6 pkg/sqlite/migrator.go
  190. +14 −10 pkg/sqlite/migrator_test.go
  191. +47 −44 pkg/sqlite/query.go
  192. +1 −7 pkg/sqlite/query_sql_test.go
  193. +2 −1 pkg/sqlite/query_test.go
  194. +3 −4 pkg/sqlite/remove_test.go
  195. +4 −3 pkg/sqlite/sqlitefakes/fake_querier.go
  196. +12 −9 pkg/sqlite/sqlitefakes/fake_rowscanner.go
  197. +6 −7 pkg/sqlite/stranded_test.go
  198. +2 −2 registry.Dockerfile
  199. +1 −1 release/goreleaser.darwin.yaml
  200. +1 −1 release/goreleaser.linux.yaml
  201. +1 −1 release/goreleaser.opm.Dockerfile
  202. +1 −1 release/goreleaser.windows.yaml
  203. +1 −1 test/e2e/bundle_image_test.go
  204. +5 −2 test/e2e/ctx/ctx.go
  205. +1 −0 test/e2e/ctx/provisioner_kubeconfig.go
  206. +1 −0 test/e2e/e2e_suite_test.go
  207. +23 −13 test/e2e/opm_bundle_test.go
  208. +1 −1 test/e2e/opm_test.go
  209. +2 −2 upstream-builder.Dockerfile
  210. +3 −3 upstream-opm-builder.Dockerfile
12 changes: 9 additions & 3 deletions .bingo/Variables.mk
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,17 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"

GINKGO := $(GOBIN)/ginkgo-v2.20.2
GINKGO := $(GOBIN)/ginkgo-v2.22.2
$(GINKGO): $(BINGO_DIR)/ginkgo.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/ginkgo-v2.20.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.20.2 "github.com/onsi/ginkgo/v2/ginkgo"
@echo "(re)installing $(GOBIN)/ginkgo-v2.22.2"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=ginkgo.mod -o=$(GOBIN)/ginkgo-v2.22.2 "github.com/onsi/ginkgo/v2/ginkgo"

GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4
$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@echo "(re)installing $(GOBIN)/golangci-lint-v1.63.4"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.63.4 "github.com/golangci/golangci-lint/cmd/golangci-lint"

GORELEASER := $(GOBIN)/goreleaser-v1.26.2
$(GORELEASER): $(BINGO_DIR)/goreleaser.mod
2 changes: 1 addition & 1 deletion .bingo/ginkgo.mod
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.22.2

require github.com/onsi/ginkgo/v2 v2.20.2 // ginkgo
require github.com/onsi/ginkgo/v2 v2.22.2 // ginkgo
6 changes: 6 additions & 0 deletions .bingo/ginkgo.sum
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -37,6 +39,8 @@ github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
@@ -79,6 +83,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e h1:4nW4NLDYnU28ojHaHO8OVxF
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5 changes: 5 additions & 0 deletions .bingo/golangci-lint.mod
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.22.5

require github.com/golangci/golangci-lint v1.63.4 // cmd/golangci-lint
Loading