Move to kube 1.14.1

Signed-off-by: Simon Ferquel <[email protected]>

Author: simonferquel

Gopkg.lock

@@ -40,11 +40,9 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/docker/cli"
   branch = "19.03"
 
-# Waiting for https://github.com/deislabs/duffle/pull/682 to be merged
 [[override]]
   name = "github.com/deislabs/duffle"
-  source = "github.com/silvin-lubecki/duffle"
-  branch = "jc"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"
@@ -80,19 +78,24 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "k8s.io/kubernetes"
-  revision = "v1.14.0"
+  revision = "v1.14.1"
 
 [[override]]
   name = "k8s.io/api"
-  revision = "kubernetes-1.14.0"
+  revision = "kubernetes-1.14.1"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  revision = "kubernetes-1.14.0"
+  revision = "kubernetes-1.14.1"
+
+# Overriding imdario/mergo since https://github.com/imdario/mergo/pull/112 is required
+[[override]]
+  name = "github.com/imdario/mergo"
+  branch = "master"
 
 [[override]]
   name = "k8s.io/client-go"
-  revision = "kubernetes-1.14.0"
+  revision = "kubernetes-1.14.1"
 
 # This is using a fork waiting for go-yaml/yaml#375 to be merged
 # This PR allows to set a max decoded value, thus not being exposed to yaml bombs

Gopkg.toml

@@ -10,7 +10,7 @@ import (
 
 	"github.com/docker/cli/cli/config/configfile"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/cnab-to-oci/remotes"
 	"github.com/docker/distribution/reference"
 	"github.com/pkg/errors"

internal/store/bundle.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/distribution/reference"
 	"gotest.tools/assert"
 	"gotest.tools/fs"

internal/store/bundle_test.go

@@ -9,7 +9,7 @@ import (
 func Merge(parameters ...Parameters) (Parameters, error) {
 	s := Parameters(map[string]interface{}{})
 	for _, parameter := range parameters {
-		if err := mergo.Merge(&s, parameter, mergo.WithOverride, mergo.WithAppendSlice); err != nil {
+		if err := mergo.Merge(&s, parameter, mergo.WithOverride, mergo.WithTypeCheck); err != nil {
 			return s, errors.Wrap(err, "cannot merge parameters")
 		}
 	}

types/parameters/merge.go

@@ -1,7 +1,6 @@
 package parameters
 
 import (
-	"fmt"
 	"testing"
 
 	"gotest.tools/assert"
@@ -16,7 +15,7 @@ func TestMergeSliceError(t *testing.T) {
 		"baz": []int{1},
 	}
 	_, err := Merge(m1, m2)
-	assert.Check(t, is.ErrorContains(err, "cannot append two slice with different type"))
+	assert.Check(t, is.ErrorContains(err, "cannot override two slices with different type"))
 }
 
 func TestMerge(t *testing.T) {
@@ -43,15 +42,12 @@ func TestMerge(t *testing.T) {
 	assert.NilError(t, err)
 	parameters, err := Merge(m1, m2, m3)
 	assert.NilError(t, err)
-	fmt.Println(parameters)
 	assert.Check(t, is.DeepEqual(parameters.Flatten(), map[string]string{
 		"foo":      "bar",
 		"bar.baz":  "boz",
 		"bar.port": "10",
 		"bar.foo":  "toto",
-		"baz.0":    "a",
-		"baz.1":    "b",
-		"baz.2":    "c",
+		"baz.0":    "c",
 		"banana":   "monkey",
 	}))
 }