Merge pull request #478 from MattiasGees/bug/validate-jenkins-hub

jetstack-bot · web-flow · commit e74f08c56921 · 2018-09-10T12:16:16.000+01:00
Validate Jenkins as a valid instance pool for hub
diff --git a/pkg/tarmak/cluster/cluster.go b/pkg/tarmak/cluster/cluster.go
@@ -140,6 +140,7 @@ func (c *Cluster) validateClusterInstancePoolTypes() error {
 		poolMap = map[string]bool{
 			clusterv1alpha1.InstancePoolTypeVault:   true,
 			clusterv1alpha1.InstancePoolTypeBastion: true,
+			clusterv1alpha1.InstancePoolTypeJenkins: true,
 		}
 
 		break
diff --git a/pkg/tarmak/cluster/cluster_test.go b/pkg/tarmak/cluster/cluster_test.go
@@ -238,12 +238,12 @@ func TestCluster_ValidateClusterInstancePoolTypesHub(t *testing.T) {
 	passTypes := []string{
 		clusterv1alpha1.InstancePoolTypeBastion,
 		clusterv1alpha1.InstancePoolTypeVault,
+		clusterv1alpha1.InstancePoolTypeJenkins,
 	}
 	failTypes := []string{
 		clusterv1alpha1.InstancePoolTypeMaster,
 		clusterv1alpha1.InstancePoolTypeWorker,
 		clusterv1alpha1.InstancePoolTypeEtcd,
-		clusterv1alpha1.InstancePoolTypeJenkins,
 	}
 	tryInstancePoolTypes(c, passTypes, failTypes, t)
 

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ func (c *Cluster) validateClusterInstancePoolTypes() error {`
`140`	`140`	`poolMap = map[string]bool{`
`141`	`141`	`clusterv1alpha1.InstancePoolTypeVault: true,`
`142`	`142`	`clusterv1alpha1.InstancePoolTypeBastion: true,`
	`143`	`+ clusterv1alpha1.InstancePoolTypeJenkins: true,`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`break`
Original file line number	Diff line number	Diff line change
`@@ -238,12 +238,12 @@ func TestCluster_ValidateClusterInstancePoolTypesHub(t *testing.T) {`
`238`	`238`	`passTypes := []string{`
`239`	`239`	`clusterv1alpha1.InstancePoolTypeBastion,`
`240`	`240`	`clusterv1alpha1.InstancePoolTypeVault,`
	`241`	`+ clusterv1alpha1.InstancePoolTypeJenkins,`
`241`	`242`	`}`
`242`	`243`	`failTypes := []string{`
`243`	`244`	`clusterv1alpha1.InstancePoolTypeMaster,`
`244`	`245`	`clusterv1alpha1.InstancePoolTypeWorker,`
`245`	`246`	`clusterv1alpha1.InstancePoolTypeEtcd,`
`246`		`- clusterv1alpha1.InstancePoolTypeJenkins,`
`247`	`247`	`}`
`248`	`248`	`tryInstancePoolTypes(c, passTypes, failTypes, t)`
`249`	`249`