fix: develop sync

Author: SATYAsasini

.github/workflows/api-linter.yaml

@@ -2,14 +2,15 @@ name: API Specs Merger
 
 on:
   push:
+    branches:
+      - main
     paths:
       - 'specs/**'
-
 permissions:
   contents: write
 
 jobs:
-  lint-and-bundle:
+  lint-bundle-host:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -27,28 +28,30 @@ jobs:
           ./scripts/generate-api-docs.sh
 
       - name: Commit and push documentation
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_SYSTEMSDT_TOKEN }}
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "GitHub Action"
 
-          # Fetch the gh-pages-test branch
-          git fetch origin gh-pages-test
+          # Fetch the gh-pages branch
+          git fetch origin gh-pages
 
           # Create a separate worktree for the branch
-          git worktree add /tmp/gh-pages-test gh-pages-test
+          git worktree add /tmp/gh-pages gh-pages
 
           # Copy generated docs into the worktree
-          mkdir -p /tmp/gh-pages-test/docs/api-docs
-          cp -r docs/api-docs/* /tmp/gh-pages-test/docs/api-docs/ || true
+          mkdir -p /tmp/gh-pages/docs/api-docs
+          cp -r docs/api-docs/* /tmp/gh-pages/docs/api-docs/ || true
 
-          cd /tmp/gh-pages-test
+          cd /tmp/gh-pages
 
           git add .
           if git diff --staged --quiet; then
             echo "✅ No changes to commit"
           else
             git commit -m "📄 Update API documentation"
-            git push origin gh-pages-test
-            echo "🚀 Documentation pushed to gh-pages-test branch!"
+            git push origin gh-pages
+            echo "🚀 Documentation pushed to gh-pages branch!"
           fi
       

.github/workflows/api-spec-merger.yaml

@@ -290,6 +290,7 @@ func (impl ClusterRestHandlerImpl) FindAll(w http.ResponseWriter, r *http.Reques
 	var result []*bean2.ClusterBean
 	for _, item := range clusterList {
 		if ok := impl.enforcer.Enforce(token, casbin.ResourceCluster, casbin.ActionGet, item.ClusterName); ok {
+			item.SetClusterStatus()
 			result = append(result, item)
 		}
 	}
@@ -343,8 +344,10 @@ func (impl ClusterRestHandlerImpl) FindByIds(w http.ResponseWriter, r *http.Requ
 	var result []*bean2.ClusterBean
 	for _, item := range clusterList {
 		if ok := impl.enforcer.Enforce(token, casbin.ResourceCluster, casbin.ActionGet, item.ClusterName); ok {
+			item.SetClusterStatus()
 			result = append(result, item)
 		}
+
 	}
 	//RBAC enforcer Ends
 

.github/workflows/build-docs.yaml

@@ -335,7 +335,7 @@ require (
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
 	github.com/cyphar/filepath-securejoin v0.4.1 => github.com/cyphar/filepath-securejoin v0.3.6 // indirect
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250718122027-cb75c2add53e
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250806142853-d5a47198188d
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806142853-d5a47198188d
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
 )

api/cluster/ClusterRestHandler.go

@@ -237,10 +237,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250718122027-cb75c2add53e h1:uhVKRc6CyQngloaUUfYz9y8fZ2My0x1Jrkt/YbZdRAI=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250718122027-cb75c2add53e/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e h1:bprDKDpzZ/UVFxnA3xP3GiqRFHjmmTXXg2IDkN5EdUg=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250718122027-cb75c2add53e/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250806142853-d5a47198188d h1:+g3SnMSqHWPpKkU2fdp1dTkcPvedXuZ6kVR7S4U4IvU=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250806142853-d5a47198188d/go.mod h1:9LCkYfiWaEKIBkmxw9jX1GujvEMyHwmDtVsatffAkeU=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806142853-d5a47198188d h1:PcwklqogA1ppPtC0M2jn2QiFAkoKKeOY2tbNOCjedeI=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250806142853-d5a47198188d/go.mod h1:/Ciy9tD9OxZOWBDPIasM448H7uvSo4+ZJiExpfwBZpA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

cmd/external-app/wire_gen.go

@@ -293,6 +293,7 @@ func (impl *ClusterServiceImpl) FindAll() ([]*bean.ClusterBean, error) {
 	var beans []*bean.ClusterBean
 	for _, model := range models {
 		bean := adapter.GetClusterBean(model)
+		bean.SetClusterStatus()
 		beans = append(beans, &bean)
 	}
 	return beans, nil

go.mod

@@ -38,6 +38,18 @@ type ClusterBean struct {
 	IsVirtualCluster        bool                       `json:"isVirtualCluster"`
 	ClusterUpdated          bool                       `json:"clusterUpdated"`
 	IsProd                  bool                       `json:"isProd"`
+	ClusterStatus           ClusterStatus              `json:"clusterStatus,omitempty"`
+}
+
+// TODO: fix duplicate
+func (bean *ClusterBean) SetClusterStatus() {
+	if len(bean.ErrorInConnecting) > 0 {
+		// if there's an error in connecting, cluster status is connection failed
+		bean.ClusterStatus = ClusterStatusConnectionFailed
+	} else {
+		// if no connection error, cluster status is healthy
+		bean.ClusterStatus = ClusterStatusHealthy
+	}
 }
 
 func (bean ClusterBean) GetClusterConfig() *k8s.ClusterConfig {
@@ -90,3 +102,12 @@ const (
 	DefaultNamespace = "default"
 	CmFieldUpdatedOn = "updated_on"
 )
+
+type ClusterStatus string
+
+// TODO: fix duplicate
+const (
+	ClusterStatusHealthy          ClusterStatus = "healthy"
+	ClusterStatusUnHealthy        ClusterStatus = "unhealthy"
+	ClusterStatusConnectionFailed ClusterStatus = "connection failed"
+)

go.sum

@@ -94,7 +94,7 @@ type VulnerabilityCheckRequest struct {
 }
 
 const (
-	CronJobChartRegexExpression = "cronjob-chart_1-(2|3|4|5)-0"
+	CronJobChartRegexExpression = "cronjob-chart_1-(2|3|4|5|6)-0"
 )
 
 const (