Merge pull request #123 from upb-uc4/develop

Release v1.0.0
upb-uc4 · Mar 13, 2021 · 1958725 · 1958725
2 parents 5ee84db + 24e3168
commit 1958725
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v1.0.0 (2021-03-13)
+
+## Feature
+
+- Provide public certs as secrets to uc4-support namespace
+
 ## [v0.18.0](https://github.com/upb-uc4/hlf-network/compare/v0.17.0...v0.18.0) (2021-02-15)
 
 ## Bugfix

diff --git a/README.md b/README.md
@@ -37,15 +37,13 @@ This repository contains scripts and configuration files for a basic Hyperledger
 
 ### TL;DR
 
-1. Install [KinD](https://kind.sigs.k8s.io/docs/user/quick-start/)
-   and [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
+1. Install [KinD](https://kind.sigs.k8s.io/docs/user/quick-start/), [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/), faketime and unzip (if not present).
 2. Run `./restart.sh`
 
 ### Requirements / Installation
 
 For using our scripts, you need a unix system with additional installation
-of [KinD](https://kind.sigs.k8s.io/docs/user/quick-start/)
-and [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/). If you are new to Kubernetes, we suggest
+of [KinD](https://kind.sigs.k8s.io/docs/user/quick-start/) (we use v0.8.1), [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) (we recommend the latest stable release), faketime and unzip. If you are new to Kubernetes, we suggest
 the [interactive tutorials](https://kubernetes.io/docs/tutorials/) provided by Kubernetes.
 
 ### Deploy the Network

diff --git a/k8s/org0/rca-org0.yaml b/k8s/org0/rca-org0.yaml
@@ -47,7 +47,7 @@ spec:
             - name: FABRIC_CA_SERVER_CSR_CN
               value: "rca-org0"
             - name: FABRIC_CA_SERVER_CSR_HOSTS
-              value: "172.17.0.2,172.17.0.3,0.0.0.0,rca-org0.hlf"
+              value: "172.17.0.2,172.17.0.3,0.0.0.0,rca-org0.hlf,uc4.cs.uni-paderborn.de"
             - name: FABRIC_CA_SERVER_DEBUG
               value: "true"
             - name: FABRIC_CA_SERVER_CA_CERTFILE

diff --git a/k8s/org1/peer1-org1-storage.yaml b/k8s/org1/peer1-org1-storage.yaml
@@ -28,7 +28,7 @@ spec:
   resources:
     requests:
       storage: 5Gi
-      
+
 
 ---
 

diff --git a/k8s/org1/peer2-org1-storage.yaml b/k8s/org1/peer2-org1-storage.yaml
@@ -28,7 +28,7 @@ spec:
   resources:
     requests:
       storage: 5Gi
-      
+
 
 ---
 

diff --git a/k8s/org1/rca-org1.yaml b/k8s/org1/rca-org1.yaml
@@ -44,7 +44,7 @@ spec:
             - name: FABRIC_CA_SERVER_CSR_CN
               value: "rca-org1"
             - name: FABRIC_CA_SERVER_CSR_HOSTS
-              value: "172.17.0.2,172.17.0.3,0.0.0.0,rca-org1.hlf"
+              value: "172.17.0.2,172.17.0.3,0.0.0.0,rca-org1.hlf,uc4.cs.uni-paderborn.de"
             - name: FABRIC_CA_SERVER_DEBUG
               value: "true"
             - name: FABRIC_CA_SERVER_CA_CERTFILE

diff --git a/k8s/org2/rca-org2.yaml b/k8s/org2/rca-org2.yaml
@@ -44,7 +44,7 @@ spec:
             - name: FABRIC_CA_SERVER_CSR_CN
               value: "rca-org2"
             - name: FABRIC_CA_SERVER_CSR_HOSTS
-              value: "172.17.0.2,172.17.0.3,0.0.0.0,rca-org2.hlf"
+              value: "172.17.0.2,172.17.0.3,0.0.0.0,rca-org2.hlf,uc4.cs.uni-paderborn.de"
             - name: FABRIC_CA_SERVER_DEBUG
               value: "true"
             - name: FABRIC_CA_SERVER_CA_CERTFILE

diff --git a/k8s/tls-ca.yaml b/k8s/tls-ca.yaml
@@ -44,7 +44,7 @@ spec:
             - name: FABRIC_CA_SERVER_CSR_CN
               value: "tls-ca"
             - name: FABRIC_CA_SERVER_CSR_HOSTS
-              value: "172.17.0.2,172.17.0.3,0.0.0.0,tls-ca.hlf"
+              value: "172.17.0.2,172.17.0.3,0.0.0.0,tls-ca.hlf,uc4.cs.uni-paderborn.de"
             - name: FABRIC_CA_SERVER_DEBUG
               value: "true"
             - name: FABRIC_CA_SERVER_CA_CERTFILE

diff --git a/scripts/env.sh b/scripts/env.sh
@@ -1,4 +1,4 @@
 export CONTAINER_TIMEOUT="300s"
 export SERVER_STARTUP_TIME="10"
 export HL_MOUNT="/data/development/hyperledger"
-export HL_PRODUCTION_NETWORK_VERSION="v0.17.0"
+export HL_PRODUCTION_NETWORK_VERSION="v1.0.0"
diff --git a/scripts/startNetwork/generateSecrets.sh b/scripts/startNetwork/generateSecrets.sh
@@ -21,6 +21,7 @@ header "Generation of Certificates and Credentials"
 # Ensure lagom namespace exists
 set +e
 kubectl create namespace uc4-lagom
+kubectl create namespace uc4-support
 set -e
 
 if [[ $TEST_MODE == "-t" ]]; then
@@ -51,6 +52,7 @@ msg "Providing certificate and private key as kubernetes secret"
 kubectl create secret generic key.tls-ca -n hlf --from-file=key.pem=$TMP_CERT-key.pem
 kubectl create secret generic cert.tls-ca -n hlf --from-file=cert.pem=$TMP_CERT-cert.pem
 kubectl create secret generic cert.tls-ca -n uc4-lagom --from-file=cert.pem=$TMP_CERT-cert.pem
+kubectl create secret generic cert.tls-ca -n uc4-support --from-file=cert.pem=$TMP_CERT-cert.pem
 
 if [[ $TEST_MODE == "-t" ]]; then
   cp $TMP_CERT-cert.pem /tmp/hyperledger/ca-cert.pem
@@ -77,6 +79,7 @@ msg "Providing certificate and private key as kubernetes secret"
 kubectl create secret generic key.rca-org0 -n hlf --from-file=key.pem=$TMP_CERT-key.pem
 kubectl create secret generic cert.rca-org0 -n hlf --from-file=cert.pem=$TMP_CERT-cert.pem
 kubectl create secret generic cert.rca-org0 -n uc4-lagom --from-file=cert.pem=$TMP_CERT-cert.pem
+kubectl create secret generic cert.rca-org0 -n uc4-support --from-file=cert.pem=$TMP_CERT-cert.pem
 
 if [[ $TEST_MODE == "-t" ]]; then
   cp $TMP_CERT-cert.pem /tmp/hyperledger/org0/msp/cacerts/org0-ca-cert.pem
@@ -115,6 +118,7 @@ msg "Providing certificate and private key as kubernetes secret"
 kubectl create secret generic key.rca-org1 -n hlf --from-file=key.pem=$TMP_CERT-key.pem
 kubectl create secret generic cert.rca-org1 -n hlf --from-file=cert.pem=$TMP_CERT-cert.pem
 kubectl create secret generic cert.rca-org1 -n uc4-lagom --from-file=cert.pem=$TMP_CERT-cert.pem
+kubectl create secret generic cert.rca-org1 -n uc4-support --from-file=cert.pem=$TMP_CERT-cert.pem
 
 if [[ $TEST_MODE == "-t" ]]; then
   cp $TMP_CERT-cert.pem /tmp/hyperledger/org1/msp/cacerts/org1-ca-cert.pem
@@ -181,6 +185,7 @@ msg "Providing certificate and private key as kubernetes secret"
 kubectl create secret generic key.rca-org2 -n hlf --from-file=key.pem=$TMP_CERT-key.pem
 kubectl create secret generic cert.rca-org2 -n hlf --from-file=cert.pem=$TMP_CERT-cert.pem
 kubectl create secret generic cert.rca-org2 -n uc4-lagom --from-file=cert.pem=$TMP_CERT-cert.pem
+kubectl create secret generic cert.rca-org2 -n uc4-support --from-file=cert.pem=$TMP_CERT-cert.pem
 
 if [[ $TEST_MODE == "-t" ]]; then
   cp $TMP_CERT-cert.pem /tmp/hyperledger/org2/msp/cacerts/org2-ca-cert.pem