Skip to content

Fix snyk vuln in golang.org/x/net/http2#2256

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
2uasimojo:cve-x-net-http2
Apr 8, 2024
Merged

Fix snyk vuln in golang.org/x/net/http2#2256
openshift-merge-bot[bot] merged 1 commit intoopenshift:masterfrom
2uasimojo:cve-x-net-http2

Conversation

@2uasimojo
Copy link
Member

✗ High severity vulnerability found in golang.org/x/net/http2
Description: Allocation of Resources Without Limits or Throttling
Info: https://security.snyk.io/vuln/SNYK-GOLANG-GOLANGORGXNETHTTP2-6531285
Introduced through: k8s.io/apimachinery/pkg/util/net@0.29.2, k8s.io/client-go/rest@0.29.1, k8s.io/client-go/tools/cache@0.29.1, k8s.io/apimachinery/pkg/watch@0.29.2, github.com/openshift/generic-admission-server/pkg/cmd@#8dcc3c9b298f, k8s.io/client-go/discovery/cached/disk@0.29.1, k8s.io/client-go/plugin/pkg/client/auth/gcp@0.29.1, k8s.io/client-go/discovery@0.29.1, k8s.io/client-go/dynamic@0.29.1, k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1@0.29.1, k8s.io/client-go/tools/record@0.29.1, k8s.io/client-go/tools/leaderelection/resourcelock@0.29.1, k8s.io/client-go/tools/clientcmd@0.29.1, google.golang.org/api/cloudresourcemanager/v1@0.167.0, google.golang.org/api/compute/v1@0.167.0, google.golang.org/api/dns/v1@0.167.0, google.golang.org/api/serviceusage/v1@0.167.0, k8s.io/client-go/informers@0.29.1, k8s.io/client-go/listers/core/v1@0.29.1, k8s.io/client-go/tools/watch@0.29.1, k8s.io/apimachinery/pkg/apis/meta/v1@0.29.2, k8s.io/cli-runtime/pkg/printers@0.29.2, google.golang.org/api/option@0.167.0, k8s.io/cli-runtime/pkg/genericclioptions@0.29.2, k8s.io/client-go/restmapper@0.29.1, k8s.io/kubectl/pkg/util/openapi@0.29.1, k8s.io/client-go/tools/leaderelection@0.29.1, sigs.k8s.io/controller-runtime/pkg/client/config@0.17.2, github.com/openshift/installer/pkg/asset/machines/gcp@#304af6735c65, github.com/openshift/installer/pkg/destroy/gcp@#304af6735c65, github.com/heptio/velero/pkg/apis/velero/v1@1.0.0, k8s.io/api/rbac/v1@0.29.2, github.com/openshift/api/authorization/v1@#ce10821dc999, github.com/openshift/api/image/v1@#ce10821dc999, github.com/openshift/api/machine/v1alpha1@#ce10821dc999, github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig@#d141fa11b2e9, k8s.io/api/admission/v1beta1@0.29.2, k8s.io/apimachinery/pkg/apis/meta/v1/unstructured@0.29.2, k8s.io/api/admissionregistration/v1@0.29.2, k8s.io/api/batch/v1@0.29.2, k8s.io/api/certificates/v1@0.29.2, github.com/openshift/hive/apis/hivecontracts/v1alpha1@0.0.0, github.com/openshift/hive/apis/hiveinternal/v1alpha1@0.0.0, github.com/openshift/installer/pkg/asset/machines/ibmcloud@#304af6735c65, github.com/openshift/installer/pkg/asset/machines/ovirt@#304af6735c65, k8s.io/cluster-registry/pkg/apis/clusterregistry/v1alpha1@0.0.6, github.com/openshift/api/apps/v1@#ce10821dc999, github.com/openshift/api/route/v1@#ce10821dc999, k8s.io/api/apps/v1@0.29.2, github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1@0.50.0, k8s.io/api/core/v1@0.29.2, k8s.io/apimachinery/pkg/api/meta@0.29.2, github.com/openshift/custom-resource-status/conditions/v1@#f2fdb4999d87, github.com/openshift/hive/apis/hive/v1/metricsconfig@0.0.0, github.com/openshift/installer/pkg/types@#304af6735c65, github.com/openshift/library-go/pkg/controller@#126b47137408, k8s.io/apimachinery/pkg/api/errors@0.29.2, k8s.io/apimachinery/pkg/apis/meta/v1/validation@0.29.2, k8s.io/apimachinery/pkg/api/equality@0.29.2, k8s.io/cli-runtime/pkg/resource@0.29.2, sigs.k8s.io/controller-runtime/pkg/client/apiutil@0.17.2, k8s.io/kubectl/pkg/polymorphichelpers@0.29.1, sigs.k8s.io/controller-runtime/pkg/metrics@0.17.2, github.com/openshift/hive/apis/hive/v1@0.0.0, github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1@#e3f2850dd519, github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1@#fe524080b551, github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1beta1@#fe524080b551, sigs.k8s.io/controller-runtime/pkg/webhook/admission@0.17.2, github.com/openshift/library-go/pkg/operator/resource/resourcemerge@#126b47137408, github.com/openshift/library-go/pkg/verify@#126b47137408, github.com/openshift/hive/apis@0.0.0, github.com/openshift/library-go/pkg/operator/resource/resourceread@#126b47137408, k8s.io/kube-aggregator/pkg/apis/apiregistration/v1@0.29.1, github.com/openshift/api/config/v1@#ce10821dc999, github.com/openshift/hive/apis/hive/v1/aws@0.0.0, github.com/openshift/hive/apis/hive/v1/azure@0.0.0, github.com/openshift/hive/apis/hive/v1/gcp@0.0.0, github.com/openshift/hive/apis/hive/v1/ibmcloud@0.0.0, github.com/openshift/hive/apis/hive/v1/openstack@0.0.0, github.com/openshift/hive/apis/hive/v1/ovirt@0.0.0, github.com/openshift/hive/apis/hive/v1/vsphere@0.0.0, github.com/openshift/api/machine/v1beta1@#ce10821dc999, github.com/openshift/installer/pkg/destroy/azure@#304af6735c65, github.com/openshift/installer/pkg/destroy/vsphere@#304af6735c65, github.com/openshift/installer/pkg/destroy/providers@#304af6735c65, github.com/openshift/installer/pkg/destroy/ovirt@#304af6735c65, k8s.io/client-go/util/retry@0.29.1, k8s.io/apimachinery/pkg/api/validation@0.29.2, k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1@0.29.2, sigs.k8s.io/controller-runtime/pkg/client@0.17.2, sigs.k8s.io/controller-runtime/pkg/cache@0.17.2, sigs.k8s.io/controller-runtime/pkg/controller/controllerutil@0.17.2, k8s.io/kubectl/pkg/cmd/apply@0.29.1, k8s.io/kubectl/pkg/cmd/util@0.29.1, sigs.k8s.io/controller-runtime/pkg/metrics/server@0.17.2, github.com/openshift/cluster-api-provider-ovirt/pkg/apis@#e3f2850dd519, sigs.k8s.io/controller-runtime/pkg/config@0.17.2, k8s.io/apimachinery/pkg/runtime/serializer@0.29.2, github.com/openshift/api/operator/v1@#ce10821dc999, github.com/openshift/installer/pkg/types/aws@#304af6735c65, github.com/openshift/installer/pkg/types/ibmcloud@#304af6735c65, github.com/openshift/installer/pkg/types/openstack@#304af6735c65, github.com/openshift/installer/pkg/types/ovirt@#304af6735c65, github.com/openshift/installer/pkg/types/vsphere@#304af6735c65, github.com/openshift/installer/pkg/destroy/aws@#304af6735c65, github.com/openshift/installer/pkg/destroy/ibmcloud@#304af6735c65, k8s.io/kubectl/pkg/cmd/delete@0.29.1, github.com/openshift/installer/pkg/asset/machines/aws@#304af6735c65, github.com/openshift/installer/pkg/asset/machines/azure@#304af6735c65, github.com/openshift/installer/pkg/asset/machines/openstack@#304af6735c65, sigs.k8s.io/controller-runtime/pkg/client/fake@0.17.2, k8s.io/kubectl/pkg/cmd/patch@0.29.1, sigs.k8s.io/controller-runtime/pkg/reconcile@0.17.2, sigs.k8s.io/controller-runtime/pkg/event@0.17.2, github.com/openshift/machine-api-operator/pkg/controller/vsphere@#2cc7fcf262f3, k8s.io/client-go/kubernetes@0.29.1, sigs.k8s.io/controller-runtime/pkg/webhook@0.17.2, github.com/openshift/installer/pkg/asset/machines/vsphere@#304af6735c65, github.com/openshift/installer/pkg/asset/installconfig/aws@#304af6735c65, github.com/openshift/installer/pkg/destroy/openstack@#304af6735c65, sigs.k8s.io/controller-runtime/pkg/predicate@0.17.2, github.com/openshift/machine-api-provider-gcp/pkg/apis/gcpprovider/v1beta1@#6096cc86f3ba, sigs.k8s.io/controller-runtime/pkg/handler@0.17.2, sigs.k8s.io/controller-runtime/pkg/manager@0.17.2, github.com/openshift/library-go/pkg/manifest@#126b47137408, github.com/openshift/library-go/pkg/verify/store/sigstore@#126b47137408, sigs.k8s.io/controller-runtime/pkg/controller@0.17.2, sigs.k8s.io/controller-runtime/pkg/source@0.17.2
From: k8s.io/apimachinery/pkg/util/net@0.29.2 > golang.org/x/net/http2@0.22.0
From: k8s.io/client-go/rest@0.29.1 > golang.org/x/net/http2@0.22.0
From: k8s.io/client-go/tools/cache@0.29.1 > k8s.io/apimachinery/pkg/util/net@0.29.2 > golang.org/x/net/http2@0.22.0
and 211 more...
Fixed in: 0.23.0

✗ High severity vulnerability found in golang.org/x/net/http2
  Description: Allocation of Resources Without Limits or Throttling
  Info: https://security.snyk.io/vuln/SNYK-GOLANG-GOLANGORGXNETHTTP2-6531285
  Introduced through: k8s.io/apimachinery/pkg/util/net@0.29.2, k8s.io/client-go/rest@0.29.1, k8s.io/client-go/tools/cache@0.29.1, k8s.io/apimachinery/pkg/watch@0.29.2, github.com/openshift/generic-admission-server/pkg/cmd@#8dcc3c9b298f, k8s.io/client-go/discovery/cached/disk@0.29.1, k8s.io/client-go/plugin/pkg/client/auth/gcp@0.29.1, k8s.io/client-go/discovery@0.29.1, k8s.io/client-go/dynamic@0.29.1, k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/typed/apiregistration/v1@0.29.1, k8s.io/client-go/tools/record@0.29.1, k8s.io/client-go/tools/leaderelection/resourcelock@0.29.1, k8s.io/client-go/tools/clientcmd@0.29.1, google.golang.org/api/cloudresourcemanager/v1@0.167.0, google.golang.org/api/compute/v1@0.167.0, google.golang.org/api/dns/v1@0.167.0, google.golang.org/api/serviceusage/v1@0.167.0, k8s.io/client-go/informers@0.29.1, k8s.io/client-go/listers/core/v1@0.29.1, k8s.io/client-go/tools/watch@0.29.1, k8s.io/apimachinery/pkg/apis/meta/v1@0.29.2, k8s.io/cli-runtime/pkg/printers@0.29.2, google.golang.org/api/option@0.167.0, k8s.io/cli-runtime/pkg/genericclioptions@0.29.2, k8s.io/client-go/restmapper@0.29.1, k8s.io/kubectl/pkg/util/openapi@0.29.1, k8s.io/client-go/tools/leaderelection@0.29.1, sigs.k8s.io/controller-runtime/pkg/client/config@0.17.2, github.com/openshift/installer/pkg/asset/machines/gcp@#304af6735c65, github.com/openshift/installer/pkg/destroy/gcp@#304af6735c65, github.com/heptio/velero/pkg/apis/velero/v1@1.0.0, k8s.io/api/rbac/v1@0.29.2, github.com/openshift/api/authorization/v1@#ce10821dc999, github.com/openshift/api/image/v1@#ce10821dc999, github.com/openshift/api/machine/v1alpha1@#ce10821dc999, github.com/openshift/cluster-control-plane-machine-set-operator/pkg/machineproviders/providers/openshift/machine/v1beta1/providerconfig@#d141fa11b2e9, k8s.io/api/admission/v1beta1@0.29.2, k8s.io/apimachinery/pkg/apis/meta/v1/unstructured@0.29.2, k8s.io/api/admissionregistration/v1@0.29.2, k8s.io/api/batch/v1@0.29.2, k8s.io/api/certificates/v1@0.29.2, github.com/openshift/hive/apis/hivecontracts/v1alpha1@0.0.0, github.com/openshift/hive/apis/hiveinternal/v1alpha1@0.0.0, github.com/openshift/installer/pkg/asset/machines/ibmcloud@#304af6735c65, github.com/openshift/installer/pkg/asset/machines/ovirt@#304af6735c65, k8s.io/cluster-registry/pkg/apis/clusterregistry/v1alpha1@0.0.6, github.com/openshift/api/apps/v1@#ce10821dc999, github.com/openshift/api/route/v1@#ce10821dc999, k8s.io/api/apps/v1@0.29.2, github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1@0.50.0, k8s.io/api/core/v1@0.29.2, k8s.io/apimachinery/pkg/api/meta@0.29.2, github.com/openshift/custom-resource-status/conditions/v1@#f2fdb4999d87, github.com/openshift/hive/apis/hive/v1/metricsconfig@0.0.0, github.com/openshift/installer/pkg/types@#304af6735c65, github.com/openshift/library-go/pkg/controller@#126b47137408, k8s.io/apimachinery/pkg/api/errors@0.29.2, k8s.io/apimachinery/pkg/apis/meta/v1/validation@0.29.2, k8s.io/apimachinery/pkg/api/equality@0.29.2, k8s.io/cli-runtime/pkg/resource@0.29.2, sigs.k8s.io/controller-runtime/pkg/client/apiutil@0.17.2, k8s.io/kubectl/pkg/polymorphichelpers@0.29.1, sigs.k8s.io/controller-runtime/pkg/metrics@0.17.2, github.com/openshift/hive/apis/hive/v1@0.0.0, github.com/openshift/cluster-api-provider-ovirt/pkg/apis/ovirtprovider/v1beta1@#e3f2850dd519, github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1@#fe524080b551, github.com/openshift/cluster-autoscaler-operator/pkg/apis/autoscaling/v1beta1@#fe524080b551, sigs.k8s.io/controller-runtime/pkg/webhook/admission@0.17.2, github.com/openshift/library-go/pkg/operator/resource/resourcemerge@#126b47137408, github.com/openshift/library-go/pkg/verify@#126b47137408, github.com/openshift/hive/apis@0.0.0, github.com/openshift/library-go/pkg/operator/resource/resourceread@#126b47137408, k8s.io/kube-aggregator/pkg/apis/apiregistration/v1@0.29.1, github.com/openshift/api/config/v1@#ce10821dc999, github.com/openshift/hive/apis/hive/v1/aws@0.0.0, github.com/openshift/hive/apis/hive/v1/azure@0.0.0, github.com/openshift/hive/apis/hive/v1/gcp@0.0.0, github.com/openshift/hive/apis/hive/v1/ibmcloud@0.0.0, github.com/openshift/hive/apis/hive/v1/openstack@0.0.0, github.com/openshift/hive/apis/hive/v1/ovirt@0.0.0, github.com/openshift/hive/apis/hive/v1/vsphere@0.0.0, github.com/openshift/api/machine/v1beta1@#ce10821dc999, github.com/openshift/installer/pkg/destroy/azure@#304af6735c65, github.com/openshift/installer/pkg/destroy/vsphere@#304af6735c65, github.com/openshift/installer/pkg/destroy/providers@#304af6735c65, github.com/openshift/installer/pkg/destroy/ovirt@#304af6735c65, k8s.io/client-go/util/retry@0.29.1, k8s.io/apimachinery/pkg/api/validation@0.29.2, k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1@0.29.2, sigs.k8s.io/controller-runtime/pkg/client@0.17.2, sigs.k8s.io/controller-runtime/pkg/cache@0.17.2, sigs.k8s.io/controller-runtime/pkg/controller/controllerutil@0.17.2, k8s.io/kubectl/pkg/cmd/apply@0.29.1, k8s.io/kubectl/pkg/cmd/util@0.29.1, sigs.k8s.io/controller-runtime/pkg/metrics/server@0.17.2, github.com/openshift/cluster-api-provider-ovirt/pkg/apis@#e3f2850dd519, sigs.k8s.io/controller-runtime/pkg/config@0.17.2, k8s.io/apimachinery/pkg/runtime/serializer@0.29.2, github.com/openshift/api/operator/v1@#ce10821dc999, github.com/openshift/installer/pkg/types/aws@#304af6735c65, github.com/openshift/installer/pkg/types/ibmcloud@#304af6735c65, github.com/openshift/installer/pkg/types/openstack@#304af6735c65, github.com/openshift/installer/pkg/types/ovirt@#304af6735c65, github.com/openshift/installer/pkg/types/vsphere@#304af6735c65, github.com/openshift/installer/pkg/destroy/aws@#304af6735c65, github.com/openshift/installer/pkg/destroy/ibmcloud@#304af6735c65, k8s.io/kubectl/pkg/cmd/delete@0.29.1, github.com/openshift/installer/pkg/asset/machines/aws@#304af6735c65, github.com/openshift/installer/pkg/asset/machines/azure@#304af6735c65, github.com/openshift/installer/pkg/asset/machines/openstack@#304af6735c65, sigs.k8s.io/controller-runtime/pkg/client/fake@0.17.2, k8s.io/kubectl/pkg/cmd/patch@0.29.1, sigs.k8s.io/controller-runtime/pkg/reconcile@0.17.2, sigs.k8s.io/controller-runtime/pkg/event@0.17.2, github.com/openshift/machine-api-operator/pkg/controller/vsphere@#2cc7fcf262f3, k8s.io/client-go/kubernetes@0.29.1, sigs.k8s.io/controller-runtime/pkg/webhook@0.17.2, github.com/openshift/installer/pkg/asset/machines/vsphere@#304af6735c65, github.com/openshift/installer/pkg/asset/installconfig/aws@#304af6735c65, github.com/openshift/installer/pkg/destroy/openstack@#304af6735c65, sigs.k8s.io/controller-runtime/pkg/predicate@0.17.2, github.com/openshift/machine-api-provider-gcp/pkg/apis/gcpprovider/v1beta1@#6096cc86f3ba, sigs.k8s.io/controller-runtime/pkg/handler@0.17.2, sigs.k8s.io/controller-runtime/pkg/manager@0.17.2, github.com/openshift/library-go/pkg/manifest@#126b47137408, github.com/openshift/library-go/pkg/verify/store/sigstore@#126b47137408, sigs.k8s.io/controller-runtime/pkg/controller@0.17.2, sigs.k8s.io/controller-runtime/pkg/source@0.17.2
  From: k8s.io/apimachinery/pkg/util/net@0.29.2 > golang.org/x/net/http2@0.22.0
  From: k8s.io/client-go/rest@0.29.1 > golang.org/x/net/http2@0.22.0
  From: k8s.io/client-go/tools/cache@0.29.1 > k8s.io/apimachinery/pkg/util/net@0.29.2 > golang.org/x/net/http2@0.22.0
  and 211 more...
  Fixed in: 0.23.0
@openshift-ci openshift-ci bot requested review from dlom and lleshchi April 5, 2024 21:23
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 5, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 5, 2024

@2uasimojo: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@codecov
Copy link

codecov bot commented Apr 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.58%. Comparing base (9a5473a) to head (44c6d8e).
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2256   +/-   ##
=======================================
  Coverage   58.58%   58.58%           
=======================================
  Files         182      182           
  Lines       25775    25775           
=======================================
  Hits        15101    15101           
  Misses       9402     9402           
  Partials     1272     1272           

@2uasimojo
Copy link
Member Author

/assign @suhanime

@suhanime
Copy link
Contributor

suhanime commented Apr 8, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 8, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 2uasimojo, suhanime

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit ceaafa8 into openshift:master Apr 8, 2024
@2uasimojo 2uasimojo deleted the cve-x-net-http2 branch April 9, 2024 16:08
@2uasimojo
Copy link
Member Author

/cherry-pick mce-2.5

@openshift-cherrypick-robot

@2uasimojo: #2256 failed to apply on top of branch "mce-2.5":

Applying: Fix snyk vuln in golang.org/x/net/http2
Using index info to reconstruct a base tree...
M	apis/go.mod
M	apis/go.sum
M	apis/vendor/golang.org/x/net/http2/frame.go
M	apis/vendor/golang.org/x/net/http2/server.go
M	apis/vendor/golang.org/x/net/http2/transport.go
M	apis/vendor/modules.txt
M	go.mod
M	go.sum
M	vendor/golang.org/x/net/http2/frame.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/frame.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging apis/vendor/modules.txt
CONFLICT (content): Merge conflict in apis/vendor/modules.txt
Auto-merging apis/vendor/golang.org/x/net/http2/transport.go
Auto-merging apis/vendor/golang.org/x/net/http2/server.go
Auto-merging apis/vendor/golang.org/x/net/http2/frame.go
Auto-merging apis/go.sum
CONFLICT (content): Merge conflict in apis/go.sum
Auto-merging apis/go.mod
CONFLICT (content): Merge conflict in apis/go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix snyk vuln in golang.org/x/net/http2
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick mce-2.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@2uasimojo
Copy link
Member Author

2uasimojo commented Apr 26, 2024

mce-2.5: #2270
mce-2.4: #2271
mce-2.3: #2272
mce-2.2: #2273

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants