Skip to content
Snippets Groups Projects
Commit 57dcd983 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Common: 

- reactivated build and deployment of DLT Gateway component
parent 4c06c9f5
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!24Integrate NFV-SDN'22 demo
Hide whitespace changes
Inline Side-by-side
deploy.sh
+ 10
− 10
View file @ 57dcd983
...@@ -124,13 +124,13 @@ for COMPONENT in $TFS_COMPONENTS; do ...@@ -124,13 +124,13 @@ for COMPONENT in $TFS_COMPONENTS; do
PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-connector.log" PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-connector.log"
docker push "$IMAGE_URL" > "$PUSH_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" TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-gateway.log"
#docker tag "$COMPONENT-gateway:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG" docker tag "$COMPONENT-gateway:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
#PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-gateway.log" PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-gateway.log"
#docker push "$IMAGE_URL" > "$PUSH_LOG" docker push "$IMAGE_URL" > "$PUSH_LOG"
else else
IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g') 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 ...@@ -162,9 +162,9 @@ for COMPONENT in $TFS_COMPONENTS; do
VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-connector:" "$MANIFEST" | cut -d ":" -f3) 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" 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') 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) 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" sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"
else else
IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g') 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) VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3)
...@@ -184,8 +184,8 @@ for COMPONENT in $TFS_COMPONENTS; do ...@@ -184,8 +184,8 @@ for COMPONENT in $TFS_COMPONENTS; do
VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-connector:" "$MANIFEST" | cut -d ":" -f3) 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" 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) 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" sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-gateway:${VERSION}#image: $COMPONENT-gateway:$TFS_IMAGE_TAG#g" "$MANIFEST"
else else
VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}:" "$MANIFEST" | cut -d ":" -f3) 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" sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT:${VERSION}#image: $COMPONENT:$TFS_IMAGE_TAG#g" "$MANIFEST"
......
manifests/dltservice.yaml
+ 29
− 29
View file @ 57dcd983
...@@ -35,11 +35,11 @@ spec: ...@@ -35,11 +35,11 @@ spec:
env: env:
- name: LOG_LEVEL - name: LOG_LEVEL
value: "INFO" value: "INFO"
# for debug purposes ## for debug purposes
- name: DLT_GATEWAY_HOST #- name: DLT_GATEWAY_HOST
value: "mock-blockchain.tfs-bchain.svc.cluster.local" # value: "mock-blockchain.tfs-bchain.svc.cluster.local"
- name: DLT_GATEWAY_PORT #- name: DLT_GATEWAY_PORT
value: "50051" # value: "50051"
readinessProbe: readinessProbe:
exec: exec:
command: ["/bin/grpc_health_probe", "-addr=:8080"] command: ["/bin/grpc_health_probe", "-addr=:8080"]
...@@ -53,30 +53,30 @@ spec: ...@@ -53,30 +53,30 @@ spec:
limits: limits:
cpu: 500m cpu: 500m
memory: 512Mi memory: 512Mi
# - name: gateway - name: gateway
# image: registry.gitlab.com/teraflow-h2020/controller/dlt-gateway:latest image: registry.gitlab.com/teraflow-h2020/controller/dlt-gateway:latest
# imagePullPolicy: Always imagePullPolicy: Always
# ports: ports:
# - containerPort: 50051 - containerPort: 50051
# #readinessProbe: #readinessProbe:
# # httpGet: # httpGet:
# # path: /health # path: /health
# # port: 8081 # port: 8081
# # initialDelaySeconds: 5 # initialDelaySeconds: 5
# # timeoutSeconds: 5 # timeoutSeconds: 5
# #livenessProbe: #livenessProbe:
# # httpGet: # httpGet:
# # path: /health # path: /health
# # port: 8081 # port: 8081
# # initialDelaySeconds: 5 # initialDelaySeconds: 5
# # timeoutSeconds: 5 # timeoutSeconds: 5
# resources: resources:
# requests: requests:
# cpu: 200m cpu: 200m
# memory: 512Mi memory: 512Mi
# limits: limits:
# cpu: 700m cpu: 700m
# memory: 1024Mi memory: 1024Mi
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment