diff --git a/test-network-k8s/config/org0/fabric-ca-server-config.yaml b/test-network-k8s/config/org0/fabric-ca-server-config.yaml index b73d96af..cff9c304 100644 --- a/test-network-k8s/config/org0/fabric-ca-server-config.yaml +++ b/test-network-k8s/config/org0/fabric-ca-server-config.yaml @@ -321,7 +321,7 @@ csr: - localhost - 127.0.0.1 - org0-ca - - org0-ca.test-network.svc.cluster.local + - org0-ca.${NS}.svc.cluster.local ca: expiry: 131400h pathlength: 1 diff --git a/test-network-k8s/config/org1/fabric-ca-server-config.yaml b/test-network-k8s/config/org1/fabric-ca-server-config.yaml index e14943b9..d31dfad7 100644 --- a/test-network-k8s/config/org1/fabric-ca-server-config.yaml +++ b/test-network-k8s/config/org1/fabric-ca-server-config.yaml @@ -321,7 +321,7 @@ csr: - localhost - 127.0.0.1 - org1-ca - - org1-ca.test-network.svc.cluster.local + - org1-ca.${NS}.svc.cluster.local ca: expiry: 131400h pathlength: 1 diff --git a/test-network-k8s/config/org2/fabric-ca-server-config.yaml b/test-network-k8s/config/org2/fabric-ca-server-config.yaml index 5d18e4a5..677c9c07 100644 --- a/test-network-k8s/config/org2/fabric-ca-server-config.yaml +++ b/test-network-k8s/config/org2/fabric-ca-server-config.yaml @@ -321,7 +321,7 @@ csr: - localhost - 127.0.0.1 - org2-ca - - org2-ca.test-network.svc.cluster.local + - org2-ca.${NS}.svc.cluster.local ca: expiry: 131400h pathlength: 1 diff --git a/test-network-k8s/kube/fabric-rest-sample.yaml b/test-network-k8s/kube/fabric-rest-sample.yaml index 32be0f0a..b9a75af4 100644 --- a/test-network-k8s/kube/fabric-rest-sample.yaml +++ b/test-network-k8s/kube/fabric-rest-sample.yaml @@ -11,7 +11,7 @@ metadata: data: HLF_CONNECTION_PROFILE_ORG1: | { - "name": "test-network-org1", + "name": "${NS}-org1", "version": "1.0.0", "client": { "organization": "Org1", @@ -87,7 +87,7 @@ data: -----END PRIVATE KEY----- HLF_CONNECTION_PROFILE_ORG2: | { - "name": "test-network-org2", + "name": "${NS}-org2", "version": "1.0.0", "client": { "organization": "Org2", diff --git a/test-network-k8s/kube/org0/org0-ca.yaml b/test-network-k8s/kube/org0/org0-ca.yaml index b4e4ac2a..43791b91 100644 --- a/test-network-k8s/kube/org0/org0-ca.yaml +++ b/test-network-k8s/kube/org0/org0-ca.yaml @@ -16,7 +16,7 @@ spec: dnsNames: - localhost - org0-ca - - org0-ca.test-network.svc.cluster.local + - org0-ca.${NS}.svc.cluster.local - org0-ca.${DOMAIN} ipAddresses: - 127.0.0.1 diff --git a/test-network-k8s/kube/org1/org1-ca.yaml b/test-network-k8s/kube/org1/org1-ca.yaml index 9428971f..d8336e33 100644 --- a/test-network-k8s/kube/org1/org1-ca.yaml +++ b/test-network-k8s/kube/org1/org1-ca.yaml @@ -16,7 +16,7 @@ spec: dnsNames: - localhost - org1-ca - - org1-ca.test-network.svc.cluster.local + - org1-ca.${NS}.svc.cluster.local - org1-ca.${DOMAIN} ipAddresses: - 127.0.0.1 diff --git a/test-network-k8s/kube/org1/org1-peer1.yaml b/test-network-k8s/kube/org1/org1-peer1.yaml index 1d6a9f6c..dbb4a9d3 100644 --- a/test-network-k8s/kube/org1/org1-peer1.yaml +++ b/test-network-k8s/kube/org1/org1-peer1.yaml @@ -8,7 +8,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: org1-peer1-tls-cert - namespace: test-network + namespace: ${NS} spec: isCA: false privateKey: @@ -17,7 +17,7 @@ spec: dnsNames: - localhost - org1-peer1 - - org1-peer1.test-network.svc.cluster.local + - org1-peer1.${NS}.svc.cluster.local - org1-peer1.${DOMAIN} - org1-peer-gateway-svc - org1-peer-gateway-svc.${DOMAIN} diff --git a/test-network-k8s/kube/org1/org1-peer2.yaml b/test-network-k8s/kube/org1/org1-peer2.yaml index 91e46bb2..e485a558 100644 --- a/test-network-k8s/kube/org1/org1-peer2.yaml +++ b/test-network-k8s/kube/org1/org1-peer2.yaml @@ -8,7 +8,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: org1-peer2-tls-cert - namespace: test-network + namespace: ${NS} spec: isCA: false privateKey: @@ -18,7 +18,7 @@ spec: - localhost - org1-peer2 - org1-peer-gateway-svc - - org1-peer2.test-network.svc.cluster.local + - org1-peer2.${NS}.svc.cluster.local - org1-peer2.${DOMAIN} ipAddresses: - 127.0.0.1 diff --git a/test-network-k8s/kube/org2/org2-ca.yaml b/test-network-k8s/kube/org2/org2-ca.yaml index 59f7c000..ba07eed1 100644 --- a/test-network-k8s/kube/org2/org2-ca.yaml +++ b/test-network-k8s/kube/org2/org2-ca.yaml @@ -16,7 +16,7 @@ spec: dnsNames: - localhost - org2-ca - - org2-ca.test-network.svc.cluster.local + - org2-ca.${NS}.svc.cluster.local - org2-ca.${DOMAIN} ipAddresses: - 127.0.0.1 diff --git a/test-network-k8s/kube/org2/org2-cc-template.yaml b/test-network-k8s/kube/org2/org2-cc-template.yaml new file mode 100644 index 00000000..6faee80c --- /dev/null +++ b/test-network-k8s/kube/org2/org2-cc-template.yaml @@ -0,0 +1,46 @@ +# +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: org2{{PEER_NAME}}-ccaas-{{CHAINCODE_NAME}} +spec: + replicas: 1 + selector: + matchLabels: + app: org2{{PEER_NAME}}-ccaas-{{CHAINCODE_NAME}} + template: + metadata: + labels: + app: org2{{PEER_NAME}}-ccaas-{{CHAINCODE_NAME}} + spec: + containers: + - name: main + image: {{CHAINCODE_IMAGE}} + imagePullPolicy: IfNotPresent + env: + - name: CHAINCODE_SERVER_ADDRESS + value: 0.0.0.0:9999 + - name: CHAINCODE_ID + value: {{CHAINCODE_ID}} + - name: CORE_CHAINCODE_ID_NAME + value: {{CHAINCODE_ID}} + ports: + - containerPort: 9999 + +--- +apiVersion: v1 +kind: Service +metadata: + name: org2{{PEER_NAME}}-ccaas-{{CHAINCODE_NAME}} +spec: + ports: + - name: chaincode + port: 9999 + protocol: TCP + selector: + app: org2{{PEER_NAME}}-ccaas-{{CHAINCODE_NAME}} \ No newline at end of file diff --git a/test-network-k8s/kube/org2/org2-cc.yaml b/test-network-k8s/kube/org2/org2-cc.yaml deleted file mode 100644 index 5075f2ba..00000000 --- a/test-network-k8s/kube/org2/org2-cc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# -# Copyright IBM Corp. All Rights Reserved. -# -# SPDX-License-Identifier: Apache-2.0 -# - diff --git a/test-network-k8s/kube/org2/org2-peer1.yaml b/test-network-k8s/kube/org2/org2-peer1.yaml index a9569704..03c19fce 100644 --- a/test-network-k8s/kube/org2/org2-peer1.yaml +++ b/test-network-k8s/kube/org2/org2-peer1.yaml @@ -8,7 +8,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: org2-peer1-tls-cert - namespace: test-network + namespace: ${NS} spec: isCA: false privateKey: @@ -17,7 +17,7 @@ spec: dnsNames: - localhost - org2-peer1 - - org2-peer1.test-network.svc.cluster.local + - org2-peer1.${NS}.svc.cluster.local - org2-peer1.${DOMAIN} - org2-peer-gateway-svc - org2-peer-gateway-svc.${DOMAIN} diff --git a/test-network-k8s/kube/org2/org2-peer2.yaml b/test-network-k8s/kube/org2/org2-peer2.yaml index 5c6f5b0a..e5584ac8 100644 --- a/test-network-k8s/kube/org2/org2-peer2.yaml +++ b/test-network-k8s/kube/org2/org2-peer2.yaml @@ -8,7 +8,7 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: org2-peer2-tls-cert - namespace: test-network + namespace: ${NS} spec: isCA: false privateKey: @@ -18,7 +18,7 @@ spec: - localhost - org2-peer2 - org2-peer-gateway-svc - - org2-peer2.test-network.svc.cluster.local + - org2-peer2.${NS}.svc.cluster.local - org2-peer2.${DOMAIN} ipAddresses: - 127.0.0.1 diff --git a/test-network-k8s/scripts/ccp-template.json b/test-network-k8s/scripts/ccp-template.json index c80f34b6..e3e2b290 100755 --- a/test-network-k8s/scripts/ccp-template.json +++ b/test-network-k8s/scripts/ccp-template.json @@ -1,5 +1,5 @@ { - "name": "test-network-org${ORG}", + "name": "${NS}-org${ORG}", "version": "1.0.0", "client": { "organization": "Org${ORG}",