Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #182

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 26 commits into from
Oct 30, 2024
Merged

NO-ISSUE: Synchronize From Upstream Repositories #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5f8f202
:seedling: Bump pymdown-extensions from 10.11.2 to 10.12 (#1415)
dependabot[bot] Oct 29, 2024
098afa0
Merge branch 'main' into synchronize
Oct 30, 2024
9b7a170
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
dbd2c86
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
ee37036
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 16, 2023
1bc6d49
UPSTREAM: <carry>: update owners
Mar 27, 2024
fd53008
UPSTREAM: <carry>: Add pointer to tooling README
bentito Apr 1, 2024
8669aa5
UPSTREAM: <carry>: Disable Validating Admission Policy APIs downstream
Apr 26, 2024
f29b7b3
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Mar 27, 2024
61d1565
UPSTREAM: <carry>: Enable Validating Admission Policy APIs downstream
Apr 30, 2024
be83a75
UPSTREAM: <carry>: manifests: set required-scc for openshift workloads
liouk May 2, 2024
68a6bce
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
May 25, 2024
adf5cca
UPSTREAM: <carry>: add everettraven to approvers+reviewers
everettraven Jun 24, 2024
8cbd51b
UPSTREAM: <carry>: add openshift kustomize overlay
everettraven Jul 9, 2024
8ce5912
UPSTREAM: <carry>: Add tmshort to approvers
tmshort Sep 11, 2024
a6dd74f
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Sep 18, 2024
b027483
UPSTREAM: <carry>: Properly copy and call kustomize
tmshort Sep 23, 2024
bafa145
UPSTREAM: <carry>: manifests: add hostPath mount for /etc/containers
joelanford Sep 20, 2024
93758f6
UPSTREAM: <carry>: Add test-e2e target for downstream Makefile to be …
dtfranz Sep 26, 2024
c46e41a
UPSTREAM: <carry>: Add downstream verify makefile target
dtfranz Sep 27, 2024
594d5ea
UPSTREAM: <carry>: openshift: template log verbosity to be managed by…
joelanford Sep 28, 2024
d0a224b
UPSTREAM: <carry>: Add global-pull-secret flag
Oct 8, 2024
d54be2f
UPSTREAM: <drop>: go mod vendor
Oct 30, 2024
5ba595a
UPSTREAM: <drop>: remove upstream GitHub configuration
Oct 30, 2024
1fdb15e
UPSTREAM: <drop>: configure the commit-checker
Oct 30, 2024
6164cf8
UPSTREAM: <drop>: rewrite go mod
Oct 30, 2024
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: 5713012c5522fe328906555cb0f8f3bf894642d6
expectedMergeBase: 5f8f2026b61f218e03a3ce7836d7fba489a235a6
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,4 +252,4 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241028225342-dc343117ebb2
replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241029145152-5850bc1dfd54
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eTNDkNRNV5lZvUbVM9Nop0lBcljSnA8rZX6yQPZ0ZnU=
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o=
github.com/openshift/operator-framework-catalogd v0.0.0-20241028225342-dc343117ebb2 h1:fDjX7yrGhruUlSLVrUojPrQQT2fL9agvZoEvAbM8IOc=
github.com/openshift/operator-framework-catalogd v0.0.0-20241028225342-dc343117ebb2/go.mod h1:anZurjcFMBvbkuyqlJ98v9z+yjniPKqmhlyitk9DuBQ=
github.com/openshift/operator-framework-catalogd v0.0.0-20241029145152-5850bc1dfd54 h1:8jGe/HY7AIuvgvsR2gZggZrPikt5E/v2QiEzP1EqwF0=
github.com/openshift/operator-framework-catalogd v0.0.0-20241029145152-5850bc1dfd54/go.mod h1:anZurjcFMBvbkuyqlJ98v9z+yjniPKqmhlyitk9DuBQ=
github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI=
github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM=
github.com/operator-framework/helm-operator-plugins v0.7.0 h1:YmtIWFc9BaNaDc5mk/dkG0P2BqPZOqpDvjWih5Fczuk=
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ paginate==0.5.7
pathspec==0.12.1
platformdirs==4.3.6
Pygments==2.18.0
pymdown-extensions==10.11.2
pymdown-extensions==10.12
pyquery==2.0.1
python-dateutil==2.9.0.post0
PyYAML==6.0.2
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,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.35.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241028225342-dc343117ebb2
# github.com/operator-framework/catalogd v0.35.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241029145152-5850bc1dfd54
## explicit; go 1.22.5
github.com/operator-framework/catalogd/api/core/v1alpha1
# github.com/operator-framework/helm-operator-plugins v0.7.0
Expand Down Expand Up @@ -2104,4 +2104,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
sigs.k8s.io/yaml/goyaml.v3
# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241028225342-dc343117ebb2
# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241029145152-5850bc1dfd54