Implement SupportedFeatures() method on k8s broker

achilleasa · achilleasa · commit ae2250c2e362 · 2021-11-16T09:23:19.000Z
This allows the broker to obtain and report the version for the
"k8s-api" assumes feature.
diff --git a/caas/kubernetes/provider/k8s.go b/caas/kubernetes/provider/k8s.go
@@ -50,6 +50,7 @@ import (
 	"github.com/juju/juju/cloudconfig/podcfg"
 	k8sannotations "github.com/juju/juju/core/annotations"
 	"github.com/juju/juju/core/application"
+	"github.com/juju/juju/core/assumes"
 	"github.com/juju/juju/core/constraints"
 	"github.com/juju/juju/core/devices"
 	"github.com/juju/juju/core/paths"
@@ -2704,15 +2705,16 @@ func (k *kubernetesClient) deploymentName(appName string, legacySupport bool) st
 func (k *kubernetesClient) SupportedFeatures() (assumes.FeatureSet, error) {
 	var fs assumes.FeatureSet
 
-	k8sAPIVersion, err := k.APIVersion()
+	k8sAPIVersion, err := k.Version()
 	if err != nil {
 		return fs, errors.Annotatef(err, "querying kubernetes API version")
 	}
 
 	fs.Add(
 		assumes.Feature{
 			Name:        "k8s-api",
-			Description: "the version of kubernetes API that charms can access",
+			Description: assumes.UserFriendlyFeatureDescriptions["k8s-api"],
+			Version:     k8sAPIVersion,
 		},
 	)
 	return fs, nil
diff --git a/caas/kubernetes/provider/k8s_test.go b/caas/kubernetes/provider/k8s_test.go
@@ -43,6 +43,7 @@ import (
 	"github.com/juju/juju/caas/specs"
 	"github.com/juju/juju/core/annotations"
 	"github.com/juju/juju/core/application"
+	"github.com/juju/juju/core/assumes"
 	"github.com/juju/juju/core/constraints"
 	"github.com/juju/juju/core/devices"
 	"github.com/juju/juju/core/network"
@@ -2981,6 +2982,27 @@ func (s *K8sBrokerSuite) TestVersion(c *gc.C) {
 	c.Assert(ver, gc.DeepEquals, &version.Number{Major: 1, Minor: 15})
 }
 
+func (s *K8sBrokerSuite) TestSupportedFeatures(c *gc.C) {
+	ctrl := s.setupController(c)
+	defer ctrl.Finish()
+
+	gomock.InOrder(
+		s.mockDiscovery.EXPECT().ServerVersion().Return(&k8sversion.Info{
+			Major: "1", Minor: "15+",
+		}, nil),
+	)
+
+	fs, err := s.broker.SupportedFeatures()
+	c.Assert(err, jc.ErrorIsNil)
+	c.Assert(fs.AsList(), gc.DeepEquals, []assumes.Feature{
+		{
+			Name:        "k8s-api",
+			Description: "the Kubernetes API lets charms query and manipulate the state of API objects in a Kubernetes cluster",
+			Version:     &version.Number{Major: 1, Minor: 15},
+		},
+	})
+}
+
 func (s *K8sBrokerSuite) TestGetServiceSvcNotFound(c *gc.C) {
 	ctrl := s.setupController(c)
 	defer ctrl.Finish()
diff --git a/core/assumes/sat_checker.go b/core/assumes/sat_checker.go
@@ -15,7 +15,8 @@ var (
 	// feature that is not included in the feature set supported by the
 	// current model.
 	UserFriendlyFeatureDescriptions = map[string]string{
-		"juju": "the version of Juju used by the model",
+		"juju":    "the version of Juju used by the model",
+		"k8s-api": "the Kubernetes API lets charms query and manipulate the state of API objects in a Kubernetes cluster",
 	}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ var (`
`15`	`15`	`// feature that is not included in the feature set supported by the`
`16`	`16`	`// current model.`
`17`	`17`	`UserFriendlyFeatureDescriptions = map[string]string{`
`18`		`- "juju": "the version of Juju used by the model",`
	`18`	`+ "juju": "the version of Juju used by the model",`
	`19`	`+ "k8s-api": "the Kubernetes API lets charms query and manipulate the state of API objects in a Kubernetes cluster",`
`19`	`20`	`}`
`20`	`21`	`)`
`21`	`22`