Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test-network-k8s #1210

Merged
merged 1 commit into from
May 27, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <[email protected]>
  • Loading branch information
jt-nti committed May 24, 2024

Verified

This commit was signed with the committer’s verified signature.
Lehmann-Fabian Fabian Lehmann
commit a08eacbcc37925ba9a99a67f0090cddd85d16b30
1 change: 1 addition & 0 deletions test-network-k8s/config/org1/core.yaml
Original file line number Diff line number Diff line change
@@ -568,6 +568,7 @@ chaincode:
path: /var/hyperledger/fabric/external_builders/k8s_builder
propagateEnvironment:
- CORE_PEER_ID
- FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX
- KUBERNETES_SERVICE_HOST
- KUBERNETES_SERVICE_PORT

1 change: 1 addition & 0 deletions test-network-k8s/config/org2/core.yaml
Original file line number Diff line number Diff line change
@@ -568,6 +568,7 @@ chaincode:
path: /var/hyperledger/fabric/external_builders/k8s_builder
propagateEnvironment:
- CORE_PEER_ID
- FABRIC_K8S_BUILDER_OBJECT_NAME_PREFIX
- KUBERNETES_SERVICE_HOST
- KUBERNETES_SERVICE_PORT

3 changes: 2 additions & 1 deletion test-network-k8s/kube/fabric-builder-role.yaml
Original file line number Diff line number Diff line change
@@ -12,9 +12,10 @@ rules:
- apiGroups:
- ""
- apps
- batch
resources:
- pods
- deployments
- jobs
- configmaps
- secrets
verbs:
1 change: 1 addition & 0 deletions test-network-k8s/kube/org1/org1-install-k8s-builder.yaml
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ kind: Job
metadata:
name: org1-install-k8s-builder
spec:
ttlSecondsAfterFinished: 600
backoffLimit: 0
completions: 1
template:
1 change: 1 addition & 0 deletions test-network-k8s/kube/org1/org1-peer1.yaml
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ data:
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
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_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
1 change: 1 addition & 0 deletions test-network-k8s/kube/org1/org1-peer2.yaml
Original file line number Diff line number Diff line change
@@ -54,6 +54,7 @@ data:
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
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_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
1 change: 1 addition & 0 deletions test-network-k8s/kube/org2/org2-install-k8s-builder.yaml
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ kind: Job
metadata:
name: org2-install-k8s-builder
spec:
ttlSecondsAfterFinished: 600
backoffLimit: 0
completions: 1
template:
1 change: 1 addition & 0 deletions test-network-k8s/kube/org2/org2-peer1.yaml
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@ data:
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
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_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
1 change: 1 addition & 0 deletions test-network-k8s/kube/org2/org2-peer2.yaml
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ data:
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
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_COUCHDBCONFIG_MAXRETRIESONSTARTUP: "20"
CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS: localhost:5984
Loading