From a45ffdaedad42a85c89406292e0d745fd95f4a73 Mon Sep 17 00:00:00 2001 From: Vedant Shrotria Date: Wed, 18 Sep 2024 22:09:42 +0530 Subject: [PATCH] Added 3.11.x changes for ChaosCenter & Helm-Agent (#403) * Added litmusctl changes Signed-off-by: Jonsy13 * Added litmusctl changes Signed-off-by: Jonsy13 * Added litmusctl changes Signed-off-by: Jonsy13 --------- Signed-off-by: Jonsy13 --- README.md | 2 +- charts/litmus-agent/Chart.yaml | 12 ++++----- charts/litmus-agent/README.md | 12 ++++----- .../charts/chaos-exporter/Chart.yaml | 4 +-- .../charts/chaos-exporter/README.md | 2 +- .../charts/chaos-operator/Chart.yaml | 4 +-- .../charts/chaos-operator/README.md | 2 +- .../charts/event-tracker/Chart.yaml | 4 +-- .../charts/event-tracker/README.md | 2 +- .../litmus-agent/charts/subscriber/Chart.yaml | 4 +-- .../litmus-agent/charts/subscriber/README.md | 2 +- charts/litmus-agent/templates/secret.yaml | 2 +- charts/litmus-agent/values.yaml | 2 +- charts/litmus/Chart.yaml | 4 +-- charts/litmus/README.md | 26 +++++++++---------- charts/litmus/values.yaml | 24 ++++++++--------- 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index c6f0fecc..aa2680e2 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ helm install litmus-agent litmuschaos/litmus-agent \ --set "LITMUS_PROJECT_ID=" \ --set "global.INFRA_MODE=namespace" \ --set "crds.create=false" \ ---set "workflow-controller.crds.create=false +--set "workflow-controller.crds.create=false" ``` #### Install the external agent in cluster mode diff --git a/charts/litmus-agent/Chart.yaml b/charts/litmus-agent/Chart.yaml index 85a78d76..d6947698 100644 --- a/charts/litmus-agent/Chart.yaml +++ b/charts/litmus-agent/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.11.2" description: A Helm chart to install litmus agent name: litmus-agent -version: 3.10.0 +version: 3.11.2 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: @@ -21,16 +21,16 @@ maintainers: icon: https://raw.githubusercontent.com/litmuschaos/icons/master/litmus.png dependencies: - name: chaos-operator - version: 3.10.0 + version: 3.11.0 condition: chaos-operator.enabled - name: chaos-exporter - version: 3.10.0 + version: 3.11.0 condition: chaos-exporter.enabled - name: event-tracker - version: 3.10.0 + version: 3.11.0 condition: event-tracker.enabled - name: subscriber - version: 3.10.0 + version: 3.11.0 condition: subscriber.enabled - name: workflow-controller version: 0.2.1 diff --git a/charts/litmus-agent/README.md b/charts/litmus-agent/README.md index 38ac1453..8c43d8f8 100644 --- a/charts/litmus-agent/README.md +++ b/charts/litmus-agent/README.md @@ -1,6 +1,6 @@ # litmus-agent -![Version: 3.10.0](https://img.shields.io/badge/Version-3.10.0-informational?style=flat-square) ![AppVersion: 3.10.0](https://img.shields.io/badge/AppVersion-3.10.0-informational?style=flat-square) +![Version: 3.11.2](https://img.shields.io/badge/Version-3.11.2-informational?style=flat-square) ![AppVersion: 3.11.2](https://img.shields.io/badge/AppVersion-3.11.2-informational?style=flat-square) A Helm chart to install litmus agent @@ -24,10 +24,10 @@ Kubernetes: `>=1.16.0-0` | Repository | Name | Version | |------------|------|---------| -| | chaos-exporter | 3.10.0 | -| | chaos-operator | 3.10.0 | -| | event-tracker | 3.10.0 | -| | subscriber | 3.10.0 | +| | chaos-exporter | 3.11.0 | +| | chaos-operator | 3.11.0 | +| | event-tracker | 3.11.0 | +| | subscriber | 3.11.0 | | | workflow-controller | 0.2.1 | ## Installing the Chart @@ -53,7 +53,7 @@ $ helm install litmus-agent litmuschaos/litmus-agent \ | Key | Type | Default | Description | |-----|------|---------|-------------| -| APP_VERSION | string | `"3.10.0"` | | +| APP_VERSION | string | `"3.11.0"` | | | INFRA_DESCRIPTION | string | `"chaos infrastructure deployed with helm"` | | | INFRA_NAME | string | `"helm-infrastructure"` | | | INFRA_NODE_SELECTOR | string | `""` | | diff --git a/charts/litmus-agent/charts/chaos-exporter/Chart.yaml b/charts/litmus-agent/charts/chaos-exporter/Chart.yaml index d1f0d325..a1666cd5 100644 --- a/charts/litmus-agent/charts/chaos-exporter/Chart.yaml +++ b/charts/litmus-agent/charts/chaos-exporter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.11.0" description: A Helm chart to install chaos-exporter name: chaos-exporter -version: 3.10.0 +version: 3.11.0 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus-agent/charts/chaos-exporter/README.md b/charts/litmus-agent/charts/chaos-exporter/README.md index f5399391..b093d8af 100644 --- a/charts/litmus-agent/charts/chaos-exporter/README.md +++ b/charts/litmus-agent/charts/chaos-exporter/README.md @@ -1,6 +1,6 @@ # chaos-exporter -![Version: 3.10.0](https://img.shields.io/badge/Version-3.10.0-informational?style=flat-square) ![AppVersion: 3.10.0](https://img.shields.io/badge/AppVersion-3.10.0-informational?style=flat-square) +![Version: 3.11.0](https://img.shields.io/badge/Version-3.11.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square) A Helm chart to install chaos-exporter diff --git a/charts/litmus-agent/charts/chaos-operator/Chart.yaml b/charts/litmus-agent/charts/chaos-operator/Chart.yaml index 66c84fb5..eeb73e6e 100644 --- a/charts/litmus-agent/charts/chaos-operator/Chart.yaml +++ b/charts/litmus-agent/charts/chaos-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.11.0" description: A Helm chart to install chaos-operator name: chaos-operator -version: 3.10.0 +version: 3.11.0 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus-agent/charts/chaos-operator/README.md b/charts/litmus-agent/charts/chaos-operator/README.md index 5a65e75f..52f8c1a3 100644 --- a/charts/litmus-agent/charts/chaos-operator/README.md +++ b/charts/litmus-agent/charts/chaos-operator/README.md @@ -1,6 +1,6 @@ # chaos-operator -![Version: 3.10.0](https://img.shields.io/badge/Version-3.10.0-informational?style=flat-square) ![AppVersion: 3.10.0](https://img.shields.io/badge/AppVersion-3.10.0-informational?style=flat-square) +![Version: 3.11.0](https://img.shields.io/badge/Version-3.11.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square) A Helm chart to install chaos-operator diff --git a/charts/litmus-agent/charts/event-tracker/Chart.yaml b/charts/litmus-agent/charts/event-tracker/Chart.yaml index 033da768..8e560325 100644 --- a/charts/litmus-agent/charts/event-tracker/Chart.yaml +++ b/charts/litmus-agent/charts/event-tracker/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.11.0" description: A Helm chart to install event-tracker name: event-tracker -version: 3.10.0 +version: 3.11.0 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus-agent/charts/event-tracker/README.md b/charts/litmus-agent/charts/event-tracker/README.md index 70c06404..84adba17 100644 --- a/charts/litmus-agent/charts/event-tracker/README.md +++ b/charts/litmus-agent/charts/event-tracker/README.md @@ -1,6 +1,6 @@ # event-tracker -![Version: 3.10.0](https://img.shields.io/badge/Version-3.10.0-informational?style=flat-square) ![AppVersion: 3.10.0](https://img.shields.io/badge/AppVersion-3.10.0-informational?style=flat-square) +![Version: 3.11.0](https://img.shields.io/badge/Version-3.11.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square) A Helm chart to install event-tracker diff --git a/charts/litmus-agent/charts/subscriber/Chart.yaml b/charts/litmus-agent/charts/subscriber/Chart.yaml index afb7b1b9..13debc5d 100644 --- a/charts/litmus-agent/charts/subscriber/Chart.yaml +++ b/charts/litmus-agent/charts/subscriber/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.11.0" description: A Helm chart to install subscriber name: subscriber -version: 3.10.0 +version: 3.11.0 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus-agent/charts/subscriber/README.md b/charts/litmus-agent/charts/subscriber/README.md index 65f2b412..38bea00e 100644 --- a/charts/litmus-agent/charts/subscriber/README.md +++ b/charts/litmus-agent/charts/subscriber/README.md @@ -1,6 +1,6 @@ # subscriber -![Version: 3.10.0](https://img.shields.io/badge/Version-3.10.0-informational?style=flat-square) ![AppVersion: 3.10.0](https://img.shields.io/badge/AppVersion-3.10.0-informational?style=flat-square) +![Version: 3.11.0](https://img.shields.io/badge/Version-3.11.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square) A Helm chart to install subscriber diff --git a/charts/litmus-agent/templates/secret.yaml b/charts/litmus-agent/templates/secret.yaml index 8fe8703a..ae059aa3 100644 --- a/charts/litmus-agent/templates/secret.yaml +++ b/charts/litmus-agent/templates/secret.yaml @@ -16,7 +16,7 @@ data: {{- if .Values.LITMUS_BACKEND_URL }} LITMUS_BACKEND_URL: {{ ((printf "%s/query" .Values.LITMUS_BACKEND_URL )) | b64enc | quote }} {{- else }} - LITMUS_BACKEND_URL: {{ ((printf "%s/ws/query" .Values.LITMUS_URL )) | b64enc | quote }} + LITMUS_BACKEND_URL: {{ ((printf "%s/api/query" .Values.LITMUS_URL )) | b64enc | quote }} {{- end }} LITMUS_USERNAME: {{ .Values.LITMUS_USERNAME | b64enc | quote }} LITMUS_PASSWORD: {{ .Values.LITMUS_PASSWORD | b64enc | quote }} diff --git a/charts/litmus-agent/values.yaml b/charts/litmus-agent/values.yaml index a3bc7de1..b544dd39 100644 --- a/charts/litmus-agent/values.yaml +++ b/charts/litmus-agent/values.yaml @@ -17,7 +17,7 @@ SA_EXISTS: true NS_EXISTS: true INFRA_TYPE: "external" # For compatibility with ChaosCenter, Version has to be same -APP_VERSION: "3.10.0" +APP_VERSION: "3.11.0" SKIP_SSL: "false" # PLATFORM_NAME: AWS, GKE, Openshift, Rancher, Others diff --git a/charts/litmus/Chart.yaml b/charts/litmus/Chart.yaml index 2808a517..91ddb814 100644 --- a/charts/litmus/Chart.yaml +++ b/charts/litmus/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.11.0" description: A Helm chart to install ChaosCenter name: litmus -version: 3.10.0 +version: 3.11.0 kubeVersion: ">=1.16.0-0" home: https://litmuschaos.io sources: diff --git a/charts/litmus/README.md b/charts/litmus/README.md index a0217f0e..f11c38b2 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -1,6 +1,6 @@ # litmus -![Version: 3.10.0](https://img.shields.io/badge/Version-3.10.0-informational?style=flat-square) ![AppVersion: 3.10.0](https://img.shields.io/badge/AppVersion-3.10.0-informational?style=flat-square) +![Version: 3.11.0](https://img.shields.io/badge/Version-3.11.0-informational?style=flat-square) ![AppVersion: 3.11.0](https://img.shields.io/badge/AppVersion-3.11.0-informational?style=flat-square) A Helm chart to install ChaosCenter @@ -56,7 +56,7 @@ We separated service configuration from `portal.server.service` to `portal.serve | adminConfig.DB_PORT | string | `""` | | | adminConfig.DB_SERVER | string | `""` | | | adminConfig.SKIP_SSL_VERIFY | string | `"false"` | | -| adminConfig.VERSION | string | `"3.10.0"` | | +| adminConfig.VERSION | string | `"3.11.0"` | | | allowedOrigins | string | `".*"` | | | customLabels | object | `{}` | Additional labels | | existingSecret | string | `""` | Use existing secret (e.g., External Secrets) | @@ -106,7 +106,7 @@ We separated service configuration from `portal.server.service` to `portal.serve | portal.frontend.customLabels | object | `{}` | | | portal.frontend.image.pullPolicy | string | `"Always"` | | | portal.frontend.image.repository | string | `"litmusportal-frontend"` | | -| portal.frontend.image.tag | string | `"3.10.0"` | | +| portal.frontend.image.tag | string | `"3.11.0"` | | | portal.frontend.livenessProbe.failureThreshold | int | `5` | | | portal.frontend.livenessProbe.initialDelaySeconds | int | `30` | | | portal.frontend.livenessProbe.periodSeconds | int | `10` | | @@ -144,7 +144,7 @@ We separated service configuration from `portal.server.service` to `portal.serve | portal.server.authServer.env | object | `{}` | | | portal.server.authServer.image.pullPolicy | string | `"Always"` | | | portal.server.authServer.image.repository | string | `"litmusportal-auth-server"` | | -| portal.server.authServer.image.tag | string | `"3.10.0"` | | +| portal.server.authServer.image.tag | string | `"3.11.0"` | | | portal.server.authServer.ports[0].containerPort | int | `3000` | | | portal.server.authServer.ports[0].name | string | `"auth-server"` | | | portal.server.authServer.ports[1].containerPort | int | `3030` | | @@ -172,23 +172,23 @@ We separated service configuration from `portal.server.service` to `portal.serve | portal.server.graphqlServer.automountServiceAccountToken | bool | `false` | | | portal.server.graphqlServer.genericEnv.CHAOS_CENTER_UI_ENDPOINT | string | `""` | | | portal.server.graphqlServer.genericEnv.CONTAINER_RUNTIME_EXECUTOR | string | `"k8sapi"` | | -| portal.server.graphqlServer.genericEnv.DEFAULT_HUB_BRANCH_NAME | string | `"v3.10.x"` | | +| portal.server.graphqlServer.genericEnv.DEFAULT_HUB_BRANCH_NAME | string | `"v3.11.x"` | | | portal.server.graphqlServer.genericEnv.ENABLE_GQL_INTROSPECTION | string | `"false"` | | -| portal.server.graphqlServer.genericEnv.INFRA_COMPATIBLE_VERSIONS | string | `"[\"3.10.0\"]"` | | +| portal.server.graphqlServer.genericEnv.INFRA_COMPATIBLE_VERSIONS | string | `"[\"3.11.0\"]"` | | | portal.server.graphqlServer.genericEnv.INFRA_DEPLOYMENTS | string | `"[\"app=chaos-exporter\", \"name=chaos-operator\", \"app=event-tracker\", \"app=workflow-controller\"]"` | | | portal.server.graphqlServer.genericEnv.REMOTE_HUB_MAX_SIZE | string | `"5000000"` | | | portal.server.graphqlServer.genericEnv.TLS_CERT_64 | string | `""` | | -| portal.server.graphqlServer.genericEnv.WORKFLOW_HELPER_IMAGE_VERSION | string | `"3.10.0"` | | +| portal.server.graphqlServer.genericEnv.WORKFLOW_HELPER_IMAGE_VERSION | string | `"3.11.0"` | | | portal.server.graphqlServer.image.pullPolicy | string | `"Always"` | | | portal.server.graphqlServer.image.repository | string | `"litmusportal-server"` | | -| portal.server.graphqlServer.image.tag | string | `"3.10.0"` | | +| portal.server.graphqlServer.image.tag | string | `"3.11.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:3.10.0"` | | -| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_EXPORTER_IMAGE | string | `"chaos-exporter:3.10.0"` | | -| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_OPERATOR_IMAGE | string | `"chaos-operator:3.10.0"` | | -| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_RUNNER_IMAGE | string | `"chaos-runner:3.10.0"` | | -| portal.server.graphqlServer.imageEnv.SUBSCRIBER_IMAGE | string | `"litmusportal-subscriber:3.10.0"` | | +| portal.server.graphqlServer.imageEnv.EVENT_TRACKER_IMAGE | string | `"litmusportal-event-tracker:3.11.0"` | | +| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_EXPORTER_IMAGE | string | `"chaos-exporter:3.11.0"` | | +| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_OPERATOR_IMAGE | string | `"chaos-operator:3.11.0"` | | +| portal.server.graphqlServer.imageEnv.LITMUS_CHAOS_RUNNER_IMAGE | string | `"chaos-runner:3.11.0"` | | +| portal.server.graphqlServer.imageEnv.SUBSCRIBER_IMAGE | string | `"litmusportal-subscriber:3.11.0"` | | | portal.server.graphqlServer.livenessProbe.failureThreshold | int | `5` | | | portal.server.graphqlServer.livenessProbe.initialDelaySeconds | int | `30` | | | portal.server.graphqlServer.livenessProbe.periodSeconds | int | `10` | | diff --git a/charts/litmus/values.yaml b/charts/litmus/values.yaml index 5a947d18..ea1a71a0 100644 --- a/charts/litmus/values.yaml +++ b/charts/litmus/values.yaml @@ -14,7 +14,7 @@ existingSecret: "" allowedOrigins: ".*" adminConfig: - VERSION: "3.10.0" + VERSION: "3.11.0" SKIP_SSL_VERIFY: "false" # -- leave empty if uses Mongo DB deployed by this chart DBPASSWORD: "" @@ -118,7 +118,7 @@ portal: # runAsNonRoot: true image: repository: litmusportal-frontend - tag: 3.10.0 + tag: 3.11.0 pullPolicy: "Always" containerPort: 8185 customLabels: {} @@ -221,7 +221,7 @@ portal: readOnlyRootFilesystem: true image: repository: litmusportal-server - tag: 3.10.0 + tag: 3.11.0 pullPolicy: "Always" ports: - name: gql-server @@ -238,21 +238,21 @@ portal: port: 8000 targetPort: 8000 imageEnv: - SUBSCRIBER_IMAGE: "litmusportal-subscriber:3.10.0" - EVENT_TRACKER_IMAGE: "litmusportal-event-tracker:3.10.0" + SUBSCRIBER_IMAGE: "litmusportal-subscriber:3.11.0" + EVENT_TRACKER_IMAGE: "litmusportal-event-tracker:3.11.0" ARGO_WORKFLOW_CONTROLLER_IMAGE: "workflow-controller:v3.3.1" ARGO_WORKFLOW_EXECUTOR_IMAGE: "argoexec:v3.3.1" - LITMUS_CHAOS_OPERATOR_IMAGE: "chaos-operator:3.10.0" - LITMUS_CHAOS_RUNNER_IMAGE: "chaos-runner:3.10.0" - LITMUS_CHAOS_EXPORTER_IMAGE: "chaos-exporter:3.10.0" + LITMUS_CHAOS_OPERATOR_IMAGE: "chaos-operator:3.11.0" + LITMUS_CHAOS_RUNNER_IMAGE: "chaos-runner:3.11.0" + LITMUS_CHAOS_EXPORTER_IMAGE: "chaos-exporter:3.11.0" genericEnv: TLS_CERT_64: "" CONTAINER_RUNTIME_EXECUTOR: "k8sapi" - DEFAULT_HUB_BRANCH_NAME: "v3.10.x" + DEFAULT_HUB_BRANCH_NAME: "v3.11.x" INFRA_DEPLOYMENTS: '["app=chaos-exporter", "name=chaos-operator", "app=event-tracker", "app=workflow-controller"]' - WORKFLOW_HELPER_IMAGE_VERSION: "3.10.0" + WORKFLOW_HELPER_IMAGE_VERSION: "3.11.0" REMOTE_HUB_MAX_SIZE: "5000000" - INFRA_COMPATIBLE_VERSIONS: '["3.10.0"]' + INFRA_COMPATIBLE_VERSIONS: '["3.11.0"]' # Provide UI endpoint if using namespaced scope CHAOS_CENTER_UI_ENDPOINT: "" ENABLE_GQL_INTROSPECTION: "false" @@ -296,7 +296,7 @@ portal: automountServiceAccountToken: false image: repository: litmusportal-auth-server - tag: 3.10.0 + tag: 3.11.0 pullPolicy: "Always" ports: - name: auth-server