Merge pull request #280 from devtron-labs/rename-secret-to-cm-cluster

chore: when a cluster event occurs, create config map instead of secret

Author: prakash100198

common-lib/informer/bean.go

@@ -17,12 +17,15 @@
 package informer
 
 const (
-	ClusterModifyEventSecretType = "cluster.request/modify"
-	ClusterActionAdd             = "add"
-	ClusterActionUpdate          = "update"
-	ClusterActionDelete          = "delete"
-	SecretFieldAction            = "action"
-	SecretFieldClusterId         = "cluster_id"
+	ClusterModifyEventSecretType      = "cluster.request/modify"
+	ClusterModifyEventSecretTypeKey   = "type"
+	ClusterActionAdd                  = "add"
+	ClusterActionUpdate               = "update"
+	ClusterActionDelete               = "delete"
+	CmFieldAction                     = "action"
+	CmFieldClusterId                  = "cluster_id"
+	ClusterModifyEventCmLabelKeyValue = "type=devtron.ai-cluster-request-modify"
+	ClusterModifyEventCmLabelValue    = "devtron.ai-cluster-request-modify"
 )
 
 const (

common-lib/utils/k8s/K8sService.go

@@ -19,6 +19,7 @@ package k8s
 import (
 	"context"
 	"flag"
+	"github.com/devtron-labs/common-lib/utils/k8s/configMap"
 	"go.uber.org/zap"
 	"io"
 	batchV1 "k8s.io/api/batch/v1"
@@ -76,7 +77,9 @@ type K8sService interface {
 	PatchConfigMap(namespace string, clusterConfig *ClusterConfig, name string, data map[string]interface{}) (*v1.ConfigMap, error)
 	UpdateConfigMap(namespace string, cm *v1.ConfigMap, client *v12.CoreV1Client) (*v1.ConfigMap, error)
 	CreateConfigMap(namespace string, cm *v1.ConfigMap, client *v12.CoreV1Client) (*v1.ConfigMap, error)
+	CreateConfigMapObject(name, namespace string, client *v12.CoreV1Client, opts ...configMap.ConfigMapOption) (*v1.ConfigMap, error)
 	GetConfigMap(namespace string, name string, client *v12.CoreV1Client) (*v1.ConfigMap, error)
+	DeleteConfigMap(namespace string, name string, client *v12.CoreV1Client) error
 	GetConfigMapWithCtx(ctx context.Context, namespace string, name string, client *v12.CoreV1Client) (*v1.ConfigMap, error)
 	GetNsIfExists(namespace string, client *v12.CoreV1Client) (ns *v1.Namespace, exists bool, err error)
 	CreateNsIfNotExists(namespace string, clusterConfig *ClusterConfig) (ns *v1.Namespace, nsCreated bool, err error)

common-lib/utils/k8s/K8sUtil.go

@@ -24,6 +24,7 @@ import (
 	"github.com/devtron-labs/common-lib/utils"
 	http2 "github.com/devtron-labs/common-lib/utils/http"
 	"github.com/devtron-labs/common-lib/utils/k8s/commonBean"
+	"github.com/devtron-labs/common-lib/utils/k8s/configMap"
 	"io"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -237,6 +238,27 @@ func (impl *K8sServiceImpl) CreateConfigMap(namespace string, cm *v1.ConfigMap,
 	}
 }
 
+func (impl *K8sServiceImpl) CreateConfigMapObject(name, namespace string, client *v12.CoreV1Client, opts ...configMap.ConfigMapOption) (*v1.ConfigMap, error) {
+	configMap := &v1.ConfigMap{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+	}
+	for _, option := range opts {
+		option(configMap)
+	}
+	return impl.CreateConfigMap(namespace, configMap, client)
+}
+
+func (impl *K8sServiceImpl) DeleteConfigMap(namespace string, name string, client *v12.CoreV1Client) error {
+	err := client.ConfigMaps(namespace).Delete(context.Background(), name, metav1.DeleteOptions{})
+	if err != nil {
+		impl.logger.Errorw("error in deleting cm", "namespace", namespace, "err", err)
+		return err
+	}
+	return nil
+}
+
 func (impl *K8sServiceImpl) UpdateConfigMap(namespace string, cm *v1.ConfigMap, client *v12.CoreV1Client) (*v1.ConfigMap, error) {
 	cm, err := client.ConfigMaps(namespace).Update(context.Background(), cm, metav1.UpdateOptions{})
 	if err != nil {

common-lib/utils/k8s/configMap/Options.go

@@ -0,0 +1,43 @@
+package configMap
+
+import (
+	v1 "k8s.io/api/core/v1"
+)
+
+type ConfigMapOption func(*v1.ConfigMap)
+
+// WithLabels adds labels to a ConfigMap
+func WithLabels(labels map[string]string) ConfigMapOption {
+	return func(cm *v1.ConfigMap) {
+		if labels != nil && len(labels) > 0 {
+			cm.ObjectMeta.Labels = labels
+		}
+	}
+}
+
+// WithAnnotations adds annotations to a ConfigMap
+func WithAnnotations(annotations map[string]string) ConfigMapOption {
+	return func(cm *v1.ConfigMap) {
+		if annotations != nil && len(annotations) > 0 {
+			cm.ObjectMeta.Annotations = annotations
+		}
+	}
+}
+
+// WithData adds string data to a ConfigMap
+func WithData(data map[string]string) ConfigMapOption {
+	return func(cm *v1.ConfigMap) {
+		if data != nil && len(data) > 0 {
+			cm.Data = data
+		}
+	}
+}
+
+// WithBinaryData adds binary data to a ConfigMap
+func WithBinaryData(binaryData map[string][]byte) ConfigMapOption {
+	return func(cm *v1.ConfigMap) {
+		if binaryData != nil && len(binaryData) > 0 {
+			cm.BinaryData = binaryData
+		}
+	}
+}