diff --git a/commitchecker.yaml b/commitchecker.yaml index 2b9d8ce2c..6f14511b9 100644 --- a/commitchecker.yaml +++ b/commitchecker.yaml @@ -1,4 +1,4 @@ -expectedMergeBase: ef06f407cf64c3f337f90e1e6e7721a33b38f8f4 +expectedMergeBase: d51dfe66ed779b4bab8296f6b5fb360800e847cf upstreamBranch: main upstreamOrg: operator-framework upstreamRepo: operator-controller diff --git a/docs/requirements.txt b/docs/requirements.txt index 276836142..083bd4ae4 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -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 @@ -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 diff --git a/go.mod b/go.mod index ebd9db5d1..1adb9152a 100644 --- a/go.mod +++ b/go.mod @@ -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 @@ -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 diff --git a/go.sum b/go.sum index 2efacd5cb..a561339fe 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/vendor/modules.txt b/vendor/modules.txt index 32b17a4fb..74eeb5b18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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 @@ -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 @@ -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