Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 12, 2023
Merged

NO-ISSUE: Synchronize From Upstream Repositories #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b6a697e
:seedling: Bump actions/setup-go from 4 to 5 (#565)
dependabot[bot] Dec 11, 2023
4d14baf
Merge branch 'main' into synchronize
Dec 12, 2023
c880701
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
2ef47e0
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
a856451
UPSTREAM: <drop>: go mod vendor
Dec 12, 2023
1a00dda
UPSTREAM: <drop>: generate manifests
Dec 12, 2023
3789859
UPSTREAM: <drop>: remove upstream GitHub configuration
Dec 12, 2023
3a9fda6
UPSTREAM: <drop>: configure the commit-checker
Dec 12, 2023
b19a023
UPSTREAM: <drop>: rewrite go mod
Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion commitchecker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
expectedMergeBase: af730cf9914ffdf7e490edcce7cf666eee300b5f
expectedMergeBase: b6a697ec6e41981708ceb0a3e6d6dc8d0b72cf88
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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