Enhancement on sample projects for validation annotation

kubernetes-sigs · May 15, 2018 · 9ca2f7a · 9ca2f7a
1 parent 0724374
commit 9ca2f7a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types.go b/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types.go
@@ -12,6 +12,8 @@ import (
 // MemcachedSpec defines the desired state of Memcached
 type MemcachedSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
+	// +kubebuilder:validation:Maximum=100
+	// +kubebuilder:validation:Minimum=5
 	Size int32 `json:"size"`
 }
 

diff --git a/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go b/samples/memcached-api-server/pkg/apis/myapps/v1alpha1/memcached_types_test.go
@@ -21,6 +21,7 @@ var _ = Describe("Memcached", func() {
 	BeforeEach(func() {
 		instance = Memcached{}
 		instance.Name = "instance-1"
+		instance.Spec.Size = 50
 
 		expected = instance
 	})

diff --git a/samples/memcached-api-server/pkg/controller/memcached/controller_test.go b/samples/memcached-api-server/pkg/controller/memcached/controller_test.go
@@ -48,7 +48,19 @@ var _ = Describe("Memcached controller", func() {
 
 			// Create the instance
 			client = cs.MyappsV1alpha1().Memcacheds("default")
+
+			instance.Spec.Size = 1
 			_, err := client.Create(&instance)
+			Expect(err).Should(HaveOccurred())
+			Expect(err.Error()).Should(MatchRegexp(".*spec.size in body should be greater than or equal to 5.*"))
+
+			instance.Spec.Size = 101
+			_, err = client.Create(&instance)
+			Expect(err).Should(HaveOccurred())
+			Expect(err.Error()).Should(MatchRegexp(".*spec.size in body should be less than or equal to 100.*"))
+
+			instance.Spec.Size = 50
+			_, err = client.Create(&instance)
 			Expect(err).ShouldNot(HaveOccurred())
 
 			// Wait for reconcile to happen