update logs and deployment manifests (#3176)

* update logs and deployment manifests Signed-off-by: Soumya Ghosh Dastidar <[email protected]> * updated okteto manifest Signed-off-by: Soumya Ghosh Dastidar <[email protected]>
litmuschaos · Aug 27, 2021 · 7a88df7 · 7a88df7
1 parent a69bd5c
commit 7a88df7
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 933 deletions.
diff --git a/litmus-portal/cluster-agents/subscriber/go.sum b/litmus-portal/cluster-agents/subscriber/go.sum
diff --git a/litmus-portal/cluster-agents/subscriber/pkg/requests/webhook.go b/litmus-portal/cluster-agents/subscriber/pkg/requests/webhook.go
@@ -28,7 +28,7 @@ func ClusterConnect(clusterData map[string]string) {
 
 	c, _, err := websocket.DefaultDialer.Dial(u.String(), nil)
 	if err != nil {
-		logrus.Fatal("dial:", err)
+		logrus.WithError(err).Fatal("failed to open websocket connection")
 	}
 	defer c.Close()
 
@@ -39,12 +39,12 @@ func ClusterConnect(clusterData map[string]string) {
 		}
 		data, err := json.Marshal(payload)
 		if err != nil {
-			logrus.WithError(err).Fatal("failed to write message")
+			logrus.WithError(err).Fatal("failed to marshal message")
 		}
 
 		err = c.WriteMessage(websocket.TextMessage, data)
 		if err != nil {
-			logrus.WithError(err).Fatal("failed to write message")
+			logrus.WithError(err).Fatal("failed to write message after init")
 			return
 		}
 
@@ -56,7 +56,7 @@ func ClusterConnect(clusterData map[string]string) {
 		data, err = json.Marshal(payload)
 		err = c.WriteMessage(websocket.TextMessage, data)
 		if err != nil {
-			logrus.WithError(err).Fatal("failed to write message")
+			logrus.WithError(err).Fatal("failed to write message after start")
 			return
 		}
 	}()

diff --git a/litmus-portal/cluster-agents/subscriber/subscriber.go b/litmus-portal/cluster-agents/subscriber/subscriber.go
@@ -57,21 +57,21 @@ func init() {
 
 	isConfirmed, newKey, err := k8s.IsClusterConfirmed()
 	if err != nil {
-		logrus.Fatal(err)
+		logrus.WithError(err).Fatal("failed to check cluster confirmed status")
 	}
 
 	if isConfirmed == true {
 		clusterData["ACCESS_KEY"] = newKey
 	} else if isConfirmed == false {
 		clusterConfirmByte, err := k8s.ClusterConfirm(clusterData)
 		if err != nil {
-			logrus.Fatal(err)
+			logrus.WithError(err).WithField("data", string(clusterConfirmByte)).Fatal("failed to confirm cluster")
 		}
 
 		var clusterConfirmInterface types.Payload
 		err = json.Unmarshal(clusterConfirmByte, &clusterConfirmInterface)
 		if err != nil {
-			logrus.Fatal(err)
+			logrus.WithError(err).WithField("data", string(clusterConfirmByte)).Fatal("failed to parse cluster confirm data")
 		}
 
 		if clusterConfirmInterface.Data.ClusterConfirm.IsClusterConfirmed == true {

diff --git a/litmus-portal/cluster-k8s-manifest.yml b/litmus-portal/cluster-k8s-manifest.yml
@@ -461,10 +461,10 @@ metadata:
   name: litmus-portal-admin-config
   namespace: litmus
 data:
-  AgentScope: cluster
-  AgentNamespace: litmus
-  DataBaseServer: "mongodb://mongo-service:27017"
-  JWTSecret: "litmus-portal@123"
+  AGENT_SCOPE: cluster
+  AGENT_NAMESPACE: litmus
+  DB_SERVER: "mongodb://mongo-service:27017"
+  JWT_SECRET: "litmus-portal@123"
   DB_USER: "admin"
   DB_PASSWORD: "1234"
   VERSION: "ci"
@@ -497,7 +497,7 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: litmus-portal-admin-config
-                  key: AgentScope
+                  key: AGENT_SCOPE
 ---
 apiVersion: v1
 kind: Service
@@ -541,48 +541,16 @@ spec:
       containers:
         - name: graphql-server
           image: litmuschaos/litmusportal-server:ci
+          envFrom:
+            - configMapRef:
+                name: litmus-portal-admin-config
           env:
-            - name: VERSION
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: VERSION
-            - name: DB_SERVER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DataBaseServer
-            - name: JWT_SECRET
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: JWTSecret
             - name: SELF_CLUSTER
               value: "true"
-            - name: AGENT_SCOPE
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: AgentScope
-            - name: AGENT_NAMESPACE
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: AgentNamespace
             - name: LITMUS_PORTAL_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: DB_USER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_PASSWORD
             - name: PORTAL_SCOPE
               value: "cluster"
             - name: SUBSCRIBER_IMAGE
@@ -620,29 +588,12 @@ spec:
           imagePullPolicy: Always
         - name: auth-server
           image: litmuschaos/litmusportal-auth-server:ci
+          envFrom:
+            - configMapRef:
+                name: litmus-portal-admin-config
           env:
             - name: STRICT_PASSWORD_POLICY
               value: "false"
-            - name: DB_SERVER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DataBaseServer
-            - name: JWT_SECRET
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: JWTSecret
-            - name: DB_USER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_PASSWORD
             - name: ADMIN_USERNAME
               value: "admin"
             - name: ADMIN_PASSWORD

diff --git a/litmus-portal/namespaced-k8s-template.yml b/litmus-portal/namespaced-k8s-template.yml
@@ -468,10 +468,10 @@ kind: ConfigMap
 metadata:
   name: litmus-portal-admin-config
 data:
-  AgentScope: namespace
-  AgentNamespace: ${LITMUS_PORTAL_NAMESPACE}
-  DataBaseServer: "mongodb://mongo-service:27017"
-  JWTSecret: "litmus-portal@123"
+  AGENT_SCOPE: namespace
+  AGENT_NAMESPACE: ${LITMUS_PORTAL_NAMESPACE}
+  DB_SERVER: "mongodb://mongo-service:27017"
+  JWT_SECRET: "litmus-portal@123"
   DB_USER: "admin"
   DB_PASSWORD: "1234"
   VERSION: "ci"
@@ -503,7 +503,7 @@ spec:
               valueFrom:
                 configMapKeyRef:
                   name: litmus-portal-admin-config
-                  key: AgentScope
+                  key: AGENT_SCOPE
 ---
 apiVersion: v1
 kind: Service
@@ -537,48 +537,16 @@ spec:
       containers:
         - name: graphql-server
           image: litmuschaos/litmusportal-server:ci
+          envFrom:
+            - configMapRef:
+                name: litmus-portal-admin-config
           env:
-            - name: VERSION
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: VERSION
-            - name: DB_SERVER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DataBaseServer
-            - name: JWT_SECRET
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: JWTSecret
             - name: LITMUS_PORTAL_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SELF_CLUSTER
               value: "true"
-            - name: AGENT_SCOPE
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: AgentScope
-            - name: AGENT_NAMESPACE
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: AgentNamespace
-            - name: DB_USER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_PASSWORD
             - name: PORTAL_SCOPE
               value: "namespace"
             - name: AGENT_DEPLOYMENTS
@@ -608,33 +576,16 @@ spec:
           imagePullPolicy: Always
         - name: auth-server
           image: litmuschaos/litmusportal-auth-server:ci
+          envFrom:
+            - configMapRef:
+                name: litmus-portal-admin-config
           env:
             - name: STRICT_PASSWORD_POLICY
               value: "false"
-            - name: DB_SERVER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DataBaseServer
-            - name: JWT_SECRET
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: JWTSecret
             - name: ADMIN_USERNAME
               value: "admin"
             - name: ADMIN_PASSWORD
               value: "litmus"
-            - name: DB_USER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_PASSWORD
           ports:
             - containerPort: 3000
           imagePullPolicy: Always

diff --git a/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml b/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml
@@ -468,10 +468,10 @@ kind: ConfigMap
 metadata:
   name: litmus-portal-admin-config
 data:
-  AgentScope: namespace
-  AgentNamespace: ${OKTETO_NAMESPACE}
-  DataBaseServer: "mongodb://mongo-service:27017"
-  JWTSecret: "litmus-portal@123"
+  AGENT_SCOPE: namespace
+  AGENT_NAMESPACE: ${OKTETO_NAMESPACE}
+  DB_SERVER: "mongodb://mongo-service:27017"
+  JWT_SECRET: "litmus-portal@123"
   DB_USER: "admin"
   DB_PASSWORD: "1234"
   VERSION: "ci"
@@ -540,45 +540,10 @@ spec:
               cpu: 200m
               memory: 400Mi
           env:
-            - name: VERSION
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: VERSION
-            - name: DB_SERVER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DataBaseServer
-            - name: JWT_SECRET
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: JWTSecret
             - name: LITMUS_PORTAL_NAMESPACE
               value: ${OKTETO_NAMESPACE}
             - name: SELF_CLUSTER
               value: "true"
-            - name: AGENT_SCOPE
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: AgentScope
-            - name: AGENT_NAMESPACE
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: AgentNamespace
-            - name: DB_USER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_PASSWORD
             - name: PORTAL_SCOPE
               value: "namespace"
             - name: AGENT_DEPLOYMENTS
@@ -612,29 +577,12 @@ spec:
             limits:
               cpu: 200m
               memory: 250Mi
+          envFrom:
+            - configMapRef:
+                name: litmus-portal-admin-config
           env:
             - name: STRICT_PASSWORD_POLICY
               value: "false"
-            - name: DB_SERVER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DataBaseServer
-            - name: JWT_SECRET
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: JWTSecret
-            - name: DB_USER
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                configMapKeyRef:
-                  name: litmus-portal-admin-config
-                  key: DB_PASSWORD
             - name: ADMIN_USERNAME
               value: "admin"
             - name: ADMIN_PASSWORD
@@ -690,6 +638,9 @@ spec:
           volumeMounts:
             - name: mongo-persistent-storage
               mountPath: /data/db
+          envFrom:
+            - configMapRef:
+                name: litmus-portal-admin-config
           env:
             - name: MONGO_INITDB_ROOT_USERNAME
               valueFrom:

diff --git a/...agents/control-plane/upgrade-agent.t.yaml → ...e-agents/control-plane/upgrade-agent.yaml b/...agents/control-plane/upgrade-agent.t.yaml → ...e-agents/control-plane/upgrade-agent.yaml
@@ -13,6 +13,6 @@ spec:
           image: litmuschaos/upgrade-agent-cp:ci
           envFrom:
             - configMapRef:
-                name: chaos-litmus-admin-config
+                name: litmus-portal-admin-config
           imagePullPolicy: Always
       restartPolicy: Never