upgrade litmus portal version (#2353)

Signed-off-by: Raj Babu Das <[email protected]>
litmuschaos · Nov 15, 2020 · d479836 · d479836
1 parent 9200d82
commit d479836
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 139 deletions.
diff --git a/litmus-portal/README.md b/litmus-portal/README.md
@@ -17,9 +17,9 @@ Litmus-Portal provides console and UI experience for managing, monitoring, and e
 ## **Installation**
 
 #### Applying k8s manifest
-> Alpha 1 (Stable)
+> Alpha 2 (Stable)
 ```bash
-kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.9.x/litmus-portal/cluster-k8s-manifest.yml
+kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.10.x/litmus-portal/cluster-k8s-manifest.yml
 ```
 
 Or
@@ -78,9 +78,9 @@ View the User Guide <b>[here](https://docs.google.com/document/d/1fiN25BrZpvqg0U
 
 ### **Uninstallation**
 
-> Alpha 1 (Stable)
+> Alpha 2 (Stable)
 ```bash
-kubectl delete -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.9.x/litmus-portal/cluster-k8s-manifest.yml
+kubectl delete -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.10.x/litmus-portal/cluster-k8s-manifest.yml
 ```
 
 Or

diff --git a/litmus-portal/cluster-k8s-manifest.yml b/litmus-portal/cluster-k8s-manifest.yml
@@ -36,7 +36,7 @@ spec:
     spec:
       containers:
         - name: litmusportal-frontend
-          image: litmuschaos/litmusportal-frontend:ci
+          image: litmuschaos/litmusportal-frontend:1.10.0
           imagePullPolicy: Always
           ports:
             - containerPort: 8080
@@ -115,7 +115,7 @@ spec:
     spec:
       containers:
         - name: graphql-server
-          image: litmuschaos/litmusportal-server:ci
+          image: litmuschaos/litmusportal-server:1.10.0
           env:
             - name: DB_SERVER
               valueFrom:
@@ -156,22 +156,22 @@ spec:
             - name: PORTAL_SCOPE
               value: "cluster"
             - name: SUBSCRIBER_IMAGE
-              value: "litmuschaos/litmusportal-subscriber:ci"
+              value: "litmuschaos/litmusportal-subscriber:1.10.0"
             - name: ARGO_SERVER_IMAGE
               value: "argoproj/argocli:v2.9.3"
             - name: ARGO_WORKFLOW_CONTROLLER_IMAGE
               value: "argoproj/workflow-controller:v2.9.3"
             - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
               value: "argoproj/argoexec:v2.9.3"
             - name: LITMUS_CHAOS_OPERATOR_IMAGE
-              value: "litmuschaos/chaos-operator:1.8.2"
+              value: "litmuschaos/chaos-operator:1.10.0"
             - name: LITMUS_CHAOS_RUNNER_IMAGE
-              value: "litmuschaos/chaos-runner:1.8.2"
+              value: "litmuschaos/chaos-runner:1.10.0"
           ports:
             - containerPort: 8080
           imagePullPolicy: Always
         - name: auth-server
-          image: litmuschaos/litmusportal-auth-server:ci
+          image: litmuschaos/litmusportal-auth-server:1.10.0
           env:
             - name: DB_SERVER
               valueFrom:

diff --git a/litmus-portal/graphql-server/manifests/cluster-subscriber.yml b/litmus-portal/graphql-server/manifests/cluster-subscriber.yml
@@ -534,16 +534,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description:
-            "APIVersion defines the versioned schema of this representation
+          description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
-          description:
-            "Kind is a string value representing the REST resource this
+          description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds"
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -567,10 +565,10 @@ spec:
               properties:
                 appkind:
                   type: string
-                  pattern: ^(deployment|statefulset|daemonset|deploymentconfig)$
+                  pattern: ^(^$|deployment|statefulset|daemonset|deploymentconfig|rollout)$
                 applabel:
-                  pattern: ([a-z0-9A-Z_\.-/]+)=([a-z0-9A-Z_\.-/_]+)
                   type: string
+                  pattern: (([a-z0-9A-Z_\.-/]+)=([a-z0-9A-Z_\.-/_]+)|^$)
                 appns:
                   type: string
             auxiliaryAppInfo:
@@ -614,14 +612,16 @@ spec:
                   spec:
                     type: object
                     properties:
-                      k8sProbe:
+                      probe:
                         type: array
                         items:
                           type: object
                           properties:
                             name:
                               type: string
-                            inputs:
+                            type:
+                              type: string
+                            k8sProbe/inputs:
                               type: object
                               properties:
                                 command:
@@ -637,27 +637,11 @@ spec:
                                       type: string
                                     fieldSelector:
                                       type: string
+                                    labelSelector:
+                                      type: string
                                 expectedResult:
                                   type: string
-                            runProperties:
-                              type: object
-                              properties:
-                                probeTimeout:
-                                  type: integer
-                                interval:
-                                  type: integer
-                                retry:
-                                  type: integer
-                            mode:
-                              type: string
-                      cmdProbe:
-                        type: array
-                        items:
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            inputs:
+                            cmdProbe/inputs:
                               type: object
                               properties:
                                 command:
@@ -666,25 +650,7 @@ spec:
                                   type: string
                                 source:
                                   type: string
-                            runProperties:
-                              type: object
-                              properties:
-                                probeTimeout:
-                                  type: integer
-                                interval:
-                                  type: integer
-                                retry:
-                                  type: integer
-                            mode:
-                              type: string
-                      httpProbe:
-                        type: array
-                        items:
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            inputs:
+                            httpProbe/inputs:
                               type: object
                               properties:
                                 url:
@@ -758,6 +724,7 @@ spec:
                                   minLength: 1
                                   allowEmptyValue: false
 
+
         status:
           type: object
   version: v1alpha1
@@ -784,16 +751,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description:
-            "APIVersion defines the versioned schema of this representation
+          description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
-          description:
-            "Kind is a string value representing the REST resource this
+          description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds"
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -934,16 +899,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description:
-            "APIVersion defines the versioned schema of this representation
+          description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
-          description:
-            "Kind is a string value representing the REST resource this
+          description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds"
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

diff --git a/litmus-portal/litmus-portal-crds.yml b/litmus-portal/litmus-portal-crds.yml
@@ -82,16 +82,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description:
-            "APIVersion defines the versioned schema of this representation
+          description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
-          description:
-            "Kind is a string value representing the REST resource this
+          description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds"
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -115,10 +113,10 @@ spec:
               properties:
                 appkind:
                   type: string
-                  pattern: ^(deployment|statefulset|daemonset|deploymentconfig)$
+                  pattern: ^(^$|deployment|statefulset|daemonset|deploymentconfig|rollout)$
                 applabel:
-                  pattern: ([a-z0-9A-Z_\.-/]+)=([a-z0-9A-Z_\.-/_]+)
                   type: string
+                  pattern: (([a-z0-9A-Z_\.-/]+)=([a-z0-9A-Z_\.-/_]+)|^$)
                 appns:
                   type: string
             auxiliaryAppInfo:
@@ -162,14 +160,16 @@ spec:
                   spec:
                     type: object
                     properties:
-                      k8sProbe:
+                      probe:
                         type: array
                         items:
                           type: object
                           properties:
                             name:
                               type: string
-                            inputs:
+                            type:
+                              type: string
+                            k8sProbe/inputs:
                               type: object
                               properties:
                                 command:
@@ -185,27 +185,11 @@ spec:
                                       type: string
                                     fieldSelector:
                                       type: string
+                                    labelSelector:
+                                      type: string
                                 expectedResult:
                                   type: string
-                            runProperties:
-                              type: object
-                              properties:
-                                probeTimeout:
-                                  type: integer
-                                interval:
-                                  type: integer
-                                retry:
-                                  type: integer
-                            mode:
-                              type: string
-                      cmdProbe:
-                        type: array
-                        items:
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            inputs:
+                            cmdProbe/inputs:
                               type: object
                               properties:
                                 command:
@@ -214,25 +198,7 @@ spec:
                                   type: string
                                 source:
                                   type: string
-                            runProperties:
-                              type: object
-                              properties:
-                                probeTimeout:
-                                  type: integer
-                                interval:
-                                  type: integer
-                                retry:
-                                  type: integer
-                            mode:
-                              type: string
-                      httpProbe:
-                        type: array
-                        items:
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            inputs:
+                            httpProbe/inputs:
                               type: object
                               properties:
                                 url:
@@ -306,6 +272,7 @@ spec:
                                   minLength: 1
                                   allowEmptyValue: false
 
+
         status:
           type: object
   version: v1alpha1
@@ -332,16 +299,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description:
-            "APIVersion defines the versioned schema of this representation
+          description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
-          description:
-            "Kind is a string value representing the REST resource this
+          description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds"
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -482,16 +447,14 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description:
-            "APIVersion defines the versioned schema of this representation
+          description: 'APIVersion defines the versioned schema of this representation
             of an object. Servers should convert recognized schemas to the latest
-            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources"
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
           type: string
         kind:
-          description:
-            "Kind is a string value representing the REST resource this
+          description: 'Kind is a string value representing the REST resource this
             object represents. Servers may infer this from the endpoint the client
-            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds"
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object
@@ -503,4 +466,4 @@ spec:
   versions:
     - name: v1alpha1
       served: true
-      storage: true
+      storage: true