diff --git a/litmus-portal/README.md b/litmus-portal/README.md index 8dadd61f728..912eadf0625 100644 --- 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 -> Beta 0 (Stable) +> Beta 1 (Stable) ```bash -kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.11.x/litmus-portal/cluster-k8s-manifest.yml +kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.12.x/litmus-portal/cluster-k8s-manifest.yml ``` Or @@ -78,9 +78,9 @@ View the User Guide [here](https://docs.google.com/document/d/1fiN25BrZpvqg0U ### **Uninstallation** -> Beta 0 (Stable) +> Beta 1 (Stable) ```bash -kubectl delete -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.11.x/litmus-portal/cluster-k8s-manifest.yml +kubectl delete -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.12.x/litmus-portal/cluster-k8s-manifest.yml ``` Or diff --git a/litmus-portal/cluster-k8s-manifest.yml b/litmus-portal/cluster-k8s-manifest.yml index 54adf5ffd05..fe490872f4b 100644 --- a/litmus-portal/cluster-k8s-manifest.yml +++ b/litmus-portal/cluster-k8s-manifest.yml @@ -164,9 +164,9 @@ spec: - name: ARGO_WORKFLOW_EXECUTOR_IMAGE value: "argoproj/argoexec:v2.9.3" - name: LITMUS_CHAOS_OPERATOR_IMAGE - value: "litmuschaos/chaos-operator:1.11.0" + value: "litmuschaos/chaos-operator:1.12.0" - name: LITMUS_CHAOS_RUNNER_IMAGE - value: "litmuschaos/chaos-runner:1.11.0" + value: "litmuschaos/chaos-runner:1.12.0" ports: - containerPort: 8080 imagePullPolicy: Always diff --git a/litmus-portal/graphql-server/manifests/cluster/2a_litmus_crds.yaml b/litmus-portal/graphql-server/manifests/cluster/2a_litmus_crds.yaml index 6b2d296d61e..bdae91a62ab 100644 --- a/litmus-portal/graphql-server/manifests/cluster/2a_litmus_crds.yaml +++ b/litmus-portal/graphql-server/manifests/cluster/2a_litmus_crds.yaml @@ -55,7 +55,7 @@ spec: type: string engineState: type: string - pattern: ^(active|stop|initialized|stopped)$ + pattern: ^(active|stop)$ chaosServiceAccount: type: string components: @@ -94,6 +94,8 @@ spec: type: array items: type: object + required: + - runProperties properties: name: type: string @@ -166,6 +168,11 @@ spec: type: string runProperties: type: object + minProperties: 3 + required: + - probeTimeout + - interval + - retry properties: probeTimeout: type: integer diff --git a/litmus-portal/graphql-server/manifests/cluster/2b_litmus_rbac.yaml b/litmus-portal/graphql-server/manifests/cluster/2b_litmus_rbac.yaml index e67eecff217..8b5e38b9b05 100644 --- a/litmus-portal/graphql-server/manifests/cluster/2b_litmus_rbac.yaml +++ b/litmus-portal/graphql-server/manifests/cluster/2b_litmus_rbac.yaml @@ -5,6 +5,13 @@ metadata: name: litmus-cluster-scope namespace: #{AGENT-NAMESPACE} labels: + app.kubernetes.io/name: litmus + # provide unique instance-id if applicable + # app.kubernetes.io/instance: litmus-abcxzy + app.kubernetes.io/version: v1.12.0 + app.kubernetes.io/component: operator-serviceaccount + app.kubernetes.io/part-of: litmus + app.kubernetes.io/managed-by: kubectl name: litmus-cluster-scope --- apiVersion: rbac.authorization.k8s.io/v1 @@ -12,6 +19,13 @@ kind: ClusterRole metadata: name: litmus-cluster-scope labels: + app.kubernetes.io/name: litmus + # provide unique instance-id if applicable + # app.kubernetes.io/instance: litmus-abcxzy + app.kubernetes.io/version: v1.12.0 + app.kubernetes.io/component: operator-clusterrole + app.kubernetes.io/part-of: litmus + app.kubernetes.io/managed-by: kubectl name: litmus-cluster-scope rules: - apiGroups: [""] @@ -41,6 +55,13 @@ kind: ClusterRoleBinding metadata: name: litmus-cluster-scope labels: + app.kubernetes.io/name: litmus + # provide unique instance-id if applicable + # app.kubernetes.io/instance: litmus-abcxzy + app.kubernetes.io/version: v1.12.0 + app.kubernetes.io/component: operator-clusterrolebinding + app.kubernetes.io/part-of: litmus + app.kubernetes.io/managed-by: kubectl name: litmus-cluster-scope roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/litmus-portal/graphql-server/manifests/cluster/2c_litmus_deployment.yaml b/litmus-portal/graphql-server/manifests/cluster/2c_litmus_deployment.yaml index a067a7580d8..53a1c73ab32 100644 --- a/litmus-portal/graphql-server/manifests/cluster/2c_litmus_deployment.yaml +++ b/litmus-portal/graphql-server/manifests/cluster/2c_litmus_deployment.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/name: litmus # provide unique instance-id if applicable # app.kubernetes.io/instance: litmus-abcxzy - app.kubernetes.io/version: latest + app.kubernetes.io/version: v1.12.0 app.kubernetes.io/component: operator app.kubernetes.io/part-of: litmus app.kubernetes.io/managed-by: kubectl diff --git a/litmus-portal/graphql-server/manifests/namespace/ 2b_litmus_deployment.yaml b/litmus-portal/graphql-server/manifests/namespace/ 2b_litmus_deployment.yaml index f5c68efc488..5b66bd2fb72 100644 --- a/litmus-portal/graphql-server/manifests/namespace/ 2b_litmus_deployment.yaml +++ b/litmus-portal/graphql-server/manifests/namespace/ 2b_litmus_deployment.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/name: litmus # provide unique instance-id if applicable # app.kubernetes.io/instance: litmus-abcxzy - app.kubernetes.io/version: latest + app.kubernetes.io/version: v1.12.0 app.kubernetes.io/component: operator app.kubernetes.io/part-of: litmus app.kubernetes.io/managed-by: kubectl diff --git a/litmus-portal/graphql-server/manifests/namespace/2a_litmus_rbac.yaml b/litmus-portal/graphql-server/manifests/namespace/2a_litmus_rbac.yaml index 38a8cd3a1a1..4ad631b0f97 100644 --- a/litmus-portal/graphql-server/manifests/namespace/2a_litmus_rbac.yaml +++ b/litmus-portal/graphql-server/manifests/namespace/2a_litmus_rbac.yaml @@ -5,6 +5,13 @@ metadata: name: litmus-namespace-scope namespace: #{AGENT-NAMESPACE} labels: + app.kubernetes.io/name: litmus + # provide unique instance-id if applicable + # app.kubernetes.io/instance: litmus-abcxzy + app.kubernetes.io/version: v1.12.0 + app.kubernetes.io/component: operator-serviceaccount + app.kubernetes.io/part-of: litmus + app.kubernetes.io/managed-by: kubectl name: litmus-namespace-scope --- apiVersion: rbac.authorization.k8s.io/v1beta1 @@ -13,6 +20,13 @@ metadata: name: litmus-namespace-scope namespace: #{AGENT-NAMESPACE} labels: + app.kubernetes.io/name: litmus + # provide unique instance-id if applicable + # app.kubernetes.io/instance: litmus-abcxzy + app.kubernetes.io/version: v1.12.0 + app.kubernetes.io/component: operator-role + app.kubernetes.io/part-of: litmus + app.kubernetes.io/managed-by: kubectl name: litmus-namespace-scope rules: - apiGroups: [""] @@ -43,6 +57,13 @@ metadata: name: litmus-namespace-scope namespace: #{AGENT-NAMESPACE} labels: + app.kubernetes.io/name: litmus + # provide unique instance-id if applicable + # app.kubernetes.io/instance: litmus-abcxzy + app.kubernetes.io/version: v1.12.0 + app.kubernetes.io/component: operator-rolebinding + app.kubernetes.io/part-of: litmus + app.kubernetes.io/managed-by: kubectl name: litmus-namespace-scope roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/litmus-portal/litmus-portal-crds.yml b/litmus-portal/litmus-portal-crds.yml index 6c8e42b7ad3..4437c36a7b6 100644 --- a/litmus-portal/litmus-portal-crds.yml +++ b/litmus-portal/litmus-portal-crds.yml @@ -122,7 +122,7 @@ spec: type: string engineState: type: string - pattern: ^(active|stop|initialized|stopped)$ + pattern: ^(active|stop)$ chaosServiceAccount: type: string components: @@ -161,6 +161,8 @@ spec: type: array items: type: object + required: + - runProperties properties: name: type: string @@ -233,12 +235,17 @@ spec: type: string runProperties: type: object + minProperties: 3 + required: + - probeTimeout + - interval + - retry properties: probeTimeout: type: integer interval: type: integer - retry: + retry: type: integer probePollingInterval: type: integer diff --git a/litmus-portal/namespaced-K8s-template.yml b/litmus-portal/namespaced-K8s-template.yml index 3360aa5a618..0f4cc4bd5f9 100644 --- a/litmus-portal/namespaced-K8s-template.yml +++ b/litmus-portal/namespaced-K8s-template.yml @@ -170,9 +170,9 @@ spec: - name: ARGO_WORKFLOW_EXECUTOR_IMAGE value: "argoproj/argoexec:v2.9.3" - name: LITMUS_CHAOS_OPERATOR_IMAGE - value: "litmuschaos/chaos-operator:1.11.0" + value: "litmuschaos/chaos-operator:1.12.0" - name: LITMUS_CHAOS_RUNNER_IMAGE - value: "litmuschaos/chaos-runner:1.11.0" + value: "litmuschaos/chaos-runner:1.12.0" ports: - containerPort: 8080 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 index 4a4eb9f5b18..cf1139b639c 100644 --- a/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml +++ b/litmus-portal/platforms/okteto/litmus-portal-dev-manifest-template.yml @@ -162,9 +162,9 @@ spec: - name: ARGO_WORKFLOW_EXECUTOR_IMAGE value: "argoproj/argoexec:v2.9.3" - name: LITMUS_CHAOS_OPERATOR_IMAGE - value: "litmuschaos/chaos-operator:1.11.0" + value: "litmuschaos/chaos-operator:1.12.0" - name: LITMUS_CHAOS_RUNNER_IMAGE - value: "litmuschaos/chaos-runner:1.11.0" + value: "litmuschaos/chaos-runner:1.12.0" ports: - containerPort: 8080 imagePullPolicy: Always