epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-25 11:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use single namespace by default, fix k8s buider

Browse source 
Signed-off-by: Basil K Y <techiebasil@gmail.com>
This commit is contained in:
Basil K Y 2022-08-24 23:24:56 +05:30
parent f670bd7777
commit ac29d979c5
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test-network-k8s/network
View file

@ -41,9 +41,9 @@ context NETWORK_NAME test-network
context CLUSTER_NAME kind context CLUSTER_NAME kind
context KUBE_NAMESPACE ${NETWORK_NAME} context KUBE_NAMESPACE ${NETWORK_NAME}
context NS ${KUBE_NAMESPACE} context NS ${KUBE_NAMESPACE}
context ORG0_NS org0-namespace context ORG0_NS ${NS}
context ORG1_NS org1-namespace context ORG1_NS ${NS}
context ORG2_NS org2-namespace context ORG2_NS ${NS}
context DOMAIN localho.st context DOMAIN localho.st
context CHANNEL_NAME mychannel context CHANNEL_NAME mychannel
context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372 context ORDERER_TIMEOUT 10s # see https://github.com/hyperledger/fabric/issues/3372

18
test-network-k8s/scripts/fabric_config.sh
View file

@ -6,15 +6,17 @@
# #
function init_namespace() { function init_namespace() {
push_fn "Creating namespace \"$NS\"" local namespaces=$(echo "$ORG0_NS $ORG1_NS $ORG2_NS" | xargs -n1 | sort -u)
for ns in $ORG0_NS $ORG1_NS $ORG2_NS; do for ns in $namespaces; do
push_fn "Creating namespace \"$ns\""
kubectl create namespace $ns || true kubectl create namespace $ns || true
pop_fn
done done
pop_fn
} }
function delete_namespace() { function delete_namespace() {
for ns in $ORG0_NS $ORG1_NS $ORG2_NS; do local namespaces=$(echo "$ORG0_NS $ORG1_NS $ORG2_NS" | xargs -n1 | sort -u)
for ns in $namespaces; do
push_fn "Deleting namespace \"$ns\"" push_fn "Deleting namespace \"$ns\""
kubectl delete namespace $ns || true kubectl delete namespace $ns || true
pop_fn pop_fn
@ -61,8 +63,8 @@ function load_org_config() {
function apply_k8s_builder_roles() { function apply_k8s_builder_roles() {
push_fn "Applying k8s chaincode builder roles" push_fn "Applying k8s chaincode builder roles"
apply_template kube/fabric-builder-role.yaml apply_template kube/fabric-builder-role.yaml $ORG1_NS
apply_template kube/fabric-builder-rolebinding.yaml apply_template kube/fabric-builder-rolebinding.yaml $ORG1_NS
pop_fn pop_fn
} }
@ -70,8 +72,8 @@ function apply_k8s_builder_roles() {
function apply_k8s_builders() { function apply_k8s_builders() {
push_fn "Installing k8s chaincode builders" push_fn "Installing k8s chaincode builders"
apply_template kube/org1/org1-install-k8s-builder.yaml apply_template kube/org1/org1-install-k8s-builder.yaml $ORG1_NS
apply_template kube/org2/org2-install-k8s-builder.yaml apply_template kube/org2/org2-install-k8s-builder.yaml $ORG1_NS
pop_fn pop_fn
} }