Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #282

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 8 commits into from
Mar 3, 2025
Merged

NO-ISSUE: Synchronize From Upstream Repositories #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e2f28c
util/image: unset PAXRecords and Xattrs when applying files (#1823)
joelanford Feb 28, 2025
01755a8
Cleanup catalogd remnants in unit test dirs (#1822)
OchiengEd Feb 28, 2025
4ebd150
Merge branch 'main' into synchronize
Mar 1, 2025
98ab61b
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
9076f10
UPSTREAM: <carry>: Fix catalogd.Dockerfile to use new paths
tmshort Feb 26, 2025
c38252c
UPSTREAM: <drop>: go mod vendor
Mar 1, 2025
f5af9a9
UPSTREAM: <drop>: remove upstream GitHub configuration
Mar 1, 2025
3deaa60
UPSTREAM: <drop>: configure the commit-checker
Mar 1, 2025
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ test-ext-dev-e2e: $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run extension creat
go test -count=1 -v ./test/extension-developer-e2e/...

ENVTEST_VERSION := $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/')
UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/ | grep -v /catalogd/test/)
UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/)
COVERAGE_UNIT_DIR := $(ROOT_DIR)/coverage/unit

.PHONY: envtest-k8s-bins #HELP Uses setup-envtest to download and install the binaries required to run ENVTEST-test based locally at the project/bin directory.
Expand Down
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: a6de9f94e085989a086459f2b5325a5cd27424b0
expectedMergeBase: 01755a80c407b4452e64d816e18e00c189162c4b
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller