From c9195bbfd4e50d25fc1c5f25a7945601a85628ef Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Tue, 27 Sep 2022 13:13:07 +0000
Subject: [PATCH] Cleanup ECOC'22 demo experiment
---
manifests/webuiservice.yaml | 82 ++++++++++++++++++-------------------
scripts/show_logs_slice.sh | 2 +-
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/manifests/webuiservice.yaml b/manifests/webuiservice.yaml
index 1390e99da..4c399861a 100644
--- a/manifests/webuiservice.yaml
+++ b/manifests/webuiservice.yaml
@@ -35,7 +35,7 @@ spec:
image: registry.gitlab.com/teraflow-h2020/controller/webui:latest
imagePullPolicy: Always
ports:
- - containerPort: 8004 # TODO: define the real port
+ - containerPort: 8004
env:
- name: LOG_LEVEL
value: "DEBUG"
@@ -60,43 +60,43 @@ spec:
limits:
cpu: 700m
memory: 1024Mi
-# - name: grafana
-# image: grafana/grafana:8.2.6
-# imagePullPolicy: IfNotPresent
-# ports:
-# - containerPort: 3000
-# name: http-grafana
-# protocol: TCP
-# env:
-# - name: GF_SERVER_ROOT_URL
-# value: "http://0.0.0.0:3000/grafana/"
-# - name: GF_SERVER_SERVE_FROM_SUB_PATH
-# value: "true"
-# readinessProbe:
-# failureThreshold: 3
-# httpGet:
-# path: /robots.txt
-# port: 3000
-# scheme: HTTP
-# initialDelaySeconds: 10
-# periodSeconds: 30
-# successThreshold: 1
-# timeoutSeconds: 2
-# livenessProbe:
-# failureThreshold: 3
-# initialDelaySeconds: 30
-# periodSeconds: 10
-# successThreshold: 1
-# tcpSocket:
-# port: 3000
-# timeoutSeconds: 1
-# resources:
-# requests:
-# cpu: 250m
-# memory: 750Mi
-# limits:
-# cpu: 700m
-# memory: 1024Mi
+ - name: grafana
+ image: grafana/grafana:8.2.6
+ imagePullPolicy: IfNotPresent
+ ports:
+ - containerPort: 3000
+ name: http-grafana
+ protocol: TCP
+ env:
+ - name: GF_SERVER_ROOT_URL
+ value: "http://0.0.0.0:3000/grafana/"
+ - name: GF_SERVER_SERVE_FROM_SUB_PATH
+ value: "true"
+ readinessProbe:
+ failureThreshold: 3
+ httpGet:
+ path: /robots.txt
+ port: 3000
+ scheme: HTTP
+ initialDelaySeconds: 10
+ periodSeconds: 30
+ successThreshold: 1
+ timeoutSeconds: 2
+ livenessProbe:
+ failureThreshold: 3
+ initialDelaySeconds: 30
+ periodSeconds: 10
+ successThreshold: 1
+ tcpSocket:
+ port: 3000
+ timeoutSeconds: 1
+ resources:
+ requests:
+ cpu: 250m
+ memory: 750Mi
+ limits:
+ cpu: 700m
+ memory: 1024Mi
---
apiVersion: v1
kind: Service
@@ -110,6 +110,6 @@ spec:
- name: webui
port: 8004
targetPort: 8004
-# - name: grafana
-# port: 3000
-# targetPort: 3000
+ - name: grafana
+ port: 3000
+ targetPort: 3000
diff --git a/scripts/show_logs_slice.sh b/scripts/show_logs_slice.sh
index 7c699ce92..c7bc0b695 100755
--- a/scripts/show_logs_slice.sh
+++ b/scripts/show_logs_slice.sh
@@ -18,7 +18,7 @@
########################################################################################################################
# If not already set, set the name of the Kubernetes namespace to deploy to.
-export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs-dev"}
+export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
########################################################################################################################
# Automated steps start here
--
GitLab