create cm in case of cluster event instead of secret

Author: prakash100198

go.mod

@@ -307,8 +307,8 @@ require (
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250519113737-b060cea3a495
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519113737-b060cea3a495
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250521095739-1196aa26acd3
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104515-18ca4a361f46
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7

go.sum

@@ -829,10 +829,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-20250519113737-b060cea3a495 h1:GBe/yfpn5uU3Myv0TV4KBvSLfuwRRjTN7uXAupeUhbk=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250519113737-b060cea3a495/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519113737-b060cea3a495 h1:aEJw3HPicUqpwBIZos5lsiNIuL1c4w5bqadkHyj+dAA=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250519113737-b060cea3a495/go.mod h1:CXQGEo+kZc7JPX5hn4jJf1msal9q/ExSdAYGkHNPnQw=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250521095739-1196aa26acd3 h1:qf6dFMEGaE8gWkNu7IZx0A2rjycNtW+n7Q96pWA4IxM=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250521095739-1196aa26acd3/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104515-18ca4a361f46 h1:vVQeIaO2OT0xXTklcXJeQFhDGhs2TimBHYnlBr7/GNY=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250522104515-18ca4a361f46/go.mod h1:CXQGEo+kZc7JPX5hn4jJf1msal9q/ExSdAYGkHNPnQw=
 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=

pkg/cluster/ClusterService.go

@@ -22,9 +22,11 @@ import (
 	"fmt"
 	informerBean "github.com/devtron-labs/common-lib/informer"
 	"github.com/devtron-labs/common-lib/utils/k8s/commonBean"
+	bean3 "github.com/devtron-labs/devtron/pkg/argoApplication/bean"
 	"github.com/devtron-labs/devtron/pkg/cluster/adapter"
 	"github.com/devtron-labs/devtron/pkg/cluster/bean"
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
+	"github.com/devtron-labs/devtron/pkg/cluster/helper"
 	"github.com/devtron-labs/devtron/pkg/cluster/read"
 	cronUtil "github.com/devtron-labs/devtron/util/cron"
 	"github.com/robfig/cron/v3"
@@ -227,22 +229,9 @@ func (impl *ClusterServiceImpl) Save(parent context.Context, bean *bean.ClusterB
 		impl.SyncNsInformer(bean)
 	}
 	impl.logger.Info("saving secret for cluster informer")
-	k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
-	if err != nil {
-		impl.logger.Errorw("error in getting k8s Client in cluster", "err", err, "clusterName", bean.ClusterName)
-		return bean, nil
-	}
-	//creating cluster secret, this secret will be read informer in kubelink to know that a new cluster has been added
-	secretName := ParseSecretNameForKubelinkInformer(bean.Id)
-
-	data := make(map[string][]byte)
-	data[informerBean.SecretFieldClusterId] = []byte(fmt.Sprintf("%v", bean.Id))
-	data[informerBean.SecretFieldAction] = []byte(informerBean.ClusterActionAdd)
-	data[clusterBean.SecretFieldUpdatedOn] = []byte(time.Now().String()) // this field will ensure that informer detects change as other fields can be constant even if cluster config changes
-	// TODO Asutosh: Why not UPSERT ??
-	_, err = impl.K8sUtil.CreateSecret(clusterBean.DefaultNamespace, data, secretName, informerBean.ClusterModifyEventSecretType, k8sClient, nil, nil)
-	if err != nil {
-		impl.logger.Errorw("error in creating secret for informers", "secretName", secretName, "err", err)
+	cmData, labels := helper.CreateClusterModifyEventData(bean.Id, informerBean.ClusterActionAdd)
+	if err = impl.upsertClusterConfigMap(bean, cmData, labels); err != nil {
+		impl.logger.Errorw("error upserting cluster secret", "cmData", cmData, "err", err)
 		return bean, nil
 	}
 	return bean, nil
@@ -469,42 +458,39 @@ func (impl *ClusterServiceImpl) Update(ctx context.Context, bean *bean.ClusterBe
 	}
 	impl.logger.Infow("saving secret for cluster informer")
 	if bean.HasConfigOrUrlChanged {
-		data := make(map[string][]byte)
-		data[informerBean.SecretFieldClusterId] = []byte(fmt.Sprintf("%v", bean.Id))
-		data[informerBean.SecretFieldAction] = []byte(informerBean.ClusterActionUpdate)
-		data[clusterBean.SecretFieldUpdatedOn] = []byte(time.Now().String()) // this field will ensure that informer detects change as other fields can be constant even if cluster config changes
-		if err = impl.upsertClusterSecret(bean, data); err != nil {
-			impl.logger.Errorw("error upserting cluster secret", "data", data, "err", err)
+		cmData, labels := helper.CreateClusterModifyEventData(bean.Id, informerBean.ClusterActionUpdate)
+		if err = impl.upsertClusterConfigMap(bean, cmData, labels); err != nil {
+			impl.logger.Errorw("error upserting cluster secret", "cmData", cmData, "err", err)
 			// TODO Asutosh: why error is not propagated ??
 			return bean, nil
 		}
 	}
 	return bean, nil
 }
 
-func (impl *ClusterServiceImpl) upsertClusterSecret(bean *bean.ClusterBean, data map[string][]byte) error {
+func (impl *ClusterServiceImpl) upsertClusterConfigMap(bean *bean.ClusterBean, data, labels map[string]string) error {
 	k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
 	if err != nil {
 		impl.logger.Errorw("error in getting k8s client", "err", err)
 		return err
 	}
-	// below secret will act as an event for informer running on a secret object in kubelink and kubewatch
-	secretName := ParseSecretNameForKubelinkInformer(bean.Id)
-	secret, err := impl.K8sUtil.GetSecret(clusterBean.DefaultNamespace, secretName, k8sClient)
+	// below cm will act as an event for informer running on a secret object in kubelink and kubewatch
+	cmName := ParseCmNameForK8sInformerOnClusterEvent(bean.Id)
+	configMap, err := impl.K8sUtil.GetConfigMap(bean3.DevtronCDNamespae, cmName, k8sClient)
 	if err != nil && !k8sError.IsNotFound(err) {
-		impl.logger.Errorw("error in getting cluster secret", "secretName", secretName, "err", err)
+		impl.logger.Errorw("error in getting cluster config map", "cmName", cmName, "err", err)
 		return err
 	} else if k8sError.IsNotFound(err) {
-		_, err = impl.K8sUtil.CreateSecret(clusterBean.DefaultNamespace, data, secretName, informerBean.ClusterModifyEventSecretType, k8sClient, nil, nil)
+		_, err = impl.K8sUtil.CreateConfigMapObject(bean3.DevtronCDNamespae, data, cmName, k8sClient, labels, nil)
 		if err != nil {
-			impl.logger.Errorw("error in creating secret for informers", "secretName", secretName, "err", err)
+			impl.logger.Errorw("error in creating cm object for informer", "cmName", cmName, "err", err)
 			return err
 		}
 	} else {
-		secret.Data = data
-		secret, err = impl.K8sUtil.UpdateSecret(clusterBean.DefaultNamespace, secret, k8sClient)
+		configMap.Data = data
+		configMap, err = impl.K8sUtil.UpdateConfigMap(bean3.DevtronCDNamespae, configMap, k8sClient)
 		if err != nil {
-			impl.logger.Errorw("error in updating secret for informers", "secretName", secretName, "err", err)
+			impl.logger.Errorw("error in updating cm for informers", "cmName", cmName, "err", err)
 			return err
 		}
 	}
@@ -602,15 +588,6 @@ func (impl *ClusterServiceImpl) DeleteFromDb(bean *bean.ClusterBean, userId int3
 		impl.logger.Errorw("error in deleting cluster", "id", bean.Id, "err", err)
 		return "", err
 	}
-	k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
-	if err != nil {
-		impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterName", bean.ClusterName)
-		return "", nil
-	}
-	// TODO Asutosh: why we maintain this duplicate code ??
-	secretName := ParseSecretNameForKubelinkInformer(bean.Id)
-	err = impl.K8sUtil.DeleteSecret(clusterBean.DefaultNamespace, secretName, k8sClient)
-	impl.logger.Errorw("error in deleting secret", "error", err)
 	return existingCluster.ClusterName, nil
 }
 

pkg/cluster/bean/bean.go

@@ -83,6 +83,6 @@ type DefaultClusterComponent struct {
 }
 
 const (
-	DefaultNamespace     = "default"
-	SecretFieldUpdatedOn = "updated_on"
+	DefaultNamespace = "default"
+	CmFieldUpdatedOn = "updated_on"
 )

pkg/cluster/clusterUtil.go

@@ -3,9 +3,9 @@ package cluster
 import "fmt"
 
 const (
-	SecretName = "cluster-event"
+	CmName = "cluster-event"
 )
 
-func ParseSecretNameForKubelinkInformer(clusterId int) string {
-	return fmt.Sprintf("%s-%d", SecretName, clusterId)
+func ParseCmNameForK8sInformerOnClusterEvent(clusterId int) string {
+	return fmt.Sprintf("%s-%d", CmName, clusterId)
 }

pkg/cluster/helper/helper.go

@@ -0,0 +1,20 @@
+package helper
+
+import (
+	"fmt"
+	informerBean "github.com/devtron-labs/common-lib/informer"
+	clusterBean "github.com/devtron-labs/devtron/pkg/cluster/bean"
+	"time"
+)
+
+func CreateClusterModifyEventData(clusterId int, action string) (map[string]string, map[string]string) {
+	data := make(map[string]string)
+	data[informerBean.CmFieldClusterId] = fmt.Sprintf("%v", clusterId)
+	data[informerBean.CmFieldAction] = action
+	data[clusterBean.CmFieldUpdatedOn] = time.Now().String()
+
+	labels := make(map[string]string)
+	labels[informerBean.ClusterModifyEventSecretTypeKey] = informerBean.ClusterModifyEventSecretType
+
+	return data, labels
+}

pkg/delete/DeleteService.go

@@ -22,6 +22,7 @@ import (
 	dockerRegistryRepository "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
+	bean4 "github.com/devtron-labs/devtron/pkg/argoApplication/bean"
 	"github.com/devtron-labs/devtron/pkg/chartRepo"
 	"github.com/devtron-labs/devtron/pkg/cluster"
 	bean2 "github.com/devtron-labs/devtron/pkg/cluster/bean"
@@ -34,6 +35,7 @@ import (
 	bean3 "github.com/devtron-labs/devtron/pkg/team/bean"
 	"github.com/go-pg/pg"
 	"go.uber.org/zap"
+	k8sError "k8s.io/apimachinery/pkg/api/errors"
 	http2 "net/http"
 )
 
@@ -44,7 +46,7 @@ type DeleteService interface {
 	DeleteChartRepo(deleteRequest *chartRepo.ChartRepoDto) error
 	DeleteDockerRegistryConfig(deleteRequest *types.DockerArtifactStoreBean) error
 	CanDeleteChartRegistryPullConfig(storeId string) bool
-	DeleteClusterSecret(deleteRequest *bean2.ClusterBean, err error) error
+	DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean, err error) error
 }
 
 type DeleteServiceImpl struct {
@@ -91,25 +93,37 @@ func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, us
 		impl.logger.Errorw("error im deleting cluster", "err", err, "deleteRequest", deleteRequest)
 		return err
 	}
-	err = impl.DeleteClusterSecret(deleteRequest, err)
+	// deleting a cluster config map created at time of cluster creation/updation so that informer in kubelink and kubewatch can delete the cluster from cache
+	err = impl.DeleteClusterConfigMap(deleteRequest, err)
 	if err != nil {
-		impl.logger.Errorw("error in deleting cluster secret", "clusterId", deleteRequest.Id, "error", err)
+		impl.logger.Errorw("error in deleting cluster cm", "clusterId", deleteRequest.Id, "error", err)
 		return err
 	}
 	impl.k8sInformerFactory.DeleteClusterFromCache(clusterName)
 	return nil
 }
 
-func (impl DeleteServiceImpl) DeleteClusterSecret(deleteRequest *bean2.ClusterBean, err error) error {
+func (impl DeleteServiceImpl) DeleteClusterConfigMap(deleteRequest *bean2.ClusterBean, err error) error {
 	// kubelink informers are listening this secret, deleting this secret will inform kubelink that this cluster is deleted
 	k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
 	if err != nil {
 		impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterName", deleteRequest.ClusterName)
 		return nil
 	}
-	secretName := cluster.ParseSecretNameForKubelinkInformer(deleteRequest.Id)
-	err = impl.K8sUtil.DeleteSecret(bean2.DefaultNamespace, secretName, k8sClient)
-	return err
+	cmName := cluster.ParseCmNameForK8sInformerOnClusterEvent(deleteRequest.Id)
+	err = impl.K8sUtil.DeleteConfigMap(bean4.DevtronCDNamespae, cmName, k8sClient)
+	if k8sError.IsNotFound(err) {
+		// when cm not found in devtroncd ns then delete the secret in default ns(secret name would be the same as cm name)
+		err1 := impl.K8sUtil.DeleteSecret(bean2.DefaultNamespace, cmName, k8sClient)
+		if err1 != nil {
+			impl.logger.Errorw("error in deleting cluster secret in default ns ", "secretName", cmName, "err", err1)
+			return err1
+		}
+	} else if err != nil {
+		impl.logger.Errorw("error in deleting cluster config map in devtroncd ns ", "cmName", cmName, "err", err)
+		return err
+	}
+	return nil
 }
 
 func (impl DeleteServiceImpl) DeleteEnvironment(deleteRequest *bean.EnvironmentBean, userId int32) error {

pkg/delete/DeleteServiceExtended.go

@@ -96,7 +96,7 @@ func (impl DeleteServiceExtendedImpl) DeleteCluster(deleteRequest *bean2.Cluster
 		impl.logger.Errorw("error im deleting cluster", "err", err, "deleteRequest", deleteRequest)
 		return err
 	}
-	err = impl.DeleteClusterSecret(deleteRequest, err)
+	err = impl.DeleteClusterConfigMap(deleteRequest, err)
 	if err != nil {
 		impl.logger.Errorw("error in deleting cluster secret", "clusterId", deleteRequest.Id, "error", err)
 		return err