Skip to content

NO-ISSUE: Synchronize From Upstream Repositories #70

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 15 commits into from
Feb 2, 2024
Merged

NO-ISSUE: Synchronize From Upstream Repositories #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9c5f968
:seedling: Bump github.com/opencontainers/runc from 1.1.10 to 1.1.12 …
dependabot[bot] Feb 1, 2024
d3fb348
:seedling: Bump markdown from 3.4.4 to 3.5.2 (#589)
dependabot[bot] Feb 1, 2024
e84a5c6
:seedling: Bump mkdocs-material-extensions from 1.1.1 to 1.3.1 (#588)
dependabot[bot] Feb 1, 2024
9e2cf32
:seedling: Bump pathspec from 0.11.2 to 0.12.1 (#587)
dependabot[bot] Feb 1, 2024
3123bf0
:seedling: Bump soupsieve from 2.4.1 to 2.5 (#586)
dependabot[bot] Feb 1, 2024
d51dfe6
:seedling: Bump lxml from 4.9.3 to 5.1.0 (#585)
dependabot[bot] Feb 1, 2024
b7985fb
Merge branch 'main' into synchronize
Feb 2, 2024
dff24f5
UPSTREAM: <carry>: Add OpenShift specific files
dtfranz Oct 26, 2023
99e0528
UPSTREAM: <carry>: Drop commitchecker
awgreene Nov 3, 2023
025f6fd
UPSTREAM: <carry>: Updating ose-olm-operator-controller-container ima…
Dec 16, 2023
300fa10
UPSTREAM: <drop>: go mod vendor
Feb 2, 2024
28b3f15
UPSTREAM: <drop>: generate manifests
Feb 2, 2024
c7013c9
UPSTREAM: <drop>: remove upstream GitHub configuration
Feb 2, 2024
8e45aa8
UPSTREAM: <drop>: configure the commit-checker
Feb 2, 2024
90cc9c0
UPSTREAM: <drop>: rewrite go mod
Feb 2, 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: ef06f407cf64c3f337f90e1e6e7721a33b38f8f4
expectedMergeBase: d51dfe66ed779b4bab8296f6b5fb360800e847cf
upstreamBranch: main
upstreamOrg: operator-framework
upstreamRepo: operator-controller
10 changes: 5 additions & 5 deletions docs/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ cssselect==1.2.0
ghp-import==2.1.0
idna==3.4
Jinja2==3.1.3
lxml==4.9.3
Markdown==3.4.4
lxml==5.1.0
Markdown==3.5.2
markdown2==2.4.10
MarkupSafe==2.1.3
mergedeep==1.3.4
mkdocs==1.5.2
mkdocs-material==9.2.3
mkdocs-material-extensions==1.1.1
mkdocs-material-extensions==1.3.1
packaging==23.1
paginate==0.5.6
pathspec==0.11.2
pathspec==0.12.1
platformdirs==3.10.0
Pygments==2.16.1
pymdown-extensions==10.1
Expand All @@ -30,6 +30,6 @@ readtime==3.0.0
regex==2023.8.8
requests==2.31.0
six==1.16.0
soupsieve==2.4.1
soupsieve==2.5
urllib3==2.0.7
watchdog==3.0.0
4 changes: 3 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ require (
github.com/onsi/gomega v1.31.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
github.com/opencontainers/runc v1.1.10 // indirect
github.com/opencontainers/runc v1.1.12 // indirect
github.com/opencontainers/runtime-spec v1.1.0 // indirect
github.com/operator-framework/api v0.21.0 // indirect
github.com/otiai10/copy v1.14.0 // indirect
Expand Down Expand Up @@ -157,4 +157,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-20240201225114-ee0bb5772fa5

replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20240118020115-ae2f3d222602
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 @@ -251,20 +251,20 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40=
github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
github.com/opencontainers/runc v1.1.12/go.mod h1:S+lQwSfncpBha7XTy/5lBwWgm5+y5Ma/O44Ekby9FK8=
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-20240118020115-ae2f3d222602 h1:9yIIiIGad2iPxJf5wAqqhHvHMK4n9BoLyjj/3NJmKUc=
github.com/openshift/operator-framework-catalogd v0.0.0-20240118020115-ae2f3d222602/go.mod h1:AHz6B7NxC7cywF6P3XclmCim1bs0y0g2+LdycdIGAmE=
github.com/openshift/operator-framework-rukpak v0.0.0-20240201225114-ee0bb5772fa5 h1:83pB2Y/x9MQ9i4xkL4Mx00I0zmRuQFoN0bWnlR9xKUs=
github.com/openshift/operator-framework-rukpak v0.0.0-20240201225114-ee0bb5772fa5/go.mod h1:t4KwwnewnHeyLhZlk4Dl3eudQQ3GlDftoio1F7QQuiA=
github.com/operator-framework/api v0.21.0 h1:89LhqGTLskxpPR4siEaorkF9PY3KLI51S5mFxP6q1G8=
github.com/operator-framework/api v0.21.0/go.mod h1:3tsDLxXChMY1KgxO5v1CZQogHNQCIMy14YXkXqA5lT4=
github.com/operator-framework/deppy v0.3.0 h1:W8wpF0ehcTAdH2WfMyqMPI5Ja0Qv8M5FMO5cXgJvEQ8=
github.com/operator-framework/deppy v0.3.0/go.mod h1:EHDxZz8fKGvuymCng3G/Ou7wuX14GaLr0cmf2u29Oog=
github.com/operator-framework/operator-registry v1.36.0 h1:Xp+0bIOboP78qPGv9odh4Ird2LjsTldrztVRGsCkuxI=
github.com/operator-framework/operator-registry v1.36.0/go.mod h1:+wioYPVlq1htVtpR5E1648A7ok1zh2Vn6E53ur3LnWs=
github.com/operator-framework/rukpak v0.17.0 h1:jJXjbpk9A3GvjoYYRaR7QmM35v61cjZfFe0h6zzB+Pc=
github.com/operator-framework/rukpak v0.17.0/go.mod h1:t4KwwnewnHeyLhZlk4Dl3eudQQ3GlDftoio1F7QQuiA=
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
Expand Down
5 changes: 3 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ github.com/opencontainers/go-digest
## explicit; go 1.18
github.com/opencontainers/image-spec/specs-go
github.com/opencontainers/image-spec/specs-go/v1
# github.com/opencontainers/runc v1.1.10
# github.com/opencontainers/runc v1.1.12
## explicit; go 1.17
github.com/opencontainers/runc/libcontainer/user
# github.com/opencontainers/runtime-spec v1.1.0
Expand Down Expand Up @@ -479,7 +479,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.17.0
# github.com/operator-framework/rukpak v0.17.0 => github.com/openshift/operator-framework-rukpak v0.0.0-20240201225114-ee0bb5772fa5
## explicit; go 1.20
github.com/operator-framework/rukpak/api/v1alpha2
# github.com/otiai10/copy v1.14.0
Expand Down Expand Up @@ -1253,4 +1253,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-20240201225114-ee0bb5772fa5
# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20240118020115-ae2f3d222602