Pre-merge code cleanup

manifests/dltservice.yaml

@@ -20,7 +20,7 @@ data:
   CHANNEL_NAME: "channel1"
   CHAINCODE_NAME: "adrenalineDLT"
   MSP_ID: "Org1MSP"
-  PEER_ENDPOINT: "10.1.1.96:7051"  #Change to required peer#
+  PEER_ENDPOINT: "10.1.1.96:7051" #Change to required peer#
   PEER_HOST_ALIAS: "peer0.org1.adrenaline.com"
   CRYPTO_PATH: "/test-network/organizations/peerOrganizations/org1.adrenaline.com"
   KEY_DIRECTORY_PATH: "/etc/hyperledger/fabric-keystore/keystore"
@@ -28,7 +28,6 @@ data:
   TLS_CERT_PATH: "/etc/hyperledger/fabric-ca-crt/ca.crt"
 
 ---
-
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -44,111 +43,110 @@ spec:
     spec:
       terminationGracePeriodSeconds: 5
       containers:
-      - name: connector
-        image: labs.etsi.org:5050/tfs/controller/dlt-connector:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-        - containerPort: 9192
-        env:
-        - name: LOG_LEVEL
-          value: "INFO"
-          ## for debug purposes
-          #- name: DLT_GATEWAY_HOST
-          #  value: "mock-blockchain.tfs-bchain.svc.cluster.local"
-          #- name: DLT_GATEWAY_PORT
-          #  value: "50051"
-        readinessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:8080"]
-        livenessProbe:
-          exec:
-            command: ["/bin/grpc_health_probe", "-addr=:8080"]
-        resources:
-          requests:
-            cpu: 50m
-            memory: 64Mi
-          limits:
-            cpu: 500m
-            memory: 512Mi
-      - name: gateway
-        image: labs.etsi.org:5050/tfs/controller/dlt-gateway:latest
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 50051
-        resources:
-          requests:
-            cpu: 200m
-            memory: 512Mi
-          limits:
-            cpu: 700m
-            memory: 1024Mi
-        volumeMounts:
-        - mountPath: /test-network
-          name: dlt-volume
-          readOnly: true
+        - name: connector
+          image: labs.etsi.org:5050/tfs/controller/dlt-connector:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 8080
+            - containerPort: 9192
+          env:
+            - name: LOG_LEVEL
+              value: "INFO"
+              ## for debug purposes
+              #- name: DLT_GATEWAY_HOST
+              #  value: "mock-blockchain.tfs-bchain.svc.cluster.local"
+              #- name: DLT_GATEWAY_PORT
+              #  value: "50051"
+          readinessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:8080"]
+          livenessProbe:
+            exec:
+              command: ["/bin/grpc_health_probe", "-addr=:8080"]
+          resources:
+            requests:
+              cpu: 50m
+              memory: 64Mi
+            limits:
+              cpu: 500m
+              memory: 512Mi
+        - name: gateway
+          image: labs.etsi.org:5050/tfs/controller/dlt-gateway:latest
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 50051
+          resources:
+            requests:
+              cpu: 200m
+              memory: 512Mi
+            limits:
+              cpu: 700m
+              memory: 1024Mi
+          volumeMounts:
+            - mountPath: /test-network
+              name: dlt-volume
+              readOnly: true
+            - name: keystore
+              mountPath: /etc/hyperledger/fabric-keystore
+              readOnly: true
+            - name: signcerts
+              mountPath: /etc/hyperledger/fabric-signcerts
+              readOnly: true
+            - name: ca-crt
+              mountPath: /etc/hyperledger/fabric-ca-crt
+              readOnly: true
+          env:
+            - name: CHANNEL_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: dlt-config
+                  key: CHANNEL_NAME
+            - name: CHAINCODE_NAME
+              valueFrom:
+                configMapKeyRef:
+                  name: dlt-config
+                  key: CHAINCODE_NAME
+            - name: MSP_ID
+              valueFrom:
+                configMapKeyRef:
+                  name: dlt-config
+                  key: MSP_ID
+            - name: PEER_ENDPOINT
+              valueFrom:
+                configMapKeyRef:
+                  name: dlt-config
+                  key: PEER_ENDPOINT
+            - name: PEER_HOST_ALIAS
+              valueFrom:
+                configMapKeyRef:
+                  name: dlt-config
+                  key: PEER_HOST_ALIAS
+            - name: CRYPTO_PATH
+              valueFrom:
+                configMapKeyRef:
+                  name: dlt-config
+                  key: CRYPTO_PATH
+            - name: KEY_DIRECTORY_PATH
+              value: "/etc/hyperledger/fabric-keystore/keystore"
+            - name: CERT_DIRECTORY_PATH
+              value: "/etc/hyperledger/fabric-signcerts/signcerts.pem"
+            - name: TLS_CERT_PATH
+              value: "/etc/hyperledger/fabric-ca-crt/ca.crt"
+      volumes:
+        - name: dlt-volume
+          persistentVolumeClaim:
+            claimName: dlt-pvc
         - name: keystore
-          mountPath: /etc/hyperledger/fabric-keystore
-          readOnly: true
+          secret:
+            secretName: dlt-keystone
         - name: signcerts
-          mountPath: /etc/hyperledger/fabric-signcerts
-          readOnly: true
+          secret:
+            secretName: dlt-signcerts
         - name: ca-crt
-          mountPath: /etc/hyperledger/fabric-ca-crt
-          readOnly: true
-        env:
-        - name: CHANNEL_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: dlt-config
-              key: CHANNEL_NAME
-        - name: CHAINCODE_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: dlt-config
-              key: CHAINCODE_NAME
-        - name: MSP_ID
-          valueFrom:
-            configMapKeyRef:
-              name: dlt-config
-              key: MSP_ID
-        - name: PEER_ENDPOINT
-          valueFrom:
-            configMapKeyRef:
-              name: dlt-config
-              key: PEER_ENDPOINT
-        - name: PEER_HOST_ALIAS
-          valueFrom:
-            configMapKeyRef:
-              name: dlt-config
-              key: PEER_HOST_ALIAS
-        - name: CRYPTO_PATH
-          valueFrom:
-            configMapKeyRef:
-              name: dlt-config
-              key: CRYPTO_PATH
-        - name: KEY_DIRECTORY_PATH
-          value: "/etc/hyperledger/fabric-keystore/keystore"
-        - name: CERT_DIRECTORY_PATH
-          value: "/etc/hyperledger/fabric-signcerts/signcerts.pem"
-        - name: TLS_CERT_PATH
-          value: "/etc/hyperledger/fabric-ca-crt/ca.crt"
-      volumes:
-      - name: dlt-volume
-        persistentVolumeClaim:
-          claimName: dlt-pvc
-      - name: keystore
-        secret:
-          secretName: dlt-keystone
-      - name: signcerts
-        secret:
-          secretName: dlt-signcerts
-      - name: ca-crt
-        secret:
-          secretName: dlt-ca-crt
+          secret:
+            secretName: dlt-ca-crt
 
 ---
-
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -161,7 +159,6 @@ spec:
       storage: 1Gi
 
 ---
-
 apiVersion: v1
 kind: PersistentVolume
 metadata:
@@ -173,12 +170,11 @@ spec:
     - ReadOnlyMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: "/home/ubuntu/fabric-samples/test-network"  #Update to correct host paths where the MSP is located.
+    path: "/home/ubuntu/fabric-samples/test-network" #Update to correct host paths where the MSP is located.
   claimRef:
     name: dlt-pvc
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata:
@@ -194,7 +190,6 @@ spec:
   type: NodePort
 
 ---
-
 apiVersion: v1
 kind: Service
 metadata: