Skip to content
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

Jump to bottom

NO-ISSUE: Synchronize From Upstream Repositories #81

Merged
merged 10 commits into from
Mar 12, 2024
Merged

NO-ISSUE: Synchronize From Upstream Repositories #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6865e1d
:seedling: Bump actions/add-to-project from 0.5.0 to 0.6.0 (#685)
dependabot[bot] Mar 11, 2024
36213ac
Merge branch 'main' into synchronize
Mar 12, 2024
ed0e413
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
26e2321
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
8986268
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 16, 2023
936a6c7
UPSTREAM: <drop>: go mod vendor
Mar 12, 2024
7d3f9dd
UPSTREAM: <drop>: generate manifests
Mar 12, 2024
f57ff37
UPSTREAM: <drop>: remove upstream GitHub configuration
Mar 12, 2024
7441e5f
UPSTREAM: <drop>: configure the commit-checker
Mar 12, 2024
aa6c21e
UPSTREAM: <drop>: rewrite go mod
Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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: a817d9d4dd181146ec3539c5c852306a2ac66d4a
expectedMergeBase: 6865e1da4014a05d3a2cea0fa63060659f64d108
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 @@ -161,6 +161,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

replace github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1

replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20240221182512-9666df2685f2

replace github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1267,5 +1267,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
# github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1
# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20240221182512-9666df2685f2
# github.com/operator-framework/rukpak => github.com/openshift/operator-framework-rukpak v0.0.0-20240308020514-7589a1f04ea1