Merge branch 'master' into replace-strings-with-translations

Author: PriteshKiri

.github/workflows/create-new-release.yml

@@ -19,6 +19,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: master
+          token: ${{ secrets.PERSONAL_TOKEN }}
 
       - name: Validate version format
         run: |
@@ -42,20 +44,6 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
       
-      - name: Create or checkout release branch
-        run: |
-          BRANCH_NAME="release-${{ steps.extract_branch.outputs.branch_version }}"
-          
-          # Check if branch exists remotely
-          if git ls-remote --heads origin "$BRANCH_NAME" | grep -q "$BRANCH_NAME"; then
-            echo "Branch $BRANCH_NAME exists remotely, checking out..."
-            git fetch origin "$BRANCH_NAME"
-            git checkout "$BRANCH_NAME"
-          else
-            echo "Creating new branch $BRANCH_NAME..."
-            git checkout -b "$BRANCH_NAME"
-          fi
-      
       - name: Run release manifest script
         run: |
           chmod +x scripts/create-release-manifests.sh
@@ -102,17 +90,41 @@ jobs:
             git status --short mkdocs/docs/$VERSION/
           fi
       
-      - name: Commit and push changes
+      - name: Commit and push to master branch
         if: steps.check_changes.outputs.has_changes == 'true'
         run: |
           VERSION="${{ github.event.inputs.version }}"
-          BRANCH_NAME="release-${{ steps.extract_branch.outputs.branch_version }}"
           
           git add mkdocs/docs/$VERSION/
           git commit -m "chore: Add release manifests for version $VERSION"
+          git push origin master
+          
+          echo "✅ Successfully pushed manifests for version $VERSION to master branch"
+      
+      - name: Create or checkout release branch and push
+        if: steps.check_changes.outputs.has_changes == 'true'
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          BRANCH_NAME="release-${{ steps.extract_branch.outputs.branch_version }}"
+          
+          # Check if branch exists remotely
+          if git ls-remote --heads origin "$BRANCH_NAME" | grep -q "$BRANCH_NAME"; then
+            echo "Branch $BRANCH_NAME exists remotely, checking out..."
+            git fetch origin "$BRANCH_NAME"
+            git checkout "$BRANCH_NAME"
+            
+            # Cherry-pick the manifest commit from master
+            COMMIT_SHA=$(git rev-parse origin/master)
+            git cherry-pick "$COMMIT_SHA"
+          else
+            echo "Creating new branch $BRANCH_NAME from current state..."
+            git checkout -b "$BRANCH_NAME"
+          fi
+          
+          # Push the release branch
           git push origin "$BRANCH_NAME"
           
-          echo "✅ Successfully created and pushed manifests for version $VERSION to branch $BRANCH_NAME"
+          echo "✅ Successfully pushed manifests for version $VERSION to branch $BRANCH_NAME"
       
       - name: Create Git Tag
         if: steps.check_changes.outputs.has_changes == 'true'
@@ -128,12 +140,13 @@ jobs:
       
       - name: Create GitHub Release
         if: steps.check_changes.outputs.has_changes == 'true'
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.event.inputs.version }}
           name: ${{ github.event.inputs.version }}
           target_commitish: release-${{ steps.extract_branch.outputs.branch_version }}
           generate_release_notes: true
+          make_latest: true
           draft: false
           prerelease: false
           files: |
@@ -156,7 +169,8 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY
           
           if [ "${{ steps.check_changes.outputs.has_changes }}" == "true" ]; then
-            echo "📝 Changes have been committed and pushed to the release branch." >> $GITHUB_STEP_SUMMARY
+            echo "📝 Manifests have been committed and pushed to the master branch." >> $GITHUB_STEP_SUMMARY
+            echo "📝 Manifests have also been pushed to the release branch." >> $GITHUB_STEP_SUMMARY
             echo "🏷️ Git tag \`$VERSION\` has been created and pushed." >> $GITHUB_STEP_SUMMARY
             echo "🚀 GitHub release has been created with auto-generated release notes." >> $GITHUB_STEP_SUMMARY
             echo "" >> $GITHUB_STEP_SUMMARY

.github/workflows/push.yml

@@ -6,50 +6,42 @@ on:
       - ^v[0-9]*.[0-9]*.x$
     tags:
       - "*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to build (e.g., 3.25.0)'
+        required: true
+        type: string
 
 defaults:
   run:
     working-directory: chaoscenter
     shell: bash
 
 jobs:
-  backend-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          go-version: "1.22" # By default, the go version is v1.15 in runner.
-      - run: |
-          make backend-services-checks
-
-  frontend-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 16
-      - run: |
-          make frontend-services-checks
-
   get-envs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
       - run: |
           img_tag=""
-          array=(`echo ${GITHUB_REF} | sed 's/\//\n/g'`)
-          if [ ${array[1]} == "tags" ]
-          then
-              echo "tag build"
-              img_tag=${GITHUB_REF#refs/*/}
+          # Check if manually triggered with tag input
+          if [ -n "${{ github.event.inputs.tag }}" ]; then
+              echo "manual trigger with tag input"
+              img_tag="${{ github.event.inputs.tag }}"
           else
-              echo "non tag build"
-              img_tag="ci"
+              array=(`echo ${GITHUB_REF} | sed 's/\//\n/g'`)
+              if [ ${array[1]} == "tags" ]
+              then
+                  echo "tag build"
+                  img_tag=${GITHUB_REF#refs/*/}
+              else
+                  echo "non tag build"
+                  img_tag="ci"
+              fi
           fi
           # This is a condition where image tag looks like "pull/<pullrequest-name>" during pull request build
           NEW_IMG_TAG=`echo $img_tag | sed "s/\//-/g"`
@@ -72,10 +64,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - get-envs
-      - backend-checks
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Downloading image artficate
         uses: actions/download-artifact@v4
@@ -110,10 +103,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - get-envs
-      - backend-checks
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Downloading image artficate
         uses: actions/download-artifact@v4
@@ -148,10 +142,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - get-envs
-      - backend-checks
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Downloading image artficate
         uses: actions/download-artifact@v4
@@ -186,10 +181,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - get-envs
-      - backend-checks
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Downloading image artficate
         uses: actions/download-artifact@v4
@@ -237,10 +233,11 @@ jobs:
           ]
     needs:
       - get-envs
-      - frontend-checks
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Downloading image artficate
         uses: actions/download-artifact@v4
@@ -286,10 +283,11 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - get-envs
-      - backend-checks
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.tag || github.ref }}
 
       - name: Downloading image artficate
         uses: actions/download-artifact@v4

CONTRIBUTING.md

@@ -120,9 +120,18 @@ You can choose from a list of sub-dependent repos to contribute to, a few highli
 
 ## Community & Meetings
 
-The litmus community will have a weekly contributor sync-up on Tuesdays 16.00-16.30 IST / 12.30-13.00 CEST
+1. Community Meetings
+- These will be hosted every 3rd Wednesday of every month at  5:30 PM GMT /6:30 PM CEST /10 PM IST
+- These meetings cover community updates, new feature or release announcements, and user/adopter stories. Everyone in the community is welcome to join and participate in discussions.
+
+
+2. Contributor Meetings
+- These will be hosted every second & last Thursday of every month at  2:30 PM GMT /3:30 PM CEST /7 PM IST
+- These meetings focus on both technical and non-technical contributions to LitmusChaos. Maintainers, current contributors, and aspiring contributors are encouraged to join to discuss issues, fixes, enhancements, and future contributions.
+
+Fill out the [LitmusChaos Meetings invite form](https://forms.gle/qawjtFUeL431jmpv7) to get your Calendar invite!
 
-- The sync up meeting is held online on [Google Hangouts](https://meet.google.com/uvt-ozaw-bvp)
 - The release items are tracked in the [release sheet](https://github.com/litmuschaos/litmus/releases).
+- [Sync Up Agenda & Meeting Notes](https://hackmd.io/a4Zu_sH4TZGeih-xCimi3Q)
 
 If you cannot attend, participate asynchronously via Slack or GitHub discussions.

README.md

@@ -12,7 +12,6 @@
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/3202/badge)](https://www.bestpractices.dev/projects/3202)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Flitmuschaos%2Flitmus.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Flitmuschaos%2Flitmus?ref=badge_shield)
 [![YouTube Channel](https://img.shields.io/badge/YouTube-Subscribe-red)](https://www.youtube.com/channel/UCa57PMqmz_j0wnteRa9nCaw)
-[![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20LitmusChaos%20Guru-006BFF)](https://gurubase.io/g/litmuschaos)
 <br><br><br><br>
 
 #### *Read this in [other languages](translations/TRANSLATIONS.md).*

chaoscenter/graphql/server/manifests/cluster/2a_litmus_crds.yaml

@@ -47,7 +47,7 @@ spec:
                   properties:
                     appkind:
                       type: string
-                      pattern: ^(^$|deployment|statefulset|daemonset|deploymentconfig|rollout)$
+                      pattern: ^(^$|deployment|statefulset|daemonset|deploymentconfig|rollout|job)$
                     applabel:
                       type: string
                     appns:
@@ -72,7 +72,7 @@ spec:
                         properties:
                           kind:
                             type: string
-                            pattern: ^(^$|deployment|statefulset|daemonset|deploymentconfig|rollout)$
+                            pattern: ^(^$|deployment|statefulset|daemonset|deploymentconfig|rollout|job)$
                           labels:
                             type: string
                           names:

chaoscenter/graphql/server/manifests/cluster/3a_agents_rbac.yaml

@@ -54,7 +54,7 @@ rules:
 
   - apiGroups: [ "batch" ]
     resources: [ "jobs" ]
-    verbs: [ "get", "create", "patch", "update" ]
+    verbs: [ "get", "list", "create", "patch", "update" ]
 
   - apiGroups: [ "" ]
     resources: [ "pods/log" ]
@@ -142,6 +142,10 @@ rules:
   - apiGroups: [ "apps" ]
     resources: [ "deployments", "daemonsets", "replicasets", "statefulsets" ]
     verbs: [ "get","list","watch" ]
+
+  - apiGroups: [ "batch" ]
+    resources: [ "jobs" ]
+    verbs: [ "get", "list", "watch" ]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

chaoscenter/graphql/server/manifests/namespace/3a_agents_rbac.yaml

@@ -72,6 +72,7 @@ rules:
   - apiGroups: [ "apps" ]
     resources: [ "deployments", "daemonsets", "replicasets", "statefulsets" ]
     verbs: [ "get", "list" ]
+
   - apiGroups: [ "argoproj.io" ]
     resources:
       [

chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler_test.go

@@ -6,26 +6,25 @@ import (
 	"reflect"
 	"testing"
 
-	dbProbeMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/probe/model/mocks"
-
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/google/uuid"
+	"github.com/stretchr/testify/mock"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+
 	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/graph/model"
 	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/authorization"
 	chaosExperimentMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment/model/mocks"
 	chaosExperimentRunMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_experiment_run/model/mocks"
 	chaosInfraMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/chaos_infrastructure/model/mocks"
 	store "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/data-store"
 	"github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb"
-	dbChoasInfra "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_infrastructure"
-	"github.com/stretchr/testify/mock"
-
 	dbChaosExperiment "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_experiment"
 	dbChaosExperimentRun "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_experiment_run"
+	dbChoasInfra "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/chaos_infrastructure"
 	dbMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/database/mongodb/mocks"
 	dbGitOpsMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/gitops/model/mocks"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
+	dbProbeMocks "github.com/litmuschaos/litmus/chaoscenter/graphql/server/pkg/probe/model/mocks"
 )
 
 type MockServices struct {
@@ -606,7 +605,7 @@ func TestChaosExperimentHandler_UpdateChaosExperiment(t *testing.T) {
 				mockServices.GitOpsService.On("UpsertExperimentToGit", mock.Anything, mock.Anything, request).Return(nil).Once()
 			},
 			wantErr: false,
-		},{
+		}, {
 			name: "success: verifies query filters out removed experiments",
 			args: args{
 				projectID: projectId,
@@ -618,7 +617,7 @@ func TestChaosExperimentHandler_UpdateChaosExperiment(t *testing.T) {
 				},
 			},
 			given: func(request *model.ChaosExperimentRequest, mockServices *MockServices) {
-	
+
 				filterCheck := func(filter interface{}) bool {
 					bsonFilter, ok := filter.(bson.D)
 					if !ok {