From 72cf365059b16a5d59ab8c0e5fe8a2b3f0397064 Mon Sep 17 00:00:00 2001 From: Vedant Shrotria Date: Sat, 13 Aug 2022 01:29:46 +0530 Subject: [PATCH] Upgraded litmus charts to 2.12.0 ChaosCenter (#269) Signed-off-by: Vedant Signed-off-by: Vedant Co-authored-by: Vedant --- charts/litmus/Chart.yaml | 4 +-- charts/litmus/README.md | 33 ++++++++++--------- .../litmus/templates/server-cluster-role.yaml | 6 ++++ .../litmus/templates/server-deployment.yaml | 4 --- charts/litmus/templates/server-role.yaml | 6 ++++ charts/litmus/values.yaml | 31 ++++++++--------- 6 files changed, 47 insertions(+), 37 deletions(-) diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 25d7bd36..4379c41a 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.11.0" +appVersion: "2.12.0" description: A Helm chart to install ChaosCenter name: litmus -version: 2.12.1 +version: 2.13.0 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index 2476e7a2..f07496dc 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 2.12.1](https://img.shields.io/badge/Version-2.12.1-informational?style=flat-square) ![AppVersion: 2.11.0](https://img.shields.io/badge/AppVersion-2.11.0-informational?style=flat-square) +![Version: 2.13.0](https://img.shields.io/badge/Version-2.13.0-informational?style=flat-square) ![AppVersion: 2.12.0](https://img.shields.io/badge/AppVersion-2.12.0-informational?style=flat-square) A Helm chart to install ChaosCenter @@ -47,7 +47,7 @@ $ helm install litmus-portal litmuschaos/litmus | adminConfig.DB_SERVER | string | `""` | | | adminConfig.JWTSecret | string | `"litmus-portal@123"` | | | adminConfig.SKIP_SSL_VERIFY | string | `"false"` | | -| adminConfig.VERSION | string | `"2.11.0"` | | +| adminConfig.VERSION | string | `"2.12.0"` | | | customLabels | object | `{}` | Additional labels | | existingSecret | string | `""` | Use existing secret (e.g., External Secrets) | | image.imagePullSecrets | list | `[]` | | @@ -73,7 +73,7 @@ $ helm install litmus-portal litmuschaos/litmus | portal.frontend.customLabels | object | `{}` | | | portal.frontend.image.pullPolicy | string | `"Always"` | | | portal.frontend.image.repository | string | `"litmusportal-frontend"` | | -| portal.frontend.image.tag | string | `"2.11.0"` | | +| portal.frontend.image.tag | string | `"2.12.0"` | | | portal.frontend.livenessProbe.failureThreshold | int | `5` | | | portal.frontend.livenessProbe.initialDelaySeconds | int | `30` | | | portal.frontend.livenessProbe.periodSeconds | int | `10` | | @@ -109,7 +109,7 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.authServer.env.LITMUS_GQL_GRPC_PORT | string | `":8000"` | | | portal.server.authServer.image.pullPolicy | string | `"Always"` | | | portal.server.authServer.image.repository | string | `"litmusportal-auth-server"` | | -| portal.server.authServer.image.tag | string | `"2.11.0"` | | +| portal.server.authServer.image.tag | string | `"2.12.0"` | | | portal.server.authServer.ports[0].containerPort | int | `3030` | | | portal.server.authServer.ports[0].name | string | `"auth-server"` | | | portal.server.authServer.ports[1].containerPort | int | `3000` | | @@ -130,24 +130,25 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.graphqlServer.genericEnv.AGENT_DEPLOYMENTS | string | `"[\"app=chaos-exporter\", \"name=chaos-operator\", \"app=event-tracker\", \"app=workflow-controller\"]"` | | | portal.server.graphqlServer.genericEnv.CHAOS_CENTER_UI_ENDPOINT | string | `""` | | | portal.server.graphqlServer.genericEnv.CONTAINER_RUNTIME_EXECUTOR | string | `"k8sapi"` | | -| portal.server.graphqlServer.genericEnv.HUB_BRANCH_NAME | string | `"v2.10.x"` | | +| portal.server.graphqlServer.genericEnv.HUB_BRANCH_NAME | string | `"v2.11.x"` | | | portal.server.graphqlServer.genericEnv.LITMUS_AUTH_GRPC_PORT | string | `":3030"` | | +| portal.server.graphqlServer.genericEnv.REMOTE_HUB_MAX_SIZE | string | `"5000000"` | | | portal.server.graphqlServer.genericEnv.SELF_AGENT | string | `"true"` | | | portal.server.graphqlServer.genericEnv.SELF_AGENT_NODE_SELECTOR | string | `""` | | | portal.server.graphqlServer.genericEnv.SELF_AGENT_TOLERATIONS | string | `""` | | | portal.server.graphqlServer.genericEnv.TLS_CERT_64 | string | `""` | | | portal.server.graphqlServer.genericEnv.TLS_SECRET_NAME | string | `""` | | -| portal.server.graphqlServer.genericEnv.WORKFLOW_HELPER_IMAGE_VERSION | string | `"2.10.0"` | | +| portal.server.graphqlServer.genericEnv.WORKFLOW_HELPER_IMAGE_VERSION | string | `"2.11.0"` | | | portal.server.graphqlServer.image.pullPolicy | string | `"Always"` | | | portal.server.graphqlServer.image.repository | string | `"litmusportal-server"` | | -| portal.server.graphqlServer.image.tag | string | `"2.11.0"` | | -| portal.server.graphqlServer.imageEnv.ARGO_WORKFLOW_CONTROLLER_IMAGE | string | `"workflow-controller:v3.2.9"` | | -| portal.server.graphqlServer.imageEnv.ARGO_WORKFLOW_EXECUTOR_IMAGE | string | `"argoexec:v3.2.9"` | | -| portal.server.graphqlServer.imageEnv.EVENT_TRACKER_IMAGE | string | `"litmusportal-event-tracker:2.11.0"` | | -| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_EXPORTER_IMAGE | string | `"chaos-exporter:2.10.0"` | | -| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_OPERATOR_IMAGE | string | `"chaos-operator:2.10.0"` | | -| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_RUNNER_IMAGE | string | `"chaos-runner:2.10.0"` | | -| portal.server.graphqlServer.imageEnv.SUBSCRIBER_IMAGE | string | `"litmusportal-subscriber:2.11.0"` | | +| portal.server.graphqlServer.image.tag | string | `"2.12.0"` | | +| portal.server.graphqlServer.imageEnv.ARGO_WORKFLOW_CONTROLLER_IMAGE | string | `"workflow-controller:v3.3.1"` | | +| portal.server.graphqlServer.imageEnv.ARGO_WORKFLOW_EXECUTOR_IMAGE | string | `"argoexec:v3.3.1"` | | +| portal.server.graphqlServer.imageEnv.EVENT_TRACKER_IMAGE | string | `"litmusportal-event-tracker:2.12.0"` | | +| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_EXPORTER_IMAGE | string | `"chaos-exporter:2.11.0"` | | +| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_OPERATOR_IMAGE | string | `"chaos-operator:2.11.0"` | | +| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_RUNNER_IMAGE | string | `"chaos-runner:2.11.0"` | | +| portal.server.graphqlServer.imageEnv.SUBSCRIBER_IMAGE | string | `"litmusportal-subscriber:2.12.0"` | | | portal.server.graphqlServer.livenessProbe.failureThreshold | int | `5` | | | portal.server.graphqlServer.livenessProbe.initialDelaySeconds | int | `30` | | | portal.server.graphqlServer.livenessProbe.periodSeconds | int | `10` | | @@ -196,7 +197,7 @@ $ helm install litmus-portal litmuschaos/litmus | portal.server.updateStrategy | object | `{}` | | | portal.server.waitForMongodb.image.pullPolicy | string | `"Always"` | | | portal.server.waitForMongodb.image.repository | string | `"curl"` | | -| portal.server.waitForMongodb.image.tag | string | `"2.10.0"` | | +| portal.server.waitForMongodb.image.tag | string | `"2.11.0"` | | | portal.server.waitForMongodb.resources.limits.cpu | string | `"250m"` | | | portal.server.waitForMongodb.resources.limits.ephemeral-storage | string | `"1Gi"` | | | portal.server.waitForMongodb.resources.limits.memory | string | `"512Mi"` | | @@ -207,7 +208,7 @@ $ helm install litmus-portal litmuschaos/litmus | upgradeAgent.affinity | object | `{}` | | | upgradeAgent.controlPlane.image.pullPolicy | string | `"Always"` | | | upgradeAgent.controlPlane.image.repository | string | `"upgrade-agent-cp"` | | -| upgradeAgent.controlPlane.image.tag | string | `"2.11.0"` | | +| upgradeAgent.controlPlane.image.tag | string | `"2.12.0"` | | | upgradeAgent.controlPlane.restartPolicy | string | `"OnFailure"` | | | upgradeAgent.nodeSelector | object | `{}` | | | upgradeAgent.resources | object | `{}` | | diff --git a/charts/litmus/templates/server-cluster-role.yaml b/charts/litmus/templates/server-cluster-role.yaml index 119fc39d..d21e815f 100644 --- a/charts/litmus/templates/server-cluster-role.yaml +++ b/charts/litmus/templates/server-cluster-role.yaml @@ -22,6 +22,9 @@ rules: - apiGroups: [argoproj.io] resources: [workflowtemplates, workflowtemplates/finalizers, clusterworkflowtemplates, clusterworkflowtemplates/finalizers, workflowtasksets] verbs: [get, list, watch] +- apiGroups: [argoproj.io] + resources: [workflowtaskresults] + verbs: [list, watch, deletecollection] - apiGroups: [""] resources: [serviceaccounts] verbs: [get, list] @@ -67,6 +70,9 @@ rules: - apiGroups: [apiextensions.k8s.io] resources: [customresourcedefinitions] verbs: [list, get] + - apiGroups: ["litmuschaos.io"] + resources: ["chaosengines/finalizers"] + verbs: ["update"] --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole diff --git a/charts/litmus/templates/server-deployment.yaml b/charts/litmus/templates/server-deployment.yaml index 5072afb8..041d5eb9 100644 --- a/charts/litmus/templates/server-deployment.yaml +++ b/charts/litmus/templates/server-deployment.yaml @@ -106,10 +106,6 @@ spec: value: {{ .Values.portalScope }} - name: SERVER_SERVICE_NAME value: {{ include "litmus-portal.fullname" . }}-server-service - {{- if eq .Values.portalScope "namespace" }} - - name: PORTAL_ENDPOINT - value: "http://{{ include "litmus-portal.fullname" . }}-server-service:{{ .Values.portal.server.service.graphqlServer.port }}" - {{- end }} - name: INGRESS value: "{{ .Values.ingress.enabled }}" - name: INGRESS_NAME diff --git a/charts/litmus/templates/server-role.yaml b/charts/litmus/templates/server-role.yaml index 03f3d81d..52ff513a 100644 --- a/charts/litmus/templates/server-role.yaml +++ b/charts/litmus/templates/server-role.yaml @@ -23,6 +23,9 @@ rules: - apiGroups: [argoproj.io] resources: [workflowtemplates, workflowtemplates/finalizers,workflowtasksets] verbs: [get, list, watch] +- apiGroups: [argoproj.io] + resources: [workflowtaskresults] + verbs: [list, watch, deletecollection] - apiGroups: [""] resources: [serviceaccounts] verbs: [get, list] @@ -77,6 +80,9 @@ rules: - apiGroups: [litmuschaos.io] resources: [chaosengines, chaosexperiments, chaosresults] verbs: [get, create, update, patch, delete, list, watch, deletecollection] +- apiGroups: ["litmuschaos.io"] + resources: ["chaosengines/finalizers"] + verbs: ["update"] #these permissions are required to apply https://github.com/litmuschaos/litmus/blob/master/litmus-portal/graphql-server/manifests/namespace/3a_agents_rbac.yaml --- apiVersion: rbac.authorization.k8s.io/v1 diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index a678ea2c..c162fa10 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -16,7 +16,7 @@ existingSecret: "" adminConfig: JWTSecret: "litmus-portal@123" - VERSION: "2.11.0" + VERSION: "2.12.0" SKIP_SSL_VERIFY: "false" # -- leave empty if uses Mongo DB deployed by this chart DBPASSWORD: "" @@ -56,7 +56,7 @@ upgradeAgent: controlPlane: image: repository: upgrade-agent-cp - tag: "2.11.0" + tag: "2.12.0" pullPolicy: "Always" restartPolicy: OnFailure nodeSelector: {} @@ -96,7 +96,7 @@ portal: runAsNonRoot: true image: repository: litmusportal-frontend - tag: 2.11.0 + tag: 2.12.0 pullPolicy: "Always" containerPort: 8080 customLabels: {} @@ -158,7 +158,7 @@ portal: waitForMongodb: image: repository: curl - tag: 2.10.0 + tag: 2.11.0 pullPolicy: "Always" resources: # We usually recommend not to specify default resources and to leave this as a conscious @@ -191,7 +191,7 @@ portal: readOnlyRootFilesystem: true image: repository: litmusportal-server - tag: 2.11.0 + tag: 2.12.0 pullPolicy: "Always" ports: - name: gql-server @@ -199,13 +199,13 @@ portal: - name: gql-rpc-server containerPort: 8000 imageEnv: - SUBSCRIBER_IMAGE: "litmusportal-subscriber:2.11.0" - EVENT_TRACKER_IMAGE: "litmusportal-event-tracker:2.11.0" - ARGO_WORKFLOW_CONTROLLER_IMAGE: "workflow-controller:v3.2.9" - ARGO_WORKFLOW_EXECUTOR_IMAGE: "argoexec:v3.2.9" - LITMUS_CHAOS_OPERATOR_IMAGE: "chaos-operator:2.10.0" - LITMUS_CHAOS_RUNNER_IMAGE: "chaos-runner:2.10.0" - LITMUS_CHAOS_EXPORTER_IMAGE: "chaos-exporter:2.10.0" + SUBSCRIBER_IMAGE: "litmusportal-subscriber:2.12.0" + EVENT_TRACKER_IMAGE: "litmusportal-event-tracker:2.12.0" + ARGO_WORKFLOW_CONTROLLER_IMAGE: "workflow-controller:v3.3.1" + ARGO_WORKFLOW_EXECUTOR_IMAGE: "argoexec:v3.3.1" + LITMUS_CHAOS_OPERATOR_IMAGE: "chaos-operator:2.11.0" + LITMUS_CHAOS_RUNNER_IMAGE: "chaos-runner:2.11.0" + LITMUS_CHAOS_EXPORTER_IMAGE: "chaos-exporter:2.11.0" genericEnv: TLS_SECRET_NAME: "" TLS_CERT_64: "" @@ -213,10 +213,11 @@ portal: SELF_AGENT_NODE_SELECTOR: "" SELF_AGENT_TOLERATIONS: "" CONTAINER_RUNTIME_EXECUTOR: "k8sapi" - HUB_BRANCH_NAME: "v2.10.x" + HUB_BRANCH_NAME: "v2.11.x" AGENT_DEPLOYMENTS: '["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"]' LITMUS_AUTH_GRPC_PORT: ":3030" - WORKFLOW_HELPER_IMAGE_VERSION: "2.10.0" + WORKFLOW_HELPER_IMAGE_VERSION: "2.11.0" + REMOTE_HUB_MAX_SIZE: "5000000" # Provide UI endpoint if using namespaced scope CHAOS_CENTER_UI_ENDPOINT: "" resources: @@ -252,7 +253,7 @@ portal: automountServiceAccountToken: false image: repository: litmusportal-auth-server - tag: 2.11.0 + tag: 2.12.0 pullPolicy: "Always" ports: - name: auth-server