Fix merge conflict

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
         id: getcommit
         run: |
           prsha=$(echo $response | jq '.[-1].sha'  | tr -d '"')
-          echo "::set-output name=sha::$prsha"
+          echo "sha=$prsha" >> $GITHUB_OUTPUT
         env:
           response: ${{ steps.get_PR_commits.outputs.data }}
 

.github/workflows/portal.yml

@@ -31,7 +31,7 @@ jobs:
         id: getcommit
         run: |
           prsha=$(echo $response | jq '.[-1].sha'  | tr -d '"')
-          echo "::set-output name=sha::$prsha"
+          echo "sha=$prsha" >> $GITHUB_OUTPUT
         env:
           response: ${{ steps.get_PR_commits.outputs.data }}
 

.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
     # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
     permissions:
       contents: write
+      packages: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -34,6 +35,25 @@ jobs:
           helm repo add mongodb https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
 
       - name: Run chart-releaser
+        id: chart-releaser
         uses: helm/[email protected]
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Login to GHCR
+        if: steps.chart-releaser.outputs.changed_charts
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push Charts to GHCR
+        if: steps.chart-releaser.outputs.changed_charts
+        run: |
+          for pkg in .cr-release-packages/*; do
+            if [ -z "${pkg:-}" ]; then
+              break
+            fi
+            helm push "${pkg}" oci://ghcr.io/${{ github.repository_owner }}/litmus-helm
+          done

README.md

@@ -143,7 +143,7 @@ helm install litmus-agent litmuschaos/litmus-agent \
 --set "LITMUS_PROJECT_ID=<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

charts/kube-aws/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "3.7.0"
+appVersion: "3.11.0"
 description: A Helm chart to install litmus aws chaos experiments
 name: kube-aws
-version: 3.7.0
+version: 3.11.0
 home: https://litmuschaos.io
 sources:
   - https://github.com/litmuschaos/litmus

charts/kube-aws/README.md

@@ -1,6 +1,6 @@
 # kube-aws
 
-![Version: 3.7.0](https://img.shields.io/badge/Version-3.7.0-informational?style=flat-square) ![AppVersion: 3.7.0](https://img.shields.io/badge/AppVersion-3.7.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 litmus aws chaos experiments
 
@@ -27,7 +27,7 @@ A Helm chart to install litmus aws chaos experiments
 | fullnameOverride | string | `"kube-aws"` |  |
 | image.litmusGO.pullPolicy | string | `"Always"` |  |
 | image.litmusGO.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/go-runner"` |  |
-| image.litmusGO.tag | string | `"3.7.0"` |  |
+| image.litmusGO.tag | string | `"3.10.0"` |  |
 | nameOverride | string | `"kube-aws"` |  |
 
 ----------------------------------------------

charts/kube-aws/templates/ec2-terminate-by-tag.yaml

@@ -51,7 +51,7 @@ spec:
     - name: RAMP_TIME
       value: ''
 
-    - name: INSTANCE_TAG
+    - name: EC2_INSTANCE_TAG
       value: ''
 
     # enable it if the target instance is a part of self-managed nodegroup.

charts/kube-aws/values.yaml

@@ -11,7 +11,7 @@ customLabels: {}
 image:
   litmusGO:
     repository: litmuschaos.docker.scarf.sh/litmuschaos/go-runner
-    tag: 3.7.0
+    tag: 3.10.0
     pullPolicy: Always
 
 experiments:

charts/kube-azure/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "3.7.0"
+appVersion: "3.11.0"
 description: A Helm chart to install litmus Azure chaos experiments
 name: kube-azure
-version: 3.7.0
+version: 3.11.0
 home: https://litmuschaos.io
 sources:
   - https://github.com/litmuschaos/litmus

charts/kube-azure/README.md

@@ -1,6 +1,6 @@
 # kube-azure
 
-![Version: 3.7.0](https://img.shields.io/badge/Version-3.7.0-informational?style=flat-square) ![AppVersion: 3.7.0](https://img.shields.io/badge/AppVersion-3.7.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 litmus Azure chaos experiments
 
@@ -27,7 +27,7 @@ A Helm chart to install litmus Azure chaos experiments
 | fullnameOverride | string | `"kube-azure"` |  |
 | image.litmusGO.pullPolicy | string | `"Always"` |  |
 | image.litmusGO.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/go-runner"` |  |
-| image.litmusGO.tag | string | `"3.7.0"` |  |
+| image.litmusGO.tag | string | `"3.11.0"` |  |
 | nameOverride | string | `"kube-azure"` |  |
 
 ----------------------------------------------

charts/kube-azure/values.yaml

@@ -11,7 +11,7 @@ customLabels: {}
 image:
   litmusGO:
     repository: litmuschaos.docker.scarf.sh/litmuschaos/go-runner
-    tag: 3.7.0
+    tag: 3.11.0
     pullPolicy: Always
 
 experiments:

charts/kube-gcp/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "3.7.0"
+appVersion: "3.11.0"
 description: A Helm chart to install litmus gcp chaos experiments
 name: kube-gcp
-version: 3.7.0
+version: 3.11.0
 home: https://litmuschaos.io
 sources:
   - https://github.com/litmuschaos/litmus

charts/kube-gcp/README.md

@@ -1,6 +1,6 @@
 # kube-gcp
 
-![Version: 3.7.0](https://img.shields.io/badge/Version-3.7.0-informational?style=flat-square) ![AppVersion: 3.7.0](https://img.shields.io/badge/AppVersion-3.7.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 litmus gcp chaos experiments
 
@@ -27,7 +27,7 @@ A Helm chart to install litmus gcp chaos experiments
 | fullnameOverride | string | `"kube-gcp"` |  |
 | image.litmusGO.pullPolicy | string | `"Always"` |  |
 | image.litmusGO.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/go-runner"` |  |
-| image.litmusGO.tag | string | `"3.7.0"` |  |
+| image.litmusGO.tag | string | `"3.11.0"` |  |
 | nameOverride | string | `"kube-gcp"` |  |
 
 ----------------------------------------------

charts/kube-gcp/values.yaml

@@ -11,7 +11,7 @@ customLabels: {}
 image:
   litmusGO:
     repository: litmuschaos.docker.scarf.sh/litmuschaos/go-runner
-    tag: 3.7.0
+    tag: 3.11.0
     pullPolicy: Always
 
 experiments:

charts/kubernetes-chaos/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "3.7.0"
+appVersion: "3.11.0"
 description: A Helm chart to install litmus chaos experiments for kubernetes category (chaos-chart)
 name: kubernetes-chaos
-version: 3.7.0
+version: 3.11.0
 home: https://litmuschaos.io
 sources:
   - https://github.com/litmuschaos/litmus

charts/kubernetes-chaos/README.md

@@ -1,6 +1,6 @@
 # kubernetes-chaos
 
-![Version: 3.7.0](https://img.shields.io/badge/Version-3.7.0-informational?style=flat-square) ![AppVersion: 3.7.0](https://img.shields.io/badge/AppVersion-3.7.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 litmus chaos experiments for kubernetes category (chaos-chart)
 
@@ -29,12 +29,12 @@ A Helm chart to install litmus chaos experiments for kubernetes category (chaos-
 | fullnameOverride | string | `"k8s"` |  |
 | image.litmus.pullPolicy | string | `"Always"` |  |
 | image.litmus.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/ansible-runner"` |  |
-| image.litmus.tag | string | `"3.7.0"` |  |
+| image.litmus.tag | string | `"3.11.0"` |  |
 | image.litmusGO.pullPolicy | string | `"Always"` |  |
 | image.litmusGO.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/go-runner"` |  |
-| image.litmusGO.tag | string | `"3.7.0"` |  |
+| image.litmusGO.tag | string | `"3.11.0"` |  |
 | image.litmusLIBImage.repository | string | `"litmuschaos.docker.scarf.sh/litmuschaos/go-runner"` |  |
-| image.litmusLIBImage.tag | string | `"3.7.0"` |  |
+| image.litmusLIBImage.tag | string | `"3.11.0"` |  |
 | nameOverride | string | `"k8s"` |  |
 
 ----------------------------------------------

charts/kubernetes-chaos/values.yaml

@@ -11,17 +11,17 @@ customLabels: {}
 image:
   litmus:
     repository: litmuschaos.docker.scarf.sh/litmuschaos/ansible-runner
-    tag: 3.7.0
+    tag: 3.11.0
     pullPolicy: Always
 
   litmusGO:
     repository: litmuschaos.docker.scarf.sh/litmuschaos/go-runner
-    tag: 3.7.0
+    tag: 3.11.0
     pullPolicy: Always
 
   litmusLIBImage:
     repository: litmuschaos.docker.scarf.sh/litmuschaos/go-runner
-    tag: 3.7.0
+    tag: 3.11.0
 
 environment:
   # supported: 'docker', 'containerd', 'crio'

charts/litmus-agent/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "3.6.0"
+appVersion: "3.11.2"
 description: A Helm chart to install litmus agent
 name: litmus-agent
-version: 3.6.1
+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.6.1
+    version: 3.11.0
     condition: chaos-operator.enabled
   - name: chaos-exporter
-    version: 3.6.1
+    version: 3.11.0
     condition: chaos-exporter.enabled
   - name: event-tracker
-    version: 3.6.1
+    version: 3.11.0
     condition: event-tracker.enabled
   - name: subscriber
-    version: 3.6.1
+    version: 3.11.0
     condition: subscriber.enabled
   - name: workflow-controller
     version: 0.2.1

charts/litmus-agent/README.md

@@ -1,6 +1,6 @@
 # litmus-agent
 
-![Version: 3.6.1](https://img.shields.io/badge/Version-3.6.1-informational?style=flat-square) ![AppVersion: 3.6.0](https://img.shields.io/badge/AppVersion-3.6.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.6.1 |
-|  | chaos-operator | 3.6.1 |
-|  | event-tracker | 3.6.1 |
-|  | subscriber | 3.6.1 |
+|  | 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.6.0"` |  |
+| APP_VERSION | string | `"3.11.0"` |  |
 | INFRA_DESCRIPTION | string | `"chaos infrastructure deployed with helm"` |  |
 | INFRA_NAME | string | `"helm-infrastructure"` |  |
 | INFRA_NODE_SELECTOR | string | `""` |  |
@@ -85,6 +85,10 @@ $ helm install litmus-agent litmuschaos/litmus-agent \
 | resources.requests.cpu | string | `"100m"` |  |
 | resources.requests.memory | string | `"128Mi"` |  |
 | subscriber.enabled | bool | `true` |  |
+| useExistingHookSecret | bool | `false` | Use an existing hook Secret instead of creating one with the chart, ref. to templates/secret.yaml |
+| useExistingInfraConfigMap | bool | `false` | Use an existing infra ConfigMap instead of creating one with the chart, ref. to templates/infra-config-map.yaml |
+| useExistingInfraSecret | bool | `false` | Use an existing infra Secret instead of creating one with the chart, ref. to templates/infra-secret.yaml |
+| useExistingWorkflowControllerConfigMap | bool | `false` | Use an existing infra ConfigMap instead of creating one with the chart, ref. to templates/infra-config-map-workflow.yaml |
 | workflow-controller.crds.create | bool | `true` |  |
 | workflow-controller.enabled | bool | `true` |  |
 

charts/litmus-agent/charts/chaos-exporter/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "3.6.0"
+appVersion: "3.11.0"
 description:  A Helm chart to install chaos-exporter
 name: chaos-exporter
-version: 3.6.1
+version: 3.11.0
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

charts/litmus-agent/charts/chaos-exporter/README.md

@@ -1,6 +1,6 @@
 # chaos-exporter
 
-![Version: 3.6.1](https://img.shields.io/badge/Version-3.6.1-informational?style=flat-square) ![AppVersion: 3.6.0](https://img.shields.io/badge/AppVersion-3.6.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
 

charts/litmus-agent/charts/chaos-operator/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "3.6.0"
+appVersion: "3.11.0"
 description:  A Helm chart to install chaos-operator
 name: chaos-operator
-version: 3.6.1
+version: 3.11.0
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

charts/litmus-agent/charts/chaos-operator/README.md

@@ -1,6 +1,6 @@
 # chaos-operator
 
-![Version: 3.6.1](https://img.shields.io/badge/Version-3.6.1-informational?style=flat-square) ![AppVersion: 3.6.0](https://img.shields.io/badge/AppVersion-3.6.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
 

charts/litmus-agent/charts/event-tracker/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "3.6.0"
+appVersion: "3.11.0"
 description:  A Helm chart to install event-tracker
 name: event-tracker
-version: 3.6.1
+version: 3.11.0
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

charts/litmus-agent/charts/event-tracker/README.md

@@ -1,6 +1,6 @@
 # event-tracker
 
-![Version: 3.6.1](https://img.shields.io/badge/Version-3.6.1-informational?style=flat-square) ![AppVersion: 3.6.0](https://img.shields.io/badge/AppVersion-3.6.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
 

charts/litmus-agent/charts/subscriber/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "3.6.0"
+appVersion: "3.11.0"
 description:  A Helm chart to install subscriber
 name: subscriber
-version: 3.6.1
+version: 3.11.0
 kubeVersion: ">=1.16.0-0"
 home: https://litmuschaos.io
 sources:

charts/litmus-agent/charts/subscriber/README.md

@@ -1,6 +1,6 @@
 # subscriber
 
-![Version: 3.6.1](https://img.shields.io/badge/Version-3.6.1-informational?style=flat-square) ![AppVersion: 3.6.0](https://img.shields.io/badge/AppVersion-3.6.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