Add editing of CHIs

Author: ghjm

go.mod

@@ -8,6 +8,7 @@ require (
 	github.com/emicklei/go-restful-openapi/v2 v2.6.0
 	github.com/emicklei/go-restful/v3 v3.7.1
 	github.com/go-openapi/spec v0.20.4
+	github.com/kubernetes-sigs/yaml v1.1.0 // indirect
 	k8s.io/api v0.22.4
 	k8s.io/apimachinery v0.22.3
 	k8s.io/client-go v0.22.3

internal/api/api_model.go

@@ -30,13 +30,27 @@ type OperatorPod struct {
 	Version string `json:"version" description:"version of the pod"`
 }
 
+type ResourceSpecMetadata struct {
+	Name            string `json:"name"`
+	Namespace       string `json:"namespace"`
+	ResourceVersion string `json:"resourceVersion"`
+}
+
+type ResourceSpec struct {
+	APIVersion string               `json:"apiVersion"`
+	Kind       string               `json:"kind"`
+	Metadata   ResourceSpecMetadata `json:"metadata"`
+	Spec       interface{}          `json:"spec"`
+}
+
 type Chi struct {
 	Name          string         `json:"name" description:"name of the ClickHouse installation"`
 	Namespace     string         `json:"namespace" description:"namespace the installation is in"`
 	Status        string         `json:"status" description:"status of the installation"`
 	Clusters      int            `json:"clusters" description:"number of clusters in the installation"`
 	Hosts         int            `json:"hosts" description:"number of hosts in the installation"`
 	ExternalURL   string         `json:"external_url" description:"external URL of the loadbalancer service"`
+	ResourceYAML  string         `json:"resource_yaml" description:"Kubernetes YAML spec of the CHI resource"`
 	CHClusterPods []CHClusterPod `json:"ch_cluster_pods" description:"ClickHouse cluster pods"`
 }
 

internal/api/chi.go

@@ -7,6 +7,7 @@ import (
 	"github.com/altinity/altinity-dashboard/internal/utils"
 	chopv1 "github.com/altinity/clickhouse-operator/pkg/apis/clickhouse.altinity.com/v1"
 	"github.com/emicklei/go-restful/v3"
+	"github.com/kubernetes-sigs/yaml"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -46,12 +47,26 @@ func (c *ChiResource) WebService(_ *WebServiceInfo) (*restful.WebService, error)
 		Writes([]Chi{}).
 		Returns(200, "OK", []Chi{}))
 
-	ws.Route(ws.PUT("/{namespace}").To(c.handlePutCHI).
-		Doc("deploy a ClickHouse Installation from YAML").
+	ws.Route(ws.GET("/{namespace}/{name}").To(c.getCHIs).
+		Doc("get a single ClickHouse Installation").
+		Param(ws.PathParameter("namespace", "namespace to get from").DataType("string")).
+		Param(ws.PathParameter("name", "name of the CHI to get").DataType("string")).
+		Writes([]Chi{}).
+		Returns(200, "OK", []Chi{}))
+
+	ws.Route(ws.POST("/{namespace}").To(c.handlePostCHI).
+		Doc("deploy a new ClickHouse Installation from YAML").
 		Param(ws.PathParameter("namespace", "namespace to deploy to").DataType("string")).
 		Reads(ChiPutParams{}).
 		Returns(200, "OK", nil))
 
+	ws.Route(ws.PATCH("/{namespace}/{name}").To(c.handlePatchCHI).
+		Doc("update an existing ClickHouse Installation from YAML").
+		Param(ws.PathParameter("namespace", "namespace the CHI is in").DataType("string")).
+		Param(ws.PathParameter("name", "name of the CHI to update").DataType("string")).
+		Reads(ChiPutParams{}).
+		Returns(200, "OK", nil))
+
 	ws.Route(ws.DELETE("/{namespace}/{name}").To(c.handleDeleteCHI).
 		Doc("delete a ClickHouse installation").
 		Param(ws.PathParameter("namespace", "namespace to delete from").DataType("string")).
@@ -66,10 +81,20 @@ func (c *ChiResource) getCHIs(request *restful.Request, response *restful.Respon
 	if !ok {
 		namespace = ""
 	}
+	name, ok := request.PathParameters()["name"]
+	if !ok {
+		name = ""
+	}
 
 	k := utils.GetK8s()
+	var fieldSelector string
+	if name != "" {
+		fieldSelector = "metadata.name=" + name
+	}
 	chis, err := k.ChopClientset.ClickhouseV1().ClickHouseInstallations(namespace).List(
-		context.TODO(), metav1.ListOptions{})
+		context.TODO(), metav1.ListOptions{
+			FieldSelector: fieldSelector,
+		})
 	if err != nil {
 		webError(response, http.StatusBadRequest, "listing CHIs", err)
 		return
@@ -85,7 +110,8 @@ func (c *ChiResource) getCHIs(request *restful.Request, response *restful.Respon
 				},
 				MatchExpressions: nil,
 			}
-			pods, err := getK8sPodsFromLabelSelector(chi.Namespace, sel)
+			var pods *v1.PodList
+			pods, err = getK8sPodsFromLabelSelector(chi.Namespace, sel)
 			if err == nil {
 				for _, pod := range getPodsFromK8sPods(pods) {
 					chClusterPod := CHClusterPod{
@@ -130,65 +156,107 @@ func (c *ChiResource) getCHIs(request *restful.Request, response *restful.Respon
 				}
 			}
 		}
+		var y []byte
+		y, err = yaml.Marshal(ResourceSpec{
+			APIVersion: chi.APIVersion,
+			Kind:       chi.Kind,
+			Metadata: ResourceSpecMetadata{
+				Name:            chi.Name,
+				Namespace:       chi.Namespace,
+				ResourceVersion: chi.ResourceVersion,
+			},
+			Spec: chi.Spec,
+		})
+		if err != nil {
+			y = nil
+		}
 		list = append(list, Chi{
 			Name:          chi.Name,
 			Namespace:     chi.Namespace,
 			Status:        chi.Status.Status,
 			Clusters:      chi.Status.ClustersCount,
 			Hosts:         chi.Status.HostsCount,
 			ExternalURL:   externalURL,
+			ResourceYAML:  string(y),
 			CHClusterPods: chClusterPods,
 		})
 	}
 	_ = response.WriteEntity(list)
 }
 
 var ErrNamespaceRequired = errors.New("namespace is required")
-var ErrNameAndNamespaceRequired = errors.New("name and namespace are required")
+var ErrNameRequired = errors.New("name is required")
 var ErrYAMLMustBeCHI = errors.New("YAML document must contain a single ClickhouseInstallation definition")
 
-func (c *ChiResource) handlePutCHI(request *restful.Request, response *restful.Response) {
+func (c *ChiResource) handlePostOrPatchCHI(request *restful.Request, response *restful.Response, doPost bool) {
 	namespace, ok := request.PathParameters()["namespace"]
 	if !ok || namespace == "" {
 		webError(response, http.StatusBadRequest, "processing request", ErrNamespaceRequired)
 		return
 	}
+	name := ""
+	if !doPost {
+		name, ok = request.PathParameters()["name"]
+		if !ok || name == "" {
+			webError(response, http.StatusBadRequest, "processing request", ErrNameRequired)
+			return
+		}
+	}
 
 	putParams := ChiPutParams{}
 	err := request.ReadEntity(&putParams)
 	if err != nil {
 		webError(response, http.StatusBadRequest, "reading request body", err)
 		return
 	}
-	var rejected = false
-	err = utils.GetK8s().DoApplySelectively(putParams.YAML, namespace,
-		func(candidates []*unstructured.Unstructured) []*unstructured.Unstructured {
-			if len(candidates) != 1 {
-				rejected = true
-				return nil
-			}
-			if candidates[0].GetKind() != "ClickHouseInstallation" {
-				rejected = true
-				return nil
-			}
-			return candidates
-		})
-	if rejected {
+
+	k := utils.GetK8s()
+	var obj *unstructured.Unstructured
+	obj, err = k.DecodeYAMLToObject(putParams.YAML)
+	if err != nil {
+		webError(response, http.StatusBadRequest, "parsing YAML object", err)
+		return
+	}
+	if obj.GetAPIVersion() != "clickhouse.altinity.com/v1" ||
+		obj.GetKind() != "ClickHouseInstallation" ||
+		(!doPost && (obj.GetNamespace() != namespace ||
+			obj.GetName() != name)) {
 		webError(response, http.StatusBadRequest, "processing request", ErrYAMLMustBeCHI)
 		return
 	}
+	var errSource string
+	if doPost {
+		errSource = "creating CHI"
+		err = k.SingleObjectCreate(obj, namespace)
+	} else {
+		errSource = "updating CHI"
+		err = k.SingleObjectUpdate(obj, namespace)
+	}
 	if err != nil {
-		webError(response, http.StatusInternalServerError, "applying CHI", err)
+		webError(response, http.StatusInternalServerError, errSource, err)
 		return
 	}
 	_ = response.WriteEntity(nil)
 }
 
+func (c *ChiResource) handlePostCHI(request *restful.Request, response *restful.Response) {
+	c.handlePostOrPatchCHI(request, response, true)
+}
+
+func (c *ChiResource) handlePatchCHI(request *restful.Request, response *restful.Response) {
+	c.handlePostOrPatchCHI(request, response, false)
+}
+
 func (c *ChiResource) handleDeleteCHI(request *restful.Request, response *restful.Response) {
-	namespace, ok1 := request.PathParameters()["namespace"]
-	name, ok2 := request.PathParameters()["name"]
-	if !ok1 || !ok2 || name == "" || namespace == "" {
-		webError(response, http.StatusBadRequest, "processing request", ErrNameAndNamespaceRequired)
+	namespace, ok := request.PathParameters()["namespace"]
+	if !ok || namespace == "" {
+		webError(response, http.StatusBadRequest, "processing request", ErrNamespaceRequired)
+		return
+	}
+	var name string
+	name, ok = request.PathParameters()["name"]
+	if !ok || name == "" {
+		webError(response, http.StatusBadRequest, "processing request", ErrNameRequired)
 		return
 	}
 

internal/api/operator.go

@@ -182,7 +182,7 @@ func (o *OperatorResource) deployOrDeleteOperator(namespace string, version stri
 			// Delete cluster-wide resources if we're deleting the last operator
 			namespace = ""
 		}
-		err = k.DoDelete(deploy, namespace)
+		err = k.MultiYamlDelete(deploy, namespace)
 		if err != nil {
 			return err
 		}
@@ -194,7 +194,7 @@ func (o *OperatorResource) deployOrDeleteOperator(namespace string, version stri
 			}
 		}
 		if isUpgrade {
-			err = k.DoApplySelectively(deploy, namespace,
+			err = k.MultiYamlApplySelectively(deploy, namespace,
 				func(candidates []*unstructured.Unstructured) []*unstructured.Unstructured {
 					selected := make([]*unstructured.Unstructured, 0)
 					for _, c := range candidates {
@@ -208,7 +208,7 @@ func (o *OperatorResource) deployOrDeleteOperator(namespace string, version stri
 				return err
 			}
 		} else {
-			err = k.DoApply(deploy, namespace)
+			err = k.MultiYamlApply(deploy, namespace)
 			if err != nil {
 				return err
 			}