Add domain option for add/edit service command (kuberlogic#199)

* Add domain option for add/edit service command

Author: AvoidMe

modules/dynamic-apiserver/Makefile

@@ -83,7 +83,7 @@ generate: generate-server generate-client
 
 .PHONY: docker-build
 docker-build: export LDFLAGS="-X github.com/kuberlogic/kuberlogic/modules/dynamic-apiserver/cmd.ver=$(VERSION)"
-docker-build: 
+docker-build:
 	CGO_ENABLED=0 \
 	GOOS=linux \
 	GOARCH=amd64 \

modules/dynamic-apiserver/openapi.yaml

@@ -450,7 +450,6 @@ definitions:
         $ref: "#/definitions/Advanced"
 
       domain:
-        readOnly: true
         type: string
 
       status:

modules/dynamic-apiserver/pkg/cli/service_add_operation.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+
 	client2 "github.com/go-openapi/runtime/client"
 	"github.com/kuberlogic/kuberlogic/modules/dynamic-apiserver/pkg/generated/client"
 	"github.com/spf13/viper"
@@ -26,6 +27,7 @@ func makeServiceAddCmd(apiClientFunc func() (*client.ServiceAPI, error)) *cobra.
 	_ = cmd.PersistentFlags().Int64("replicas", 1, "how many replicas need for service")
 	_ = cmd.PersistentFlags().String("version", "", "what the version of service")
 	_ = cmd.PersistentFlags().String("backup_schedule", "", "backup schedule in cron format")
+	_ = cmd.PersistentFlags().String("domain", "", "on which domain service will be available")
 	_ = cmd.PersistentFlags().Bool("tls_enabled", false, "")
 	_ = cmd.PersistentFlags().Bool(subscriptionIdFlag, false, "")
 
@@ -90,6 +92,12 @@ func runServiceAdd(apiClientFunc func() (*client.ServiceAPI, error)) func(cmd *c
 			svc.TLSEnabled = *value
 		}
 
+		if value, err := getString(cmd, "domain"); err != nil {
+			return err
+		} else if value != nil {
+			svc.Domain = *value
+		}
+
 		if value, err := getString(cmd, subscriptionIdFlag); err != nil {
 			return err
 		} else if value != nil {

modules/dynamic-apiserver/pkg/cli/service_edit_operation.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+
 	client2 "github.com/go-openapi/runtime/client"
 	"github.com/kuberlogic/kuberlogic/modules/dynamic-apiserver/pkg/generated/client"
 	"github.com/pkg/errors"
@@ -27,6 +28,7 @@ func makeServiceEditCmd(apiClientFunc func() (*client.ServiceAPI, error)) *cobra
 	_ = cmd.PersistentFlags().String("version", "", "what the version of service")
 	_ = cmd.PersistentFlags().String("backup_schedule", "", "backup schedule in cron format")
 	_ = cmd.PersistentFlags().Bool("tls_enabled", false, "")
+	_ = cmd.PersistentFlags().String("domain", "", "on which domain service will be available")
 
 	// limits
 	_ = cmd.PersistentFlags().String("limits.cpu", "", "cpu limits")
@@ -88,6 +90,12 @@ func runServiceEdit(apiClientFunc func() (*client.ServiceAPI, error)) func(cmd *
 			svc.TLSEnabled = *value
 		}
 
+		if value, err := getString(cmd, "domain"); err != nil {
+			return err
+		} else if value != nil {
+			svc.Domain = *value
+		}
+
 		if value, err := getString(cmd, "limits.cpu"); err != nil {
 			return err
 		} else if value != nil {
@@ -130,6 +138,9 @@ func runServiceEdit(apiClientFunc func() (*client.ServiceAPI, error)) func(cmd *
 
 		// set required fields
 		svc.Type = getResponse.GetPayload().Type
+		if svc.Domain == "" {
+			svc.Domain = getResponse.GetPayload().Domain
+		}
 
 		// make request and then print result
 		response, err := apiClient.Service.ServiceEdit(editParams, client2.APIKeyAuth(

modules/dynamic-apiserver/pkg/generated/models/service.go

@@ -6,6 +6,8 @@ package util
 
 import (
 	"encoding/json"
+	"fmt"
+
 	"github.com/go-openapi/strfmt"
 	"github.com/kuberlogic/kuberlogic/modules/dynamic-apiserver/pkg/config"
 	"github.com/kuberlogic/kuberlogic/modules/dynamic-apiserver/pkg/generated/models"
@@ -37,7 +39,11 @@ func ServiceToKuberlogic(svc *models.Service, cfg *config.Config) (*kuberlogicco
 		c.Spec.Version = svc.Version
 	}
 
-	c.Spec.Domain = cfg.Domain
+	c.Spec.Domain = fmt.Sprintf("%s.%s", *svc.ID, cfg.Domain)
+	if svc.Domain != "" {
+		c.Spec.Domain = svc.Domain
+	}
+
 	if svc.BackupSchedule != "" {
 		c.Spec.BackupSchedule = svc.BackupSchedule
 	}

modules/dynamic-apiserver/pkg/generated/restapi/embedded_spec.go

@@ -211,5 +211,5 @@ patch-webhook-endpoint:
 .PHONY: generate-local-webhook-certs
 generate-local-webhook-certs:
 	mkdir -p /tmp/k8s-webhook-server/serving-certs/; \
-	kubectl get secret webhook-server-cert -o=jsonpath="{.data['tls\.key']}" | base64 -d >  /tmp/k8s-webhook-server/serving-certs/tls.key
-	kubectl get secret webhook-server-cert -o=jsonpath="{.data['tls\.crt']}" | base64 -d >  /tmp/k8s-webhook-server/serving-certs/tls.crt
+	kubectl get secret --namespace=kuberlogic webhook-server-cert -o=jsonpath="{.data['tls\.key']}" | base64 -d >  /tmp/k8s-webhook-server/serving-certs/tls.key
+	kubectl get secret --namespace=kuberlogic webhook-server-cert -o=jsonpath="{.data['tls\.crt']}" | base64 -d >  /tmp/k8s-webhook-server/serving-certs/tls.crt

modules/dynamic-apiserver/pkg/util/util.go

@@ -5,11 +5,12 @@
 package v1alpha1
 
 import (
+	"time"
+
 	v1 "k8s.io/api/core/v1"
 	v11 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"time"
 )
 
 const (
@@ -111,11 +112,7 @@ func (in *KuberLogicService) TLSEnabled() bool {
 }
 
 func (in *KuberLogicService) GetHost() string {
-	var host string
-	if in.Spec.Domain != "" {
-		host = in.GetName() + "." + in.Spec.Domain
-	}
-	return host
+	return in.Spec.Domain
 }
 
 func (in *KuberLogicService) SetAccessEndpoint() {

modules/dynamic-operator/Makefile

@@ -5,26 +5,32 @@
 package v1alpha1
 
 import (
+	"context"
 	"encoding/json"
+	"fmt"
+
 	"github.com/kuberlogic/kuberlogic/modules/dynamic-operator/plugin/commons"
 	"github.com/pkg/errors"
 	"github.com/robfig/cron"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 var log = ctrl.Log.WithName("kuberlogicservice-webhook")
 
 var pluginInstances map[string]commons.PluginService
+var k8sClient client.Client
 
 var (
 	errInvalidBackupSchedule = errors.New("invalid backupSchedule format")
 	errVolDownsizeForbidden  = errors.New("volume downsize forbidden")
 )
 
 func (r *KuberLogicService) SetupWebhookWithManager(mgr ctrl.Manager, plugins map[string]commons.PluginService) error {
+	k8sClient = mgr.GetClient()
 	pluginInstances = plugins
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
@@ -134,6 +140,10 @@ func (r *KuberLogicService) ValidateCreate() error {
 	if err = plugin.ValidateCreate(*req).Error(); err != nil {
 		return err
 	}
+
+	if err = validateDomain(r.Spec.Domain); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -169,6 +179,13 @@ func (r *KuberLogicService) ValidateUpdate(old runtime.Object) error {
 	if err = plugin.ValidateUpdate(*req).Error(); err != nil {
 		return err
 	}
+
+	if r.Spec.Domain != oldSpec.Spec.Domain {
+		if err = validateDomain(r.Spec.Domain); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
@@ -221,3 +238,16 @@ func validateScheduleFormat(schedule string) error {
 	_, err := cron.ParseStandard(schedule)
 	return err
 }
+
+func validateDomain(domain string) error {
+	klsList := &KuberLogicServiceList{}
+	if err := k8sClient.List(context.TODO(), klsList); err != nil {
+		return err
+	}
+	for _, item := range klsList.Items {
+		if item.Spec.Domain == domain {
+			return errors.New(fmt.Sprintf("Domain %s conflicts with tenant: %s", domain, item.Name))
+		}
+	}
+	return nil
+}

modules/dynamic-operator/api/v1alpha1/kuberlogicservice_types.go

@@ -5,6 +5,8 @@
 package v1alpha1
 
 import (
+	"time"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	v1 "k8s.io/api/core/v1"
@@ -13,7 +15,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"time"
 )
 
 var _ = Describe("KuberlogicService controller", func() {
@@ -48,6 +49,7 @@ var _ = Describe("KuberlogicService controller", func() {
 				Type:     "docker-compose",
 				Replicas: defaultReplicas,
 				Limits:   defaultLimits,
+				Domain:   "kls.com",
 			},
 		}
 
@@ -59,20 +61,21 @@ var _ = Describe("KuberlogicService controller", func() {
 			Spec: KuberLogicServiceSpec{
 				Type:     "docker-compose",
 				Replicas: defaultReplicas,
+				Domain:   "default-resources.com",
 			},
 		}
 
 		It("Should create KuberLogicService resource", func() {
 			By("By creating a new KuberLogicService")
 
-			Expect(k8sClient.Create(ctx, kls)).Should(Succeed())
+			Expect(testK8sClient.Create(ctx, kls)).Should(Succeed())
 
 			By("By checking a new KuberLogicService")
 			lookupKlsKey := types.NamespacedName{Name: klsName, Namespace: klsNamespace}
 			createdKls := &KuberLogicService{}
 
 			Eventually(func() error {
-				return k8sClient.Get(ctx, lookupKlsKey, createdKls)
+				return testK8sClient.Get(ctx, lookupKlsKey, createdKls)
 			}, timeout, interval).Should(Not(HaveOccurred()))
 
 			log.Info("resources", "res", createdKls.Spec.Limits)
@@ -82,30 +85,30 @@ var _ = Describe("KuberlogicService controller", func() {
 
 			By("By creating a new KuberLogicService with default limits")
 
-			Expect(k8sClient.Create(ctx, defaultResourceKls)).Should(Succeed())
+			Expect(testK8sClient.Create(ctx, defaultResourceKls)).Should(Succeed())
 
 			By("By checking default plugin resources")
 			Eventually(func() error {
-				return k8sClient.Get(ctx, client.ObjectKeyFromObject(defaultResourceKls), createdKls)
+				return testK8sClient.Get(ctx, client.ObjectKeyFromObject(defaultResourceKls), createdKls)
 			}, timeout, interval).Should(Not(HaveOccurred()))
 
 			log.Info("resources", "res", createdKls.Spec.Limits)
 			Expect(createdKls.Spec.Limits["storage"]).Should(Equal(resource.MustParse("1Gi")))
 
 			By("Volume downsize is not supported")
 			defaultResourceKls.Spec.Limits["storage"] = resource.MustParse("1Mi")
-			Expect(k8sClient.Update(ctx, defaultResourceKls).Error()).Should(ContainSubstring("volume downsize forbidden"))
+			Expect(testK8sClient.Update(ctx, defaultResourceKls).Error()).Should(ContainSubstring("volume downsize forbidden"))
 		})
 		It("Should remove KuberLogicService resource", func() {
 			By("Removing KuberLogicService resource")
 
 			for _, item := range []*KuberLogicService{kls, defaultResourceKls} {
-				Expect(k8sClient.Delete(ctx, item)).Should(Succeed())
+				Expect(testK8sClient.Delete(ctx, item)).Should(Succeed())
 
 				By("By checking a new KuberLogicService")
 				removedKls := &KuberLogicService{}
 				Eventually(func() bool {
-					return errors.IsNotFound(k8sClient.Get(ctx, client.ObjectKeyFromObject(item), removedKls))
+					return errors.IsNotFound(testK8sClient.Get(ctx, client.ObjectKeyFromObject(item), removedKls))
 				}, timeout, interval).Should(BeTrue())
 			}
 		})

modules/dynamic-operator/api/v1alpha1/kuberlogicservice_webhook.go

@@ -38,7 +38,7 @@ import (
 // http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
 
 var (
-	k8sClient     client.Client
+	testK8sClient client.Client
 	testEnv       *envtest.Environment
 	ctx           context.Context
 	cancel        context.CancelFunc
@@ -81,9 +81,9 @@ var _ = BeforeSuite(func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(cfg).NotTo(BeNil())
 
-		k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
+		testK8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
 		Expect(err).NotTo(HaveOccurred())
-		Expect(k8sClient).NotTo(BeNil())
+		Expect(testK8sClient).NotTo(BeNil())
 	} else {
 
 		By("bootstrapping test environment")
@@ -99,9 +99,9 @@ var _ = BeforeSuite(func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(cfg).NotTo(BeNil())
 
-		k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
+		testK8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
 		Expect(err).NotTo(HaveOccurred())
-		Expect(k8sClient).NotTo(BeNil())
+		Expect(testK8sClient).NotTo(BeNil())
 
 		logger := hclog.New(&hclog.LoggerOptions{
 			Name:   "plugin",