Merge pull request #209 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: e51c0c205ec09e51691579cacbedc3ac53e4bd54
+expectedMergeBase: d50385e73b8d2bc2b98e0ec4cc614e221b647a69
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

go.mod

@@ -249,4 +249,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-20241129093618-9e3abf23290c
+replace github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094

go.sum

@@ -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-20241129093618-9e3abf23290c h1:DOpg3SFDYubkUjJ1viCsMnAN4U4rB52ngWbPEpjgfE4=
-github.com/openshift/operator-framework-catalogd v0.0.0-20241129093618-9e3abf23290c/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
+github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094 h1:0nwVMSQ7FOHTrOTNT6JnkTYD9qsPIstQHorCKVMgEBg=
+github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
 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=

requirements.txt

@@ -14,7 +14,7 @@ markdown2==2.5.1
 MarkupSafe==3.0.2
 mergedeep==1.3.4
 mkdocs==1.6.1
-mkdocs-material==9.5.47
+mkdocs-material==9.5.48
 mkdocs-material-extensions==1.3.1
 packaging==24.2
 paginate==0.5.7
@@ -29,7 +29,7 @@ pyyaml_env_tag==0.1
 readtime==3.0.0
 regex==2024.11.6
 requests==2.32.3
-six==1.16.0
+six==1.17.0
 soupsieve==2.6
 urllib3==2.2.3
 watchdog==6.0.0

vendor/modules.txt

@@ -780,7 +780,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 v1.0.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241129093618-9e3abf23290c
+# github.com/operator-framework/catalogd v1.0.0 => github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094
 ## explicit; go 1.22.5
 github.com/operator-framework/catalogd/api/v1
 # github.com/operator-framework/helm-operator-plugins v0.7.0
@@ -2060,4 +2060,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-20241129093618-9e3abf23290c
+# github.com/operator-framework/catalogd => github.com/openshift/operator-framework-catalogd v0.0.0-20241210193825-501e68b2d094