diff --git a/commitchecker.yaml b/commitchecker.yaml index 14c54a51c..29622bce7 100644 --- a/commitchecker.yaml +++ b/commitchecker.yaml @@ -1,4 +1,4 @@ -expectedMergeBase: af730cf9914ffdf7e490edcce7cf666eee300b5f +expectedMergeBase: b6a697ec6e41981708ceb0a3e6d6dc8d0b72cf88 upstreamBranch: main upstreamOrg: operator-framework upstreamRepo: operator-controller diff --git a/go.mod b/go.mod index ba1ab1b5e..52cdd7766 100644 --- a/go.mod +++ b/go.mod @@ -157,6 +157,6 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20231128134914-3fc5f414256c +replace github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20231211151425-f3d88a61bc0c -replace github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20231201015106-1369884b5636 +replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20231211163346-3b4f512d12f9 diff --git a/go.sum b/go.sum index 6e05d00a7..76972693d 100644 --- a/go.sum +++ b/go.sum @@ -269,10 +269,10 @@ github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalN github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/openshift/operator-framework-catalogd v0.0.0-20231128134914-3fc5f414256c h1:pwjwu6npy8Y6Bq9k8BKi00vgDEOaAg1z7ene0uBX1sU= -github.com/openshift/operator-framework-catalogd v0.0.0-20231128134914-3fc5f414256c/go.mod h1:xIeR5f/Spr5rHnLp0yOi0AYetWcHvBAx9n+K3S/va2A= -github.com/openshift/operator-framework-rukpak v0.0.0-20231201015106-1369884b5636 h1:NDCYurrql3ADjpfBkgmlEz+i806bWyb4w0wI00TZlkE= -github.com/openshift/operator-framework-rukpak v0.0.0-20231201015106-1369884b5636/go.mod h1:k3Nbp5eGqTI+QvXgPuOWOSV24AJ6waPDPzD+AH5OyDA= +github.com/openshift/operator-framework-catalogd v0.0.0-20231211163346-3b4f512d12f9 h1:lwt6mSxJX66bZYVqOph96RGsE7YvKwdxP+DwIxmHTQ8= +github.com/openshift/operator-framework-catalogd v0.0.0-20231211163346-3b4f512d12f9/go.mod h1:xIeR5f/Spr5rHnLp0yOi0AYetWcHvBAx9n+K3S/va2A= +github.com/openshift/operator-framework-rukpak v0.0.0-20231211151425-f3d88a61bc0c h1:PtGfRpaT2p5UhMoIqhg/komsukjFpZKVfGie0BXaBLI= +github.com/openshift/operator-framework-rukpak v0.0.0-20231211151425-f3d88a61bc0c/go.mod h1:k3Nbp5eGqTI+QvXgPuOWOSV24AJ6waPDPzD+AH5OyDA= github.com/operator-framework/api v0.19.0 h1:QU1CTJU+CufoeneA5rsNlP/uP96s8vDHWUYDFZTauzA= github.com/operator-framework/api v0.19.0/go.mod h1:SCCslqke6AVOJ5JM+NqNE1CHuAgJLScsL66pnPaSMXs= github.com/operator-framework/deppy v0.2.0 h1:BYdCAKli+ofFdnHPkpUKI9DygHL2A32CaDbEJk4jz6U= diff --git a/vendor/modules.txt b/vendor/modules.txt index f4773d788..4818fba31 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -455,7 +455,7 @@ github.com/operator-framework/api/pkg/validation github.com/operator-framework/api/pkg/validation/errors github.com/operator-framework/api/pkg/validation/interfaces github.com/operator-framework/api/pkg/validation/internal -# github.com/operator-framework/catalogd v0.10.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20231128134914-3fc5f414256c +# github.com/operator-framework/catalogd v0.10.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20231211163346-3b4f512d12f9 ## explicit; go 1.20 github.com/operator-framework/catalogd/api/core/v1alpha1 # github.com/operator-framework/deppy v0.2.0 @@ -483,7 +483,7 @@ github.com/operator-framework/operator-registry/pkg/prettyunmarshaler github.com/operator-framework/operator-registry/pkg/registry github.com/operator-framework/operator-registry/pkg/sqlite github.com/operator-framework/operator-registry/pkg/sqlite/migrations -# github.com/operator-framework/rukpak v0.16.0 => github.com/openshift/operator-framework-rukpak v0.0.0-20231201015106-1369884b5636 +# github.com/operator-framework/rukpak v0.16.0 => github.com/openshift/operator-framework-rukpak v0.0.0-20231211151425-f3d88a61bc0c ## explicit; go 1.20 github.com/operator-framework/rukpak/api/v1alpha1 # github.com/otiai10/copy v1.2.0 @@ -1248,5 +1248,5 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20231128134914-3fc5f414256c -# github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20231201015106-1369884b5636 +# github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20231211151425-f3d88a61bc0c +# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20231211163346-3b4f512d12f9