Merge pull request #503 from jcsirot/bump-kube-1.14.0

Bump kubernetes dependencies to 1.14.1

Gopkg.toml

@@ -38,13 +38,11 @@ required = ["github.com/wadey/gocovmerge"]
 
 [[override]]
   name = "github.com/docker/cli"
-  branch = "master"
+  branch = "19.03"
 
-# Waiting for https://github.com/deislabs/duffle/pull/682 to be merged
 [[override]]
   name = "github.com/deislabs/duffle"
-  source = "github.com/ijc/duffle"
-  branch = "set-merge"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/sirupsen/logrus"
@@ -66,29 +64,38 @@ required = ["github.com/wadey/gocovmerge"]
   name = "github.com/docker/go-metrics"
   revision = "d466d4f6fd960e01820085bd7e1a24426ee7ef18"
 
+[[override]]
+  name = "github.com/prometheus/client_golang"
+  revision = "v0.8.0"
+
 [[override]]
   name = "github.com/docker/distribution"
   revision = "0d3efadf0154c2b8a4e7b6621fff9809655cc580"
 
 [[override]]
   name = "github.com/docker/swarmkit"
-  revision = "edd5641391926a50bc5f7040e20b7efc05003c26"
+  revision = "18e7e58ea1a5ec016625a636d0d52500eea123bc"
 
 [[override]]
   name = "k8s.io/kubernetes"
-  revision = "v1.11.1"
+  revision = "v1.14.1"
 
 [[override]]
   name = "k8s.io/api"
-  revision = "kubernetes-1.11.1"
+  revision = "kubernetes-1.14.1"
 
 [[override]]
   name = "k8s.io/apimachinery"
-  revision = "kubernetes-1.11.1"
+  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.11.1"
+  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

cmd/cnab-run/install.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/render"

internal/commands/bundle.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/types"

internal/commands/cnab.go

@@ -10,8 +10,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/deislabs/duffle/pkg/action"
-	"github.com/deislabs/duffle/pkg/bundle"
 	"github.com/deislabs/duffle/pkg/claim"
 	"github.com/deislabs/duffle/pkg/credentials"
 	"github.com/deislabs/duffle/pkg/driver"
@@ -225,7 +225,7 @@ func resolveBundle(dockerCli command.Cli, bundleStore appstore.BundleStore, name
 		if strings.HasSuffix(name, internal.AppExtension) {
 			return extractAndLoadAppBasedBundle(dockerCli, name)
 		}
-		return loader.NewDetectingLoader().Load(name)
+		return loader.NewLoader().Load(name)
 	case nameKindDir, nameKindEmpty:
 		if pullRef {
 			if kind == nameKindDir {

internal/commands/cnab_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/config/configfile"

internal/commands/parameters.go

@@ -3,7 +3,7 @@ package commands
 import (
 	"fmt"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/deislabs/duffle/pkg/claim"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/types/parameters"

internal/commands/parameters_test.go

@@ -3,7 +3,7 @@ package commands
 import (
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/deislabs/duffle/pkg/claim"
 	"github.com/docker/app/internal"
 	"gotest.tools/assert"

internal/commands/push.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/containerd/containerd/platforms"
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal/packager"
 	"github.com/docker/app/types/metadata"
 	"github.com/docker/cli/cli"
@@ -101,7 +101,7 @@ func runPush(dockerCli command.Cli, name string, opts pushOptions) error {
 		return err
 	}
 	// push bundle manifest
-	descriptor, err := remotes.Push(context.Background(), bndl, retag.cnabRef, resolverConfig.Resolver)
+	descriptor, err := remotes.Push(context.Background(), bndl, retag.cnabRef, resolverConfig.Resolver, true)
 	if err != nil {
 		return err
 	}

internal/commands/push_test.go

@@ -3,7 +3,7 @@ package commands
 import (
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/types/metadata"
 	"github.com/docker/distribution/reference"
 	"gotest.tools/assert"

internal/inspect/inspect.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/render"
 	"github.com/docker/app/types"
 	"github.com/docker/app/types/parameters"

internal/packager/cnab.go

@@ -1,7 +1,7 @@
 package packager
 
 import (
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal"
 	"github.com/docker/app/internal/compose"
 	"github.com/docker/app/types"

internal/store/bundle.go

@@ -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_test.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"

render/render.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/internal/compose"
 	"github.com/docker/app/internal/renderer"
 	"github.com/docker/app/internal/slices"

render/render_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/deislabs/duffle/pkg/bundle"
+	"github.com/deislabs/cnab-go/bundle"
 	"github.com/docker/app/types"
 	composetypes "github.com/docker/cli/cli/compose/types"
 	yaml "gopkg.in/yaml.v2"

types/parameters/merge.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_test.go

@@ -15,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) {