Merge pull request #87 from upb-uc4/develop

Sprint #11 release

.github/workflows/main.yaml

@@ -20,7 +20,6 @@ on:
       - master
       - develop
 jobs:
-
   job1:
     runs-on: ubuntu-latest
     name: Test network on kind
@@ -35,6 +34,89 @@ jobs:
         with:
           version: "v0.7.0"
           config: assets/kind.yaml
+      - name: (Temporary) install faketime to prevent clockdrifts
+        run:
+          sudo apt-get install faketime
+      - name: Deploy network using deployment script
+        run:
+          ./deploy.sh
+  job2:
+    runs-on: ubuntu-latest
+    name: Test network on kind
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create folder for mounts of default cluster
+        run: |
+          sudo mkdir -p /data/development/hyperledger
+          sudo chmod -R 777 /data/development
+      - name: Start KinD with default cluster config
+        uses: engineerd/setup-kind@v0.4.0
+        with:
+          version: "v0.7.0"
+          config: assets/kind.yaml
+      - name: (Temporary) install faketime to prevent clockdrifts
+        run:
+          sudo apt-get install faketime
+      - name: Deploy network using deployment script
+        run:
+          ./deploy.sh
+  job3:
+    runs-on: ubuntu-latest
+    name: Test network on kind
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create folder for mounts of default cluster
+        run: |
+          sudo mkdir -p /data/development/hyperledger
+          sudo chmod -R 777 /data/development
+      - name: Start KinD with default cluster config
+        uses: engineerd/setup-kind@v0.4.0
+        with:
+          version: "v0.7.0"
+          config: assets/kind.yaml
+      - name: (Temporary) install faketime to prevent clockdrifts
+        run:
+          sudo apt-get install faketime
+      - name: Deploy network using deployment script
+        run:
+          ./deploy.sh
+  job4:
+    runs-on: ubuntu-latest
+    name: Test network on kind
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create folder for mounts of default cluster
+        run: |
+          sudo mkdir -p /data/development/hyperledger
+          sudo chmod -R 777 /data/development
+      - name: Start KinD with default cluster config
+        uses: engineerd/setup-kind@v0.4.0
+        with:
+          version: "v0.7.0"
+          config: assets/kind.yaml
+      - name: (Temporary) install faketime to prevent clockdrifts
+        run:
+          sudo apt-get install faketime
+      - name: Deploy network using deployment script
+        run:
+          ./deploy.sh
+  job5:
+    runs-on: ubuntu-latest
+    name: Test network on kind
+    steps:
+      - uses: actions/checkout@v2
+      - name: Create folder for mounts of default cluster
+        run: |
+          sudo mkdir -p /data/development/hyperledger
+          sudo chmod -R 777 /data/development
+      - name: Start KinD with default cluster config
+        uses: engineerd/setup-kind@v0.4.0
+        with:
+          version: "v0.7.0"
+          config: assets/kind.yaml
+      - name: (Temporary) install faketime to prevent clockdrifts
+        run:
+          sudo apt-get install faketime
       - name: Deploy network using deployment script
         run:
           ./deploy.sh

.gitignore

@@ -2,8 +2,7 @@
 # Custom settings                                                              #
 ################################################################################
 
-# Generated files
-configtx.yaml
+*log.txt
 
 ################################################################################
 # IDE configuration                                                            #

CHANGELOG.md

@@ -1,4 +1,38 @@
-# [v.0.10.0](https://github.com/upb-uc4/hlf-network/compare/v0.9.0...v0.10.0) (2015-10-13) 
+# [v.0.11.0](https://github.com/upb-uc4/hlf-network/compare/v0.10.2...v0.11.0) (2020-10-26) 
+
+## Feature
+
+ - Add credentials stored in k8s secrets for usernames and passwords
+ - Add secrets containing credentials to lagom namespace (credentials.scala-admin-org1, credentials.scala-registration-admin-org1)
+ - Add development script with faster restart times that uses alternating clusters 
+ - Add dind container to each peer's Pod
+
+## Refactor 
+
+ - Name service ports
+ - Change https listen ports of tls-ca, rca-org0, rca-org1, rca-org2 to 7052
+
+
+# [v.0.10.2](https://github.com/upb-uc4/hlf-network/compare/v0.10.1...v0.10.2) (2020-10-20) 
+
+## Refactor
+
+ - Provide secrets and configmap to lagom namespace
+ - Change paths in connection_profile_kubernetes
+
+
+# [v.0.10.1](https://github.com/upb-uc4/hlf-network/compare/v0.10.0...v0.10.1) (2020-10-20) 
+
+## Refactor
+
+ - Generate usernames and passwords of CAs into k8s secrets
+ - Replace Jobs by initContainers to keep data on the same Pod (e.g. enrollment and use of credentials)
+ - Remove templating behavior by moving functionality in the network
+ - Generate genesis block in the orderers Pod instead of the start script
+ - Reduce shared mounts to a minimum
+
+
+# [v.0.10.0](https://github.com/upb-uc4/hlf-network/compare/v0.9.0...v0.10.0) (2020-10-13) 
 
 ## Documentation
 

README.md

@@ -9,34 +9,33 @@ https://hyperledger-fabric-ca.readthedocs.io/en/latest/operations_guide.html).
 
 ## Table of Contents
 
-- [Hyperledger Fabric Network on Kubernetes](#hyperledger-fabric-network-on-kubernetes)
   * [Introduction](#introduction)
   * [Table of Contents](#table-of-contents)
   * [Getting Started](#getting-started)
-    + [Kubernetes Cluster](#kubernetes-cluster)
-    + [Deploy the Network](#deploy-the-network)
-    + [Kubernetes Dashboard](#kubernetes-dashboard)
+    * [Kubernetes Cluster](#kubernetes-cluster)
+    * [Deploy the Network](#deploy-the-network)
+    * [Kubernetes Dashboard](#kubernetes-dashboard)
   * [Network Topology](#network-topology)
   * [Deployment Steps](#deployment-steps)
-    + [TLS-CA](#tls-ca)
-    + [Organizations and Enrollment-CAs](#organizations-and-enrollment-cas)
-    + [Orderer](#orderer)
-    + [CLIs and Channel Creation](#clis-and-channel-creation)
-    + [Install and Invoke Chaincode](#install-and-invoke-chaincode)
-    + [Further Readings](#further-readings)
+    * [TLS-CA](#tls-ca)
+    * [Organizations and Enrollment-CAs](#organizations-and-enrollment-cas)
+    * [Orderer](#orderer)
+    * [CLIs and Channel Creation](#clis-and-channel-creation)
+    * [Install and Invoke Chaincode](#install-and-invoke-chaincode)
+    * [Further Readings](#further-readings)
   * [For Developers](#for-developers)
-    + [Project Structure](#project-structure)
-      - [Main Scripts](#main-scripts)
-      - [MSP Directories](#msp-directories)
-    + [Implementation Details](#implementation-details)
-    + [Using kubectl](#using-kubectl)
-    + [Debugging](#debugging)
+    * [Project Structure](#project-structure)
+      * [Main Scripts](#main-scripts)
+      * [MSP Directories](#msp-directories)
+    * [Implementation Details](#implementation-details)
+    * [Using kubectl](#using-kubectl)
+    * [Debugging](#debugging)
   * [Changelog](#changelog)
   * [Versions](#versions)
   * [License](#license)
   * [Troubleshooting](#troubleshooting)
 
-<small><i><a href='http://ecotrust-canada.github.io/markdown-toc/'>Table of contents generated with markdown-toc</a></i></small>
+---
 
 ## Getting Started
 
@@ -53,7 +52,8 @@ To delete the cluster, run ```kind delete cluster```, to remove all files ```sud
 To deploy the network, execute ```./deploy.sh -v -b [chaincode branch or tag] -c [cluster mount]```.
 The ```-b``` tag can be used to specify a chaincode tag or branch (develop is default). Use the ```-v``` for verbose output. The ```-c``` option allows to specify the mount path for hyperledger. The default folder matches the configuration of the development cluster.
 
-You can use ```kubectl get all -n hlf``` to check the status of the network.
+For development, you can use ```./restart.sh``` for fast deployment and restarting, the script uses two clusters which are created in the background and restarted automatically to reduce startup times.
+The script offers the same flags as ```deploy.sh```.
 
 ### Kubernetes Dashboard