From 3cf1f851021e64734ebb82c904054c4817e46820 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 7 May 2019 16:13:38 -0400 Subject: [PATCH] (helm): update Cobra to latest version This commit forces ([[override]]) the version of Cobra to the tip of master. The latest tagged release of Cobra is one week shy of being a year old and is missing important fixes. An override is necessary because the Kustomize package requires a tagged version, so a [[constraint]] is rejected by dep. The version of Cobra used in dev-v3 is older than the one used for the master branch (helm v2). Although the dev-v3 branch was based on master and therefore had the same Cobra version originally, it was changed a couple of times to choose Cobra tagged versions instead. However, the latest Cobra tagged version is older than the version of Cobra used on the master branch. Therefore, some of the improvements made to Cobra and used by helm v2 are not available to helm v3 currently. This commit brings Cobra to its latest available commit for helm v3. Originally, I thought of selecting the same Cobra version in v3 as for helm v2, but after reviewing the 5 extra commits added to Cobra, I felt it was safe and valuable to bring them in also. Bringing Cobra up-to-date is essential for upcoming work being prepared for dynamic bash-completion; there are bug fixes in Cobra that are necessary for dynamic bash-completion to work properly. Specifically, spf13/cobra#730 which fixes spf13/cobra#694 is essential to avoid the risk of colliding and possibly breaking kubectl dynamic bash-completion once helm v3 has its own dynamic completion. Signed-off-by: Marc Khouzam --- Gopkg.lock | 50 +++++--------------------------------------------- Gopkg.toml | 4 ++++ 2 files changed, 9 insertions(+), 45 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1467695ba31..003bb5f224e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -899,15 +899,15 @@ version = "v1.2.0" [[projects]] - digest = "1:e01b05ba901239c783dfe56450bcde607fc858908529868259c9a8765dc176d0" + branch = "master" + digest = "1:2e72f9cdc8b6f94a145fa1c97e305e1654d40507d04d2fbb0c37bf461a4b85f7" name = "github.com/spf13/cobra" packages = [ ".", "doc", ] pruneopts = "UT" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" + revision = "67fc4837d267bc9bfd6e47f77783fcc3dffc68de" [[projects]] digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2" @@ -1404,90 +1404,51 @@ revision = "44a48934c135b31e4f1c0d12e91d384e1cb2304c" [[projects]] - digest = "1:fe724e5bfc9e388624ccf76b77051c0c7da8695a264b3ab4103de270a8965b18" + digest = "1:1ac7533fe6c10c68cb17d26bd44975d582cbe4dee89fd0e095d3133c7680416b" name = "k8s.io/client-go" packages = [ "discovery", "discovery/cached/disk", - "discovery/cached/memory", - "discovery/fake", "dynamic", "dynamic/fake", "kubernetes", - "kubernetes/fake", "kubernetes/scheme", "kubernetes/typed/admissionregistration/v1beta1", - "kubernetes/typed/admissionregistration/v1beta1/fake", "kubernetes/typed/apps/v1", - "kubernetes/typed/apps/v1/fake", "kubernetes/typed/apps/v1beta1", - "kubernetes/typed/apps/v1beta1/fake", "kubernetes/typed/apps/v1beta2", - "kubernetes/typed/apps/v1beta2/fake", "kubernetes/typed/auditregistration/v1alpha1", - "kubernetes/typed/auditregistration/v1alpha1/fake", "kubernetes/typed/authentication/v1", - "kubernetes/typed/authentication/v1/fake", "kubernetes/typed/authentication/v1beta1", - "kubernetes/typed/authentication/v1beta1/fake", "kubernetes/typed/authorization/v1", - "kubernetes/typed/authorization/v1/fake", "kubernetes/typed/authorization/v1beta1", - "kubernetes/typed/authorization/v1beta1/fake", "kubernetes/typed/autoscaling/v1", - "kubernetes/typed/autoscaling/v1/fake", "kubernetes/typed/autoscaling/v2beta1", - "kubernetes/typed/autoscaling/v2beta1/fake", "kubernetes/typed/autoscaling/v2beta2", - "kubernetes/typed/autoscaling/v2beta2/fake", "kubernetes/typed/batch/v1", - "kubernetes/typed/batch/v1/fake", "kubernetes/typed/batch/v1beta1", - "kubernetes/typed/batch/v1beta1/fake", "kubernetes/typed/batch/v2alpha1", - "kubernetes/typed/batch/v2alpha1/fake", "kubernetes/typed/certificates/v1beta1", - "kubernetes/typed/certificates/v1beta1/fake", "kubernetes/typed/coordination/v1", - "kubernetes/typed/coordination/v1/fake", "kubernetes/typed/coordination/v1beta1", - "kubernetes/typed/coordination/v1beta1/fake", "kubernetes/typed/core/v1", - "kubernetes/typed/core/v1/fake", "kubernetes/typed/events/v1beta1", - "kubernetes/typed/events/v1beta1/fake", "kubernetes/typed/extensions/v1beta1", - "kubernetes/typed/extensions/v1beta1/fake", "kubernetes/typed/networking/v1", - "kubernetes/typed/networking/v1/fake", "kubernetes/typed/networking/v1beta1", - "kubernetes/typed/networking/v1beta1/fake", "kubernetes/typed/node/v1alpha1", - "kubernetes/typed/node/v1alpha1/fake", "kubernetes/typed/node/v1beta1", - "kubernetes/typed/node/v1beta1/fake", "kubernetes/typed/policy/v1beta1", - "kubernetes/typed/policy/v1beta1/fake", "kubernetes/typed/rbac/v1", - "kubernetes/typed/rbac/v1/fake", "kubernetes/typed/rbac/v1alpha1", - "kubernetes/typed/rbac/v1alpha1/fake", "kubernetes/typed/rbac/v1beta1", - "kubernetes/typed/rbac/v1beta1/fake", "kubernetes/typed/scheduling/v1", - "kubernetes/typed/scheduling/v1/fake", "kubernetes/typed/scheduling/v1alpha1", - "kubernetes/typed/scheduling/v1alpha1/fake", "kubernetes/typed/scheduling/v1beta1", - "kubernetes/typed/scheduling/v1beta1/fake", "kubernetes/typed/settings/v1alpha1", - "kubernetes/typed/settings/v1alpha1/fake", "kubernetes/typed/storage/v1", - "kubernetes/typed/storage/v1/fake", "kubernetes/typed/storage/v1alpha1", - "kubernetes/typed/storage/v1alpha1/fake", "kubernetes/typed/storage/v1beta1", - "kubernetes/typed/storage/v1beta1/fake", "pkg/apis/clientauthentication", "pkg/apis/clientauthentication/v1alpha1", "pkg/apis/clientauthentication/v1beta1", @@ -1832,12 +1793,11 @@ "k8s.io/cli-runtime/pkg/genericclioptions", "k8s.io/cli-runtime/pkg/resource", "k8s.io/client-go/discovery", - "k8s.io/client-go/discovery/cached/memory", "k8s.io/client-go/kubernetes", - "k8s.io/client-go/kubernetes/fake", "k8s.io/client-go/kubernetes/scheme", "k8s.io/client-go/kubernetes/typed/core/v1", "k8s.io/client-go/plugin/pkg/client/auth", + "k8s.io/client-go/rest", "k8s.io/client-go/rest/fake", "k8s.io/client-go/tools/clientcmd", "k8s.io/client-go/tools/watch", diff --git a/Gopkg.toml b/Gopkg.toml index 94736bf3c70..a35ccded0a1 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -105,3 +105,7 @@ [[constraint]] name = "github.com/xeipuuv/gojsonschema" version = "1.1.0" + +[[override]] + name = "github.com/spf13/cobra" + branch = "master"