test updates

keel-hq · Apr 20, 2018 · cf8f332 · cf8f332
1 parent 2ac1790
commit cf8f332
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/bot/deployments.go b/bot/deployments.go
@@ -7,7 +7,7 @@ import (
 	"github.com/keel-hq/keel/bot/formatter"
 	"github.com/keel-hq/keel/provider/kubernetes"
 
-	"k8s.io/api/extensions/v1beta1"
+	apps_v1 "k8s.io/api/apps/v1"
 
 	log "github.com/sirupsen/logrus"
 )
@@ -19,8 +19,8 @@ type Filter struct {
 }
 
 // deployments - gets all deployments
-func deployments(k8sImplementer kubernetes.Implementer) ([]v1beta1.Deployment, error) {
-	deploymentLists := []*v1beta1.DeploymentList{}
+func deployments(k8sImplementer kubernetes.Implementer) ([]apps_v1.Deployment, error) {
+	deploymentLists := []*apps_v1.DeploymentList{}
 
 	n, err := k8sImplementer.Namespaces()
 	if err != nil {
@@ -39,7 +39,7 @@ func deployments(k8sImplementer kubernetes.Implementer) ([]v1beta1.Deployment, e
 		deploymentLists = append(deploymentLists, l)
 	}
 
-	impacted := []v1beta1.Deployment{}
+	impacted := []apps_v1.Deployment{}
 
 	for _, deploymentList := range deploymentLists {
 		for _, deployment := range deploymentList.Items {
@@ -71,7 +71,7 @@ func DeploymentsResponse(filter Filter, k8sImplementer kubernetes.Implementer) s
 	return buf.String()
 }
 
-func convertToInternal(deployments []v1beta1.Deployment) []formatter.Deployment {
+func convertToInternal(deployments []apps_v1.Deployment) []formatter.Deployment {
 	formatted := []formatter.Deployment{}
 	for _, d := range deployments {
 
@@ -86,7 +86,7 @@ func convertToInternal(deployments []v1beta1.Deployment) []formatter.Deployment
 	return formatted
 }
 
-func getImages(deployment *v1beta1.Deployment) []string {
+func getImages(deployment *apps_v1.Deployment) []string {
 	var images []string
 	for _, c := range deployment.Spec.Template.Spec.Containers {
 		images = append(images, c.Image)

diff --git a/util/testing/testing.go b/util/testing/testing.go
@@ -1,20 +1,22 @@
 package testing
 
 import (
+	"github.com/keel-hq/keel/internal/k8s"
+
+	apps_v1 "k8s.io/api/apps/v1"
 	"k8s.io/api/core/v1"
-	"k8s.io/api/extensions/v1beta1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	core_v1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )
 
 // FakeK8sImplementer - fake implementer used for testing
 type FakeK8sImplementer struct {
 	NamespacesList   *v1.NamespaceList
-	DeploymentSingle *v1beta1.Deployment
-	DeploymentList   *v1beta1.DeploymentList
+	DeploymentSingle *apps_v1.Deployment
+	DeploymentList   *apps_v1.DeploymentList
 
 	// stores value of an updated deployment
-	Updated *v1beta1.Deployment
+	Updated *k8s.GenericResource
 
 	AvailableSecret *v1.Secret
 
@@ -31,18 +33,18 @@ func (i *FakeK8sImplementer) Namespaces() (*v1.NamespaceList, error) {
 }
 
 // Deployment - available deployment, doesn't filter anything
-func (i *FakeK8sImplementer) Deployment(namespace, name string) (*v1beta1.Deployment, error) {
+func (i *FakeK8sImplementer) Deployment(namespace, name string) (*apps_v1.Deployment, error) {
 	return i.DeploymentSingle, nil
 }
 
 // Deployments - available deployments
-func (i *FakeK8sImplementer) Deployments(namespace string) (*v1beta1.DeploymentList, error) {
+func (i *FakeK8sImplementer) Deployments(namespace string) (*apps_v1.DeploymentList, error) {
 	return i.DeploymentList, nil
 }
 
 // Update - update deployment
-func (i *FakeK8sImplementer) Update(deployment *v1beta1.Deployment) error {
-	i.Updated = deployment
+func (i *FakeK8sImplementer) Update(obj *k8s.GenericResource) error {
+	i.Updated = obj
 	return nil
 }
 

diff --git a/util/version/version.go b/util/version/version.go
@@ -99,9 +99,7 @@ func NewAvailable(current string, tags []string) (newVersion string, newAvailabl
 
 		}
 
-		if currentVersion.Prerelease() == v.Prerelease() {
-			vs = append(vs, v)
-		}
+		vs = append(vs, v)
 	}
 
 	if len(vs) == 0 {

diff --git a/util/version/version_test.go b/util/version/version_test.go
@@ -340,13 +340,6 @@ func TestNewAvailable(t *testing.T) {
 			wantNewAvailable: true,
 			wantErr:          false,
 		},
-		{
-			name:             "new non pre-release available",
-			args:             args{current: "8.1.1", tags: []string{"8.2.0", "8.3.0-staging", "8.4.0-develop"}},
-			wantNewVersion:   "8.2.0",
-			wantNewAvailable: true,
-			wantErr:          false,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {