From 54128151bcef4430c502b871b2af7dfadc8859ec Mon Sep 17 00:00:00 2001 From: "Mark S. Lewis" Date: Sat, 7 Feb 2026 12:26:08 +0000 Subject: [PATCH] Update default Fabric CA version to 1.5.17 Signed-off-by: Mark S. Lewis --- .github/actions/fsat-setup/action.yaml | 6 +++--- .../actions/test-network-setup/action.yaml | 2 +- .../asset-transfer-typescript/Dockerfile | 2 +- .../asset-transfer-typescript/tsconfig.json | 4 ++-- .../infrastructure/kind_with_nginx.sh | 21 +++++++++++++++---- .../infrastructure/sample-network/network | 6 +++--- .../tests/20-cloud-e2e.sh | 4 ++-- test-network-k8s/docs/BFT_ORDERERS.md | 4 ++-- test-network/network.config | 2 +- test-network/scripts/utils.sh | 4 ++-- 10 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.github/actions/fsat-setup/action.yaml b/.github/actions/fsat-setup/action.yaml index 4022ff28..3eec3c21 100644 --- a/.github/actions/fsat-setup/action.yaml +++ b/.github/actions/fsat-setup/action.yaml @@ -6,16 +6,16 @@ inputs: default: "lts/*" just-version: description: Just Version - default: "1.43.0" + default: "1.46.0" k9s-version: description: k9s Version - default: v0.50.15 + default: v0.50.18 fabric-version: description: Version of Hyperledger Fabric default: "2.5.14" ca-version: description: Version of Hyperledger Fabric CA - default: "1.5.15" + default: "1.5.17" runs: using: "composite" diff --git a/.github/actions/test-network-setup/action.yaml b/.github/actions/test-network-setup/action.yaml index 1fc93833..b5327805 100644 --- a/.github/actions/test-network-setup/action.yaml +++ b/.github/actions/test-network-setup/action.yaml @@ -15,7 +15,7 @@ inputs: default: 2.5.14 ca-version: description: Version of Hyperledger Fabric CA - default: 1.5.15 + default: 1.5.17 runs: using: "composite" diff --git a/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/Dockerfile b/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/Dockerfile index 7ca56574..f8262ee9 100644 --- a/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/Dockerfile +++ b/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/Dockerfile @@ -12,7 +12,7 @@ RUN npm install RUN npm run build && npm shrinkwrap -FROM node:lts as prod-builder +FROM node:lts AS prod-builder WORKDIR /usr/src/app COPY --chown=node:node --from=builder /usr/src/app/dist ./dist COPY --chown=node:node --from=builder /usr/src/app/package.json ./ diff --git a/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/tsconfig.json b/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/tsconfig.json index 3336d0aa..0ce12366 100644 --- a/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/tsconfig.json +++ b/full-stack-asset-transfer-guide/contracts/asset-transfer-typescript/tsconfig.json @@ -8,10 +8,10 @@ "declarationMap": true, "sourceMap": true, "outDir": "dist", - "strict": true, "noUnusedLocals": true, "noImplicitReturns": true, - "forceConsistentCasingInFileNames": true + "forceConsistentCasingInFileNames": true, + "isolatedModules": true }, "include": ["src/"] } diff --git a/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh b/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh index 2a0e513e..25570e20 100755 --- a/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh +++ b/full-stack-asset-transfer-guide/infrastructure/kind_with_nginx.sh @@ -21,7 +21,7 @@ set -eo pipefail set -x KIND_CLUSTER_NAME=kind -KIND_CLUSTER_IMAGE=${KIND_CLUSTER_IMAGE:-kindest/node:v1.28.0} # Important! k8s v1.25.0 brings breaking changes. +KIND_CLUSTER_IMAGE=${KIND_CLUSTER_IMAGE:-kindest/node:v1.35.1} # Important! k8s v1.25.0 brings breaking changes. KIND_API_SERVER_ADDRESS=${KIND_API_SERVER_ADDRESS:-127.0.0.1} KIND_API_SERVER_PORT=${KIND_API_SERVER_PORT:-8888} CONTAINER_REGISTRY_NAME=${CONTAINER_REGISTRY_NAME:-kind-registry} @@ -78,14 +78,27 @@ networking: # create a cluster with the local registry enabled in containerd containerdConfigPatches: - |- - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${CONTAINER_REGISTRY_PORT}"] - endpoint = ["http://${CONTAINER_REGISTRY_NAME}:${CONTAINER_REGISTRY_PORT}"] + [plugins."io.containerd.grpc.v1.cri".registry] + config_path = "/etc/containerd/certs.d" + EOF + # Configure registry for containerd 2.x using config_path mode + for node in $(kind get nodes --name $KIND_CLUSTER_NAME); + do + docker exec "$node" mkdir -p "/etc/containerd/certs.d/localhost:${CONTAINER_REGISTRY_PORT}" + docker exec "$node" sh -c "cat > /etc/containerd/certs.d/localhost:${CONTAINER_REGISTRY_PORT}/hosts.toml <