Common:

- reactivated build and deployment of DLT Gateway component

deploy.sh

@@ -124,13 +124,13 @@ for COMPONENT in $TFS_COMPONENTS; do
                 PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-connector.log"
                 docker push "$IMAGE_URL" > "$PUSH_LOG"
 
-                #IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-gateway:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
+                IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-gateway:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
 
-                #TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-gateway.log"
-                #docker tag "$COMPONENT-gateway:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
+                TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-gateway.log"
+                docker tag "$COMPONENT-gateway:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
 
-                #PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-gateway.log"
-                #docker push "$IMAGE_URL" > "$PUSH_LOG"
+                PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-gateway.log"
+                docker push "$IMAGE_URL" > "$PUSH_LOG"
             else
                 IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
 
@@ -162,9 +162,9 @@ for COMPONENT in $TFS_COMPONENTS; do
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-connector:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-connector:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
 
-            #IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-gateway:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
-            #VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" | cut -d ":" -f3)
-            #sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
+            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-gateway:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
+            VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" | cut -d ":" -f3)
+            sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
         else
             IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
@@ -184,8 +184,8 @@ for COMPONENT in $TFS_COMPONENTS; do
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-connector:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-connector:${VERSION}#image: $COMPONENT-connector:$TFS_IMAGE_TAG#g" "$MANIFEST"
 
-            #VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" | cut -d ":" -f3)
-            #sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $COMPONENT-gateway:$TFS_IMAGE_TAG#g" "$MANIFEST"
+            VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-gateway:" "$MANIFEST" | cut -d ":" -f3)
+            sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $COMPONENT-gateway:$TFS_IMAGE_TAG#g" "$MANIFEST"
         else
             VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
             sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $COMPONENT:$TFS_IMAGE_TAG#g" "$MANIFEST"

manifests/dltservice.yaml

@@ -35,11 +35,11 @@ spec:
         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"
+        ## 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"]
@@ -53,30 +53,30 @@ spec:
           limits:
             cpu: 500m
             memory: 512Mi
-#      - name: gateway
-#        image: registry.gitlab.com/teraflow-h2020/controller/dlt-gateway:latest
-#        imagePullPolicy: Always
-#        ports:
-#        - containerPort: 50051
-#        #readinessProbe:
-#        #  httpGet:
-#        #    path: /health
-#        #    port: 8081
-#        #  initialDelaySeconds: 5
-#        #  timeoutSeconds: 5
-#        #livenessProbe:
-#        #  httpGet:
-#        #    path: /health
-#        #    port: 8081
-#        #  initialDelaySeconds: 5
-#        #  timeoutSeconds: 5
-#        resources:
-#          requests:
-#            cpu: 200m
-#            memory: 512Mi
-#          limits:
-#            cpu: 700m
-#            memory: 1024Mi
+      - name: gateway
+        image: registry.gitlab.com/teraflow-h2020/controller/dlt-gateway:latest
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 50051
+        #readinessProbe:
+        #  httpGet:
+        #    path: /health
+        #    port: 8081
+        #  initialDelaySeconds: 5
+        #  timeoutSeconds: 5
+        #livenessProbe:
+        #  httpGet:
+        #    path: /health
+        #    port: 8081
+        #  initialDelaySeconds: 5
+        #  timeoutSeconds: 5
+        resources:
+          requests:
+            cpu: 200m
+            memory: 512Mi
+          limits:
+            cpu: 700m
+            memory: 1024Mi
 ---
 apiVersion: v1
 kind: Service