From 66d19f969d3484318d58bf58cd6360c2c9d4fd36 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Tue, 2 Apr 2024 17:30:47 +0100 Subject: [PATCH 1/2] Add missing k8s_builder config to v25 core.yaml (#184) Related to #28 Signed-off-by: James Taylor --- defaultconfig/peer/v25/core.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/defaultconfig/peer/v25/core.yaml b/defaultconfig/peer/v25/core.yaml index 2b5482e6..fdf90866 100644 --- a/defaultconfig/peer/v25/core.yaml +++ b/defaultconfig/peer/v25/core.yaml @@ -612,6 +612,15 @@ chaincode: - IBP_BUILDER_SHARED_DIR - PEER_NAME + # Default builder for "k8s" chaincode packages. + # See https://github.com/hyperledgendary/fabric-builder-k8s + - name: k8s_builder + path: /opt/hyperledger/k8s_builder + propagateEnvironment: + - CORE_PEER_ID + - KUBERNETES_SERVICE_HOST + - KUBERNETES_SERVICE_PORT + # Default builder for chaincode-as-a-service, included in fabric # opensource versions >= 2.4.2. This is a "no-op" builder and will not # manage the lifecycle of pods, deployments, and services in k8s. The From c1a1b4682270b5d67dcc2b67278213e83f8f094a Mon Sep 17 00:00:00 2001 From: Ben Smith Date: Thu, 4 Apr 2024 00:31:26 -0400 Subject: [PATCH 2/2] Address CVE-2024-24786 in google.golang.org/protobuf. (#186) Signed-off-by: Ben Smith --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 95965759..b5fd0978 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( google.golang.org/appengine v1.6.8 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect google.golang.org/grpc v1.61.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 8c35c52c..63d9024e 100644 --- a/go.sum +++ b/go.sum @@ -1008,6 +1008,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=