diff --git a/README.md b/README.md index c6f0fecc..fc528006 100644 --- a/README.md +++ b/README.md @@ -133,14 +133,11 @@ Sample helm command to install the external agent in namespace mode ```bash helm install litmus-agent litmuschaos/litmus-agent \ --namespace litmus --create-namespace \ ---set "INFRA_NAME=helm-agent" \ ---set "INFRA_DESCRIPTION=My first agent deployed with helm !" \ --set "LITMUS_URL=https://chaos-center.domain.com" \ # FOR REMOTE AGENT (INGRESS) --set "LITMUS_URL=http://litmusportal-frontend-service.litmus.svc.cluster.local:9091" \ # FOR SELF AGENT (SVC) --set "LITMUS_BACKEND_URL=http://litmusportal-server-service.litmus.svc.cluster.local:9002" \ # FOR SELF AGENT (SVC) ---set "LITMUS_USERNAME=admin" \ ---set "LITMUS_PASSWORD=litmus" \ ---set "LITMUS_PROJECT_ID=" \ +--set "INFRA_ID=" \ +--set "ACCESS_KEY=" \ --set "global.INFRA_MODE=namespace" \ --set "crds.create=false" \ --set "workflow-controller.crds.create=false @@ -153,14 +150,11 @@ Sample helm command to install the external agent in cluster mode ```bash helm install litmus-agent litmuschaos/litmus-agent \ --namespace litmus --create-namespace \ ---set "INFRA_NAME=helm-agent" \ ---set "INFRA_DESCRIPTION=My first agent deployed with helm !" \ --set "LITMUS_URL=https://chaos-center.domain.com" \ # FOR REMOTE AGENT (INGRESS) --set "LITMUS_URL=http://litmusportal-frontend-service.litmus.svc.cluster.local:9091" \ # FOR SELF AGENT (SVC) --set "LITMUS_BACKEND_URL=http://litmusportal-server-service.litmus.svc.cluster.local:9002" \ # FOR SELF AGENT (SVC) ---set "LITMUS_USERNAME=admin" \ ---set "LITMUS_PASSWORD=litmus" \ ---set "LITMUS_PROJECT_ID=" \ +--set "INFRA_ID=" \ +--set "ACCESS_KEY=" \ --set "global.INFRA_MODE=cluster" ``` diff --git a/charts/kube-aws/README.md b/charts/kube-aws/README.md index d44bb6d8..5e19810a 100644 --- a/charts/kube-aws/README.md +++ b/charts/kube-aws/README.md @@ -31,4 +31,4 @@ A Helm chart to install litmus aws chaos experiments | nameOverride | string | `"kube-aws"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/kube-azure/README.md b/charts/kube-azure/README.md index 723dbc5d..2977ac2c 100644 --- a/charts/kube-azure/README.md +++ b/charts/kube-azure/README.md @@ -31,4 +31,4 @@ A Helm chart to install litmus Azure chaos experiments | nameOverride | string | `"kube-azure"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/kube-gcp/README.md b/charts/kube-gcp/README.md index 34215fca..9aba7ba9 100644 --- a/charts/kube-gcp/README.md +++ b/charts/kube-gcp/README.md @@ -31,4 +31,4 @@ A Helm chart to install litmus gcp chaos experiments | nameOverride | string | `"kube-gcp"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/kubernetes-chaos/README.md b/charts/kubernetes-chaos/README.md index 04d67ffb..daf4a23a 100644 --- a/charts/kubernetes-chaos/README.md +++ b/charts/kubernetes-chaos/README.md @@ -38,4 +38,4 @@ A Helm chart to install litmus chaos experiments for kubernetes category (chaos- | nameOverride | string | `"k8s"` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/Chart.yaml b/charts/litmus-agent/Chart.yaml index 85a78d76..007c83fe 100644 --- a/charts/litmus-agent/Chart.yaml +++ b/charts/litmus-agent/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: "3.10.0" +appVersion: "3.10.1" description: A Helm chart to install litmus agent name: litmus-agent version: 3.10.0 diff --git a/charts/litmus-agent/README.md b/charts/litmus-agent/README.md index 38ac1453..194f47cf 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.10.1](https://img.shields.io/badge/Version-3.10.1-informational?style=flat-square) ![AppVersion: 3.10.1](https://img.shields.io/badge/AppVersion-3.10.1-informational?style=flat-square) A Helm chart to install litmus agent @@ -38,32 +38,24 @@ To install this chart with the release name `litmus-portal`: $ helm repo add litmuschaos https://litmuschaos.github.io/litmus-helm/ $ helm install litmus-agent litmuschaos/litmus-agent \ --namespace litmus --create-namespace \ - --set "INFRA_NAME=helm-agent" \ - --set "INFRA_DESCRIPTION=My first agent deployed with helm !" \ --set "LITMUS_URL=https://chaos-center.domain.com" \ # FOR REMOTE AGENT (INGRESS) --set "LITMUS_URL=http://litmusportal-frontend-service.litmus.svc.cluster.local:9091" \ # FOR SELF AGENT (SVC) --set "LITMUS_BACKEND_URL=http://litmusportal-server-service.litmus.svc.cluster.local:9002" \ # FOR SELF AGENT (SVC) - --set "LITMUS_USERNAME=admin" \ - --set "LITMUS_PASSWORD=litmus" \ - --set "LITMUS_PROJECT_ID=69395cb3-0231-4262-8990-78056c8adb4c" \ - --set "LITMUS_ENVIRONMENT_ID=nameofenvironment" + --set "INFRA_ID=" + --set "ACCESS_KEY=" ``` ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| +| ACCESS_KEY | string | `""` | | | APP_VERSION | string | `"3.10.0"` | | -| INFRA_DESCRIPTION | string | `"chaos infrastructure deployed with helm"` | | -| INFRA_NAME | string | `"helm-infrastructure"` | | +| INFRA_ID | string | `""` | | | INFRA_NODE_SELECTOR | string | `""` | | | INFRA_TYPE | string | `"external"` | | | LITMUS_BACKEND_URL | string | `""` | | -| LITMUS_ENVIRONMENT_ID | string | `""` | ID of the litmus environment where the infrastructure will be added | -| LITMUS_PASSWORD | string | `"litmus"` | | -| LITMUS_PROJECT_ID | string | `""` | | | LITMUS_URL | string | `"https://my-domain.com"` | | -| LITMUS_USERNAME | string | `"admin"` | | | NS_EXISTS | bool | `true` | | | PLATFORM_NAME | string | `"Others"` | | | SA_EXISTS | bool | `true` | | @@ -93,4 +85,4 @@ $ helm install litmus-agent litmuschaos/litmus-agent \ | workflow-controller.enabled | bool | `true` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/README.md.gotmpl b/charts/litmus-agent/README.md.gotmpl index 41adc22d..00f2963b 100644 --- a/charts/litmus-agent/README.md.gotmpl +++ b/charts/litmus-agent/README.md.gotmpl @@ -20,15 +20,11 @@ To install this chart with the release name `litmus-portal`: $ helm repo add litmuschaos https://litmuschaos.github.io/litmus-helm/ $ helm install litmus-agent litmuschaos/litmus-agent \ --namespace litmus --create-namespace \ - --set "INFRA_NAME=helm-agent" \ - --set "INFRA_DESCRIPTION=My first agent deployed with helm !" \ --set "LITMUS_URL=https://chaos-center.domain.com" \ # FOR REMOTE AGENT (INGRESS) --set "LITMUS_URL=http://litmusportal-frontend-service.litmus.svc.cluster.local:9091" \ # FOR SELF AGENT (SVC) --set "LITMUS_BACKEND_URL=http://litmusportal-server-service.litmus.svc.cluster.local:9002" \ # FOR SELF AGENT (SVC) - --set "LITMUS_USERNAME=admin" \ - --set "LITMUS_PASSWORD=litmus" \ - --set "LITMUS_PROJECT_ID=69395cb3-0231-4262-8990-78056c8adb4c" \ - --set "LITMUS_ENVIRONMENT_ID=nameofenvironment" + --set "INFRA_ID=" + --set "ACCESS_KEY=" ``` {{ template "chart.valuesSection" . }} diff --git a/charts/litmus-agent/charts/chaos-exporter/README.md b/charts/litmus-agent/charts/chaos-exporter/README.md index f5399391..df2255db 100644 --- a/charts/litmus-agent/charts/chaos-exporter/README.md +++ b/charts/litmus-agent/charts/chaos-exporter/README.md @@ -61,4 +61,4 @@ Kubernetes: `>=1.16.0-0` | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/charts/chaos-operator/README.md b/charts/litmus-agent/charts/chaos-operator/README.md index 5a65e75f..17ffd335 100644 --- a/charts/litmus-agent/charts/chaos-operator/README.md +++ b/charts/litmus-agent/charts/chaos-operator/README.md @@ -67,4 +67,4 @@ Kubernetes: `>=1.16.0-0` | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/charts/event-tracker/README.md b/charts/litmus-agent/charts/event-tracker/README.md index 70c06404..cba43351 100644 --- a/charts/litmus-agent/charts/event-tracker/README.md +++ b/charts/litmus-agent/charts/event-tracker/README.md @@ -58,4 +58,4 @@ Kubernetes: `>=1.16.0-0` | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/charts/subscriber/README.md b/charts/litmus-agent/charts/subscriber/README.md index 65f2b412..a822280a 100644 --- a/charts/litmus-agent/charts/subscriber/README.md +++ b/charts/litmus-agent/charts/subscriber/README.md @@ -56,4 +56,4 @@ Kubernetes: `>=1.16.0-0` | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/charts/workflow-controller/README.md b/charts/litmus-agent/charts/workflow-controller/README.md index d0566c38..4a1b2b5c 100644 --- a/charts/litmus-agent/charts/workflow-controller/README.md +++ b/charts/litmus-agent/charts/workflow-controller/README.md @@ -62,4 +62,4 @@ Kubernetes: `>=1.16.0-0` | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus-agent/templates/hook-pre-install-job.yaml b/charts/litmus-agent/templates/hook-pre-install-job.yaml index 1f8ab77e..1f93a7dd 100644 --- a/charts/litmus-agent/templates/hook-pre-install-job.yaml +++ b/charts/litmus-agent/templates/hook-pre-install-job.yaml @@ -29,12 +29,6 @@ spec: - secretRef: name: {{ include "litmus-agent.fullname" . }}-hook env: - - name: INFRA_NAME - value: {{ .Values.INFRA_NAME }} - - name: INFRA_DESCRIPTION - value: {{ .Values.INFRA_DESCRIPTION | quote }} - - name: LITMUS_ENVIRONMENT_ID - value: {{ .Values.LITMUS_ENVIRONMENT_ID }} - name: INFRA_MODE value: {{ .Values.global.INFRA_MODE }} - name: INFRA_CONFIGMAP_NAME diff --git a/charts/litmus-agent/templates/infra-secret.yaml b/charts/litmus-agent/templates/infra-secret.yaml index c0af1e9d..b6213934 100644 --- a/charts/litmus-agent/templates/infra-secret.yaml +++ b/charts/litmus-agent/templates/infra-secret.yaml @@ -12,5 +12,7 @@ metadata: "helm.sh/hook": pre-install "helm.sh/hook-weight": "1" "helm.sh/hook-delete-policy": before-hook-creation,hook-failed -data: {} +data: + INFRA_ID: {{ .Values.INFRA_ID | b64enc | quote }} + ACCESS_KEY: {{.Values.ACCESS_KEY | b64enc | quote }} {{ end }} diff --git a/charts/litmus-agent/templates/secret.yaml b/charts/litmus-agent/templates/secret.yaml index 8fe8703a..48e5a74c 100644 --- a/charts/litmus-agent/templates/secret.yaml +++ b/charts/litmus-agent/templates/secret.yaml @@ -18,9 +18,4 @@ data: {{- else }} LITMUS_BACKEND_URL: {{ ((printf "%s/ws/query" .Values.LITMUS_URL )) | b64enc | quote }} {{- end }} - LITMUS_USERNAME: {{ .Values.LITMUS_USERNAME | b64enc | quote }} - LITMUS_PASSWORD: {{ .Values.LITMUS_PASSWORD | b64enc | quote }} - {{- if .Values.LITMUS_PROJECT_ID }} - LITMUS_PROJECT_ID: {{ .Values.LITMUS_PROJECT_ID | b64enc | quote }} - {{ end }} {{ end }} diff --git a/charts/litmus-agent/values.yaml b/charts/litmus-agent/values.yaml index a3bc7de1..78dc8ab4 100644 --- a/charts/litmus-agent/values.yaml +++ b/charts/litmus-agent/values.yaml @@ -9,9 +9,6 @@ global: # This is a YAML-formatted file. # Declare variables to be passed into your templates. -INFRA_NAME: "helm-infrastructure" -INFRA_DESCRIPTION: "chaos infrastructure deployed with helm" - INFRA_NODE_SELECTOR: "" SA_EXISTS: true NS_EXISTS: true @@ -25,11 +22,8 @@ PLATFORM_NAME: "Others" LITMUS_URL: "https://my-domain.com" LITMUS_BACKEND_URL: "" -LITMUS_USERNAME: "admin" -LITMUS_PASSWORD: "litmus" -LITMUS_PROJECT_ID: "" -# -- ID of the litmus environment where the infrastructure will be added -LITMUS_ENVIRONMENT_ID: "" +INFRA_ID: "" +ACCESS_KEY: "" image: repository: litmuschaos.docker.scarf.sh/litmuschaos/litmus-helm-agent diff --git a/charts/litmus-core/README.md b/charts/litmus-core/README.md index 18d248dc..834b874c 100644 --- a/charts/litmus-core/README.md +++ b/charts/litmus-core/README.md @@ -64,4 +64,4 @@ A Helm chart to install litmus infra components on Kubernetes | tolerations | list | `[]` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/litmus/README.md b/charts/litmus/README.md index a0217f0e..fa712361 100644 --- a/charts/litmus/README.md +++ b/charts/litmus/README.md @@ -242,4 +242,4 @@ We separated service configuration from `portal.server.service` to `portal.serve | portal.server.waitForMongodb.securityContext | object | `{}` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)