Update test-network-k8s

Add required permissions for upcoming k8s builder release

Also adds ttl to install jobs and configures the k8s builder prefix

Signed-off-by: James Taylor <jamest@uk.ibm.com>
This commit is contained in:
James Taylor 2024-05-24 16:04:18 +01:00
parent d3e2a90ad5
commit a08eacbcc3
9 changed files with 10 additions and 1 deletions

View file

@ -568,6 +568,7 @@ chaincode:
path: /var/hyperledger/fabric/external_builders/k8s_builder path: /var/hyperledger/fabric/external_builders/k8s_builder
propagateEnvironment: propagateEnvironment:
- CORE_PEER_ID - CORE_PEER_ID
- FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX
- KUBERNETES_SERVICE_HOST - KUBERNETES_SERVICE_HOST
- KUBERNETES_SERVICE_PORT - KUBERNETES_SERVICE_PORT

View file

@ -568,6 +568,7 @@ chaincode:
path: /var/hyperledger/fabric/external_builders/k8s_builder path: /var/hyperledger/fabric/external_builders/k8s_builder
propagateEnvironment: propagateEnvironment:
- CORE_PEER_ID - CORE_PEER_ID
- FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX
- KUBERNETES_SERVICE_HOST - KUBERNETES_SERVICE_HOST
- KUBERNETES_SERVICE_PORT - KUBERNETES_SERVICE_PORT

View file

@ -12,9 +12,10 @@ rules:
- apiGroups: - apiGroups:
- "" - ""
- apps - apps
- batch
resources: resources:
- pods - pods
- deployments - jobs
- configmaps - configmaps
- secrets - secrets
verbs: verbs:

View file

@ -9,6 +9,7 @@ kind: Job
metadata: metadata:
name: org1-install-k8s-builder name: org1-install-k8s-builder
spec: spec:
ttlSecondsAfterFinished: 600
backoffLimit: 0 backoffLimit: 0
completions: 1 completions: 1
template: template:

View file

@ -53,6 +53,7 @@ data:
CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org1-peer1.org1.example.com CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org1-peer1.org1.example.com
CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org1-peer1.org1.example.com/snapshots CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org1-peer1.org1.example.com/snapshots
CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org1peer1\"}" CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org1peer1\"}"
FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX: org1-peer1-cc
CORE_LEDGER_STATE_STATEDATABASE: CouchDB CORE_LEDGER_STATE_STATEDATABASE: CouchDB
CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20" CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984 CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984

View file

@ -54,6 +54,7 @@ data:
CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org1-peer2.org1.example.com CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org1-peer2.org1.example.com
CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org1-peer2.org1.example.com/snapshots CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org1-peer2.org1.example.com/snapshots
CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org1peer2\"}" CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org1peer2\"}"
FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX: org1-peer2-cc
CORE_LEDGER_STATE_STATEDATABASE: CouchDB CORE_LEDGER_STATE_STATEDATABASE: CouchDB
CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20" CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984 CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984

View file

@ -9,6 +9,7 @@ kind: Job
metadata: metadata:
name: org2-install-k8s-builder name: org2-install-k8s-builder
spec: spec:
ttlSecondsAfterFinished: 600
backoffLimit: 0 backoffLimit: 0
completions: 1 completions: 1
template: template:

View file

@ -53,6 +53,7 @@ data:
CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org2-peer1.org2.example.com CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org2-peer1.org2.example.com
CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org2-peer1.org2.example.com/snapshots CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org2-peer1.org2.example.com/snapshots
CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org2peer1\"}" CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org2peer1\"}"
FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX: org2-peer1-cc
CORE_LEDGER_STATE_STATEDATABASE: CouchDB CORE_LEDGER_STATE_STATEDATABASE: CouchDB
CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20" CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984 CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984

View file

@ -52,6 +52,7 @@ data:
CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org2-peer2.org2.example.com CORE_PEER_FILESYSTEMPATH: /var/hyperledger/fabric/data/org2-peer2.org2.example.com
CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org2-peer2.org2.example.com/snapshots CORE_LEDGER_SNAPSHOTS_ROOTDIR: /var/hyperledger/fabric/data/org2-peer2.org2.example.com/snapshots
CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org2peer2\"}" CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG: "{\"peername\":\"org2peer2\"}"
FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX: org2-peer2-cc
CORE_LEDGER_STATE_STATEDATABASE: CouchDB CORE_LEDGER_STATE_STATEDATABASE: CouchDB
CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20" CORE_LEDGER_STATE_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984 CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984