Make Deploy facade checks k8s cluster version and compare with the mi…

…n-version in metadata.yaml;
sdg0919 · Sep 13, 2019 · 2e58799 · 2e58799
1 parent 1c80589
commit 2e58799
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 59 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -147,7 +147,9 @@
 
 [[constraint]]
   name = "gopkg.in/juju/charm.v6"
-  revision = "cf3ec8f263e4b35e70f76f8b660284ac26517958"
+  # revision = "cf3ec8f263e4b35e70f76f8b660284ac26517958"
+  source = "github.com/ycliuhw/charm"
+  revision = "c976888d3eca2099091d3dfb0f759995176abc29"
 
 [[constraint]]
   revision = "2adcece4e962a51e0793b8562560cf9da874026f"

diff --git a/api/caasunitprovisioner/client.go b/api/caasunitprovisioner/client.go
@@ -147,7 +147,7 @@ func (c *Client) WatchPodSpec(application string) (watcher.NotifyWatcher, error)
 type DeploymentInfo struct {
 	DeploymentType string
 	ServiceType    string
-	Demonset       bool
+	Daemonset      bool
 }
 
 // ProvisioningInfo holds unit provisioning info.
@@ -189,7 +189,7 @@ func (c *Client) ProvisioningInfo(appName string) (*ProvisioningInfo, error) {
 		info.DeploymentInfo = DeploymentInfo{
 			DeploymentType: result.DeploymentInfo.DeploymentType,
 			ServiceType:    result.DeploymentInfo.ServiceType,
-			Demonset:       result.DeploymentInfo.Demonset,
+			Daemonset:      result.DeploymentInfo.Daemonset,
 		}
 	}
 

diff --git a/api/charms/client.go b/api/charms/client.go
@@ -95,11 +95,7 @@ func convertCharmMeta(meta *params.CharmMeta) (*charm.Meta, error) {
 	if meta == nil {
 		return nil, nil
 	}
-	minJujuVersion, err := version.Parse(meta.MinJujuVersion)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	minK8sVersion, err := version.Parse(meta.MinK8sVersion)
+	minVersion, err := version.Parse(meta.MinJujuVersion)
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
@@ -123,8 +119,7 @@ func convertCharmMeta(meta *params.CharmMeta) (*charm.Meta, error) {
 		PayloadClasses: convertCharmPayloadClassMap(meta.PayloadClasses),
 		Resources:      resources,
 		Terms:          meta.Terms,
-		MinJujuVersion: minJujuVersion,
-		MinK8sVersion:  minK8sVersion,
+		MinJujuVersion: minVersion,
 	}
 	return result, nil
 }

diff --git a/api/client.go b/api/client.go
@@ -436,18 +436,6 @@ func (c *Client) validateCharmVersions(ch charm.Charm) error {
 			return minVersionError(minver, agentver)
 		}
 	}
-
-	minver = ch.Meta().MinK8sVersion
-	if minver != version.Zero {
-		cloudVersion, err := c.cloudVersion()
-		if err != nil {
-			return errors.Trace(err)
-		}
-
-		if minver.Compare(cloudVersion) > 0 {
-			return minVersionError(minver, cloudVersion)
-		}
-	}
 	return nil
 }
 
@@ -624,16 +612,6 @@ func (c *Client) AgentVersion() (version.Number, error) {
 	return result.Version, nil
 }
 
-// ???????????????? K8sVersion or generic cloud version???????????
-// cloudVersion reports the version number of the provider cloud version.
-func (c *Client) cloudVersion() (version.Number, error) {
-	var result params.AgentVersionResult
-	if err := c.facade.FacadeCall("CloudVersion", nil, &result); err != nil {
-		return version.Number{}, err
-	}
-	return result.Version, nil
-}
-
 // websocketDial is called instead of dialer.Dial so we can override it in
 // tests.
 var websocketDial = websocketDialWithErrors

diff --git a/apiserver/facades/client/application/application.go b/apiserver/facades/client/application/application.go
@@ -108,7 +108,7 @@ type APIBase struct {
 
 	storagePoolManager    poolmanager.PoolManager
 	registry              storage.ProviderRegistry
-	storageValidator      caas.StorageValidator
+	caasBroker            caas.Broker
 	deployApplicationFunc func(ApplicationDeployer, DeployApplicationParams) (Application, error)
 }
 
@@ -193,14 +193,14 @@ func newFacadeBase(ctx facade.Context) (*APIBase, error) {
 	var (
 		storagePoolManager poolmanager.PoolManager
 		registry           storage.ProviderRegistry
-		storageValidator   caas.Broker
+		caasBroker         caas.Broker
 	)
 	if facadeModel.Type() == state.ModelTypeCAAS {
-		storageValidator, err = stateenvirons.GetNewCAASBrokerFunc(caas.New)(ctx.State())
+		caasBroker, err = stateenvirons.GetNewCAASBrokerFunc(caas.New)(ctx.State())
 		if err != nil {
 			return nil, errors.Annotate(err, "getting caas client")
 		}
-		registry = stateenvirons.NewStorageProviderRegistry(storageValidator)
+		registry = stateenvirons.NewStorageProviderRegistry(caasBroker)
 		storagePoolManager = poolmanager.New(state.NewStateSettings(ctx.State()), registry)
 	}
 
@@ -217,7 +217,7 @@ func newFacadeBase(ctx facade.Context) (*APIBase, error) {
 		storagePoolManager,
 		registry,
 		resources,
-		storageValidator,
+		caasBroker,
 	)
 }
 
@@ -233,7 +233,7 @@ func NewAPIBase(
 	storagePoolManager poolmanager.PoolManager,
 	registry storage.ProviderRegistry,
 	resources facade.Resources,
-	storageValidator caas.StorageValidator,
+	caasBroker caas.Broker,
 ) (*APIBase, error) {
 	if !authorizer.AuthClient() {
 		return nil, common.ErrPerm
@@ -250,7 +250,7 @@ func NewAPIBase(
 		storagePoolManager:    storagePoolManager,
 		registry:              registry,
 		resources:             resources,
-		storageValidator:      storageValidator,
+		caasBroker:            caasBroker,
 	}, nil
 }
 
@@ -366,7 +366,16 @@ func (api *APIBase) Deploy(args params.ApplicationsDeploy) (params.ErrorResults,
 	}
 
 	for i, arg := range args.Applications {
-		err := deployApplication(api.backend, api.model, api.stateCharm, arg, api.deployApplicationFunc, api.storagePoolManager, api.registry, api.storageValidator)
+		err := deployApplication(
+			api.backend,
+			api.model,
+			api.stateCharm,
+			arg,
+			api.deployApplicationFunc,
+			api.storagePoolManager,
+			api.registry,
+			api.caasBroker,
+		)
 		result.Results[i].Error = common.ServerError(err)
 
 		if err != nil && len(arg.Resources) != 0 {
@@ -480,7 +489,7 @@ func deployApplication(
 	deployApplicationFunc func(ApplicationDeployer, DeployApplicationParams) (Application, error),
 	storagePoolManager poolmanager.PoolManager,
 	registry storage.ProviderRegistry,
-	storageValidator caas.StorageValidator,
+	caasBroker caas.Broker,
 ) error {
 	curl, err := charm.ParseURL(args.CharmURL)
 	if err != nil {
@@ -491,6 +500,7 @@ func deployApplication(
 	}
 
 	modelType := model.Type()
+	var caasVersion *version.Number
 	if modelType != state.ModelTypeIAAS {
 		if len(args.AttachStorage) > 0 {
 			return errors.Errorf(
@@ -528,7 +538,7 @@ func deployApplication(
 			return errors.Errorf(
 				"the %q storage pool requires a provider type of %q, not %q", poolName, k8s.K8s_ProviderType, sp.Provider)
 		}
-		if err := storageValidator.ValidateStorageClass(sp.Attributes); err != nil {
+		if err := caasBroker.ValidateStorageClass(sp.Attributes); err != nil {
 			return errors.Trace(err)
 		}
 
@@ -542,6 +552,11 @@ func deployApplication(
 				return errors.Annotatef(err, "getting workload storage params for %q", args.ApplicationName)
 			}
 		}
+
+		caasVersion, err = caasBroker.Version()
+		if err != nil {
+			return errors.Trace(err)
+		}
 	}
 
 	// This check is done early so that errors deeper in the call-stack do not
@@ -556,7 +571,7 @@ func deployApplication(
 		return errors.Trace(err)
 	}
 
-	if err := checkMinVersion(ch); err != nil {
+	if err := checkMinVersion(ch, caasVersion); err != nil {
 		return errors.Trace(err)
 	}
 

diff --git a/apiserver/facades/client/application/charmstore.go b/apiserver/facades/client/application/charmstore.go
@@ -131,7 +131,7 @@ func AddCharmWithAuthorizationAndRepo(st State, args params.AddCharmWithAuthoriz
 		return errors.Trace(err)
 	}
 
-	if err := checkMinVersion(downloadedCharm); err != nil {
+	if err := checkMinVersion(downloadedCharm, nil); err != nil {
 		return errors.Trace(err)
 	}
 
@@ -248,11 +248,25 @@ func openCSClient(csAPIURL string, args params.AddCharmWithAuthorization) (*cscl
 	return csClient, nil
 }
 
-func checkMinVersion(ch charm.Charm) error {
+func checkMinVersion(ch charm.Charm, caasVersion *version.Number) (err error) {
+	// check Juju min version.
 	minver := ch.Meta().MinJujuVersion
 	if minver != version.Zero && minver.Compare(jujuversion.Current) > 0 {
 		return minVersionError(minver, jujuversion.Current)
 	}
+	if caasVersion == nil {
+		return nil
+	}
+	// check caas min version.
+	minver, err = version.Parse(ch.Meta().Deployment.MinVersion)
+	if err != nil {
+		return errors.Trace(err)
+	}
+	logger.Criticalf("MinVersion %#v, caasVersion %#v", minver, caasVersion)
+	if minver != version.Zero && minver.Compare(*caasVersion) > 0 {
+		// TODO: return a new error!!
+		return minVersionError(minver, *caasVersion)
+	}
 	return nil
 }
 

diff --git a/apiserver/facades/client/charms/client.go b/apiserver/facades/client/charms/client.go
@@ -192,7 +192,6 @@ func convertCharmMeta(meta *charm.Meta) *params.CharmMeta {
 		Resources:      convertCharmResourceMetaMap(meta.Resources),
 		Terms:          meta.Terms,
 		MinJujuVersion: meta.MinJujuVersion.String(),
-		MinK8sVersion:  meta.MinK8sVersion.String(),
 	}
 }
 

diff --git a/apiserver/facades/controller/caasunitprovisioner/provisioner.go b/apiserver/facades/controller/caasunitprovisioner/provisioner.go
@@ -309,7 +309,7 @@ func (f *Facade) provisioningInfo(model Model, tagString string) (*params.Kubern
 		info.DeploymentInfo = &params.KubernetesDeploymentInfo{
 			DeploymentType: string(deployInfo.DeploymentType),
 			ServiceType:    string(deployInfo.ServiceType),
-			Demonset:       deployInfo.Demonset,
+			Daemonset:      deployInfo.Daemonset,
 		}
 	}
 	return info, nil

diff --git a/apiserver/facades/schema.json b/apiserver/facades/schema.json
@@ -7259,6 +7259,9 @@
                 "KubernetesDeploymentInfo": {
                     "type": "object",
                     "properties": {
+                        "daemonset": {
+                            "type": "boolean"
+                        },
                         "deployment-type": {
                             "type": "string"
                         },
@@ -7269,7 +7272,8 @@
                     "additionalProperties": false,
                     "required": [
                         "deployment-type",
-                        "service-type"
+                        "service-type",
+                        "daemonset"
                     ]
                 },
                 "KubernetesDeviceParams": {

diff --git a/apiserver/params/charms.go b/apiserver/params/charms.go
@@ -121,7 +121,6 @@ type CharmMeta struct {
 	Resources      map[string]CharmResourceMeta `json:"resources,omitempty"`
 	Terms          []string                     `json:"terms,omitempty"`
 	MinJujuVersion string                       `json:"min-juju-version,omitempty"`
-	MinK8sVersion  string                       `json:"min-k8s-version,omitempty"`
 }
 
 // CharmInfo holds all the charm data that the client needs.

diff --git a/apiserver/params/kubernetes.go b/apiserver/params/kubernetes.go
@@ -13,7 +13,7 @@ import (
 type KubernetesDeploymentInfo struct {
 	DeploymentType string `json:"deployment-type"`
 	ServiceType    string `json:"service-type"`
-	Demonset       bool   `json:"demonset"`
+	Daemonset      bool   `json:"daemonset"`
 }
 
 // KubernetesProvisioningInfo holds unit provisioning info.

diff --git a/caas/broker.go b/caas/broker.go
@@ -81,9 +81,13 @@ const (
 // ServiceType defines a service type.
 type ServiceType string
 
+// IsOmit indicates if a service is required.
+func (st ServiceType) IsOmit() bool {
+	return st == ServiceOmit
+}
+
 const (
-	ServiceCluster      ServiceType = "cluster" // Todo(caas): deprecate this later.
-	ServiceClusterIP    ServiceType = "clusterip"
+	ServiceCluster      ServiceType = "cluster"
 	ServiceLoadBalancer ServiceType = "loadbalancer"
 	ServiceExternal     ServiceType = "external"
 	ServiceOmit         ServiceType = "omit"
@@ -93,8 +97,8 @@ const (
 type DeploymentParams struct {
 	DeploymentType DeploymentType
 	ServiceType    ServiceType
-	// TODO(caas): implement demonset support.
-	Demonset bool
+	// TODO(caas): implement daemonset support.
+	Daemonset bool
 }
 
 // ServiceParams defines parameters used to create a service.
@@ -194,6 +198,9 @@ type Broker interface {
 
 	// Upgrader provides the API to perform upgrades.
 	Upgrader
+
+	// ClusterVersionGetter provides methods to get cluster version information.
+	ClusterVersionGetter
 }
 
 // Upgrader provides the API to perform upgrades.
@@ -208,6 +215,12 @@ type StorageValidator interface {
 	ValidateStorageClass(config map[string]interface{}) error
 }
 
+// ClusterVersionGetter provides methods to get cluster version information.
+type ClusterVersionGetter interface {
+	// Version returns cluster version information.
+	Version() (*version.Number, error)
+}
+
 // ServiceGetterSetter provides the API to get/set service.
 type ServiceGetterSetter interface {
 	// EnsureService creates or updates a service for pods with the given params.