Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eliminate unnecessary logins and processes and get infra info right away #396

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<PROJECT_ID>" \
--set "INFRA_ID=<INFRA_ID>" \
--set "ACCESS_KEY=<ACCESS_KEY>" \
--set "global.INFRA_MODE=namespace" \
--set "crds.create=false" \
--set "workflow-controller.crds.create=false
Expand All @@ -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=<PROJECT_ID>" \
--set "INFRA_ID=<INFRA_ID>" \
--set "ACCESS_KEY=<ACCESS_KEY>" \
--set "global.INFRA_MODE=cluster"
```

Expand Down
2 changes: 1 addition & 1 deletion charts/kube-aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/kube-azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/kube-gcp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/kubernetes-chaos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/litmus-agent/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 6 additions & 14 deletions charts/litmus-agent/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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=<INFRA_ID>"
--set "ACCESS_KEY=<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` | |
Expand Down Expand Up @@ -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)
8 changes: 2 additions & 6 deletions charts/litmus-agent/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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=<INFRA_ID>"
--set "ACCESS_KEY=<ACCESS_KEY>"
```

{{ template "chart.valuesSection" . }}
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/chaos-exporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/chaos-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/event-tracker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/subscriber/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/litmus-agent/charts/workflow-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 0 additions & 6 deletions charts/litmus-agent/templates/hook-pre-install-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion charts/litmus-agent/templates/infra-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
5 changes: 0 additions & 5 deletions charts/litmus-agent/templates/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
10 changes: 2 additions & 8 deletions charts/litmus-agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/litmus-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion charts/litmus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)