From 84dcc145e12f0c5a81053f6ab33eb77d4f992097 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 3 Jan 2019 12:26:28 -0500 Subject: [PATCH] Use overridden config when determining if default namespace came from config Kubernetes-commit: f19399096b8a783b943029c0083af58bdc0f29ee --- Godeps/Godeps.json | 626 ------------------ Godeps/OWNERS | 2 - Godeps/Readme | 5 - tools/clientcmd/merged_client_builder.go | 7 +- tools/clientcmd/merged_client_builder_test.go | 58 +- 5 files changed, 48 insertions(+), 650 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/OWNERS delete mode 100644 Godeps/Readme diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index c02e0925..00000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,626 +0,0 @@ -{ - "ImportPath": "k8s.io/client-go", - "GoVersion": "go1.11", - "GodepVersion": "v80", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "cloud.google.com/go/compute/metadata", - "Rev": "3b1ae45394a234c385be014e9a488f2bb6eef821" - }, - { - "ImportPath": "cloud.google.com/go/internal", - "Rev": "3b1ae45394a234c385be014e9a488f2bb6eef821" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest", - "Rev": "ea233b6412b0421a65dc6160e16c893364664a95" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest/adal", - "Rev": "ea233b6412b0421a65dc6160e16c893364664a95" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest/azure", - "Rev": "ea233b6412b0421a65dc6160e16c893364664a95" - }, - { - "ImportPath": "github.com/Azure/go-autorest/autorest/date", - "Rev": "ea233b6412b0421a65dc6160e16c893364664a95" - }, - { - "ImportPath": "github.com/Azure/go-autorest/logger", - "Rev": "ea233b6412b0421a65dc6160e16c893364664a95" - }, - { - "ImportPath": "github.com/Azure/go-autorest/version", - "Rev": "ea233b6412b0421a65dc6160e16c893364664a95" - }, - { - "ImportPath": "github.com/davecgh/go-spew/spew", - "Rev": "782f4967f2dc4564575ca782fe2d04090b5faca8" - }, - { - "ImportPath": "github.com/dgrijalva/jwt-go", - "Rev": "01aeca54ebda6e0fbfafd0a524d234159c05ec20" - }, - { - "ImportPath": "github.com/docker/spdystream", - "Rev": "449fdfce4d962303d702fec724ef0ad181c92528" - }, - { - "ImportPath": "github.com/docker/spdystream/spdy", - "Rev": "449fdfce4d962303d702fec724ef0ad181c92528" - }, - { - "ImportPath": "github.com/evanphx/json-patch", - "Rev": "36442dbdb585210f8d5a1b45e67aa323c197d5c4" - }, - { - "ImportPath": "github.com/gogo/protobuf/proto", - "Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02" - }, - { - "ImportPath": "github.com/gogo/protobuf/sortkeys", - "Rev": "342cbe0a04158f6dcb03ca0079991a51a4248c02" - }, - { - "ImportPath": "github.com/golang/groupcache/lru", - "Rev": "02826c3e79038b59d737d3b1c0a1d937f71a4433" - }, - { - "ImportPath": "github.com/golang/protobuf/proto", - "Rev": "b4deda0973fb4c70b50d226b1af49f3da59f5265" - }, - { - "ImportPath": "github.com/golang/protobuf/ptypes", - "Rev": "b4deda0973fb4c70b50d226b1af49f3da59f5265" - }, - { - "ImportPath": "github.com/golang/protobuf/ptypes/any", - "Rev": "b4deda0973fb4c70b50d226b1af49f3da59f5265" - }, - { - "ImportPath": "github.com/golang/protobuf/ptypes/duration", - "Rev": "b4deda0973fb4c70b50d226b1af49f3da59f5265" - }, - { - "ImportPath": "github.com/golang/protobuf/ptypes/timestamp", - "Rev": "b4deda0973fb4c70b50d226b1af49f3da59f5265" - }, - { - "ImportPath": "github.com/google/btree", - "Rev": "7d79101e329e5a3adf994758c578dab82b90c017" - }, - { - "ImportPath": "github.com/google/gofuzz", - "Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c" - }, - { - "ImportPath": "github.com/googleapis/gnostic/OpenAPIv2", - "Rev": "0c5108395e2debce0d731cf0287ddf7242066aba" - }, - { - "ImportPath": "github.com/googleapis/gnostic/compiler", - "Rev": "0c5108395e2debce0d731cf0287ddf7242066aba" - }, - { - "ImportPath": "github.com/googleapis/gnostic/extensions", - "Rev": "0c5108395e2debce0d731cf0287ddf7242066aba" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud/openstack", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud/openstack/utils", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gophercloud/gophercloud/pagination", - "Rev": "781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d" - }, - { - "ImportPath": "github.com/gregjones/httpcache", - "Rev": "787624de3eb7bd915c329cba748687a3b22666a6" - }, - { - "ImportPath": "github.com/gregjones/httpcache/diskcache", - "Rev": "787624de3eb7bd915c329cba748687a3b22666a6" - }, - { - "ImportPath": "github.com/hashicorp/golang-lru", - "Rev": "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" - }, - { - "ImportPath": "github.com/hashicorp/golang-lru/simplelru", - "Rev": "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" - }, - { - "ImportPath": "github.com/imdario/mergo", - "Rev": "9316a62528ac99aaecb4e47eadd6dc8aa6533d58" - }, - { - "ImportPath": "github.com/json-iterator/go", - "Rev": "ab8a2e0c74be9d3be70b3184d9acc634935ded82" - }, - { - "ImportPath": "github.com/modern-go/concurrent", - "Rev": "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94" - }, - { - "ImportPath": "github.com/modern-go/reflect2", - "Rev": "94122c33edd36123c84d5368cfb2b69df93a0ec8" - }, - { - "ImportPath": "github.com/peterbourgon/diskv", - "Rev": "5f041e8faa004a95c88a202771f4cc3e991971e6" - }, - { - "ImportPath": "github.com/pmezard/go-difflib/difflib", - "Rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d" - }, - { - "ImportPath": "github.com/spf13/pflag", - "Rev": "583c0c0531f06d5278b7d917446061adc344b5cd" - }, - { - "ImportPath": "github.com/stretchr/testify/assert", - "Rev": "c679ae2cc0cb27ec3293fea7e254e47386f05d69" - }, - { - "ImportPath": "golang.org/x/crypto/ssh/terminal", - "Rev": "de0752318171da717af4ce24d0a2e8626afaeb11" - }, - { - "ImportPath": "golang.org/x/net/context", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" - }, - { - "ImportPath": "golang.org/x/net/context/ctxhttp", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" - }, - { - "ImportPath": "golang.org/x/net/http2", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" - }, - { - "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" - }, - { - "ImportPath": "golang.org/x/net/idna", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" - }, - { - "ImportPath": "golang.org/x/net/lex/httplex", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" - }, - { - "ImportPath": "golang.org/x/oauth2", - "Rev": "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" - }, - { - "ImportPath": "golang.org/x/oauth2/google", - "Rev": "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" - }, - { - "ImportPath": "golang.org/x/oauth2/internal", - "Rev": "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" - }, - { - "ImportPath": "golang.org/x/oauth2/jws", - "Rev": "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" - }, - { - "ImportPath": "golang.org/x/oauth2/jwt", - "Rev": "a6bd8cefa1811bd24b86f8902872e4e8225f74c4" - }, - { - "ImportPath": "golang.org/x/sys/unix", - "Rev": "95c6576299259db960f6c5b9b69ea52422860fce" - }, - { - "ImportPath": "golang.org/x/sys/windows", - "Rev": "95c6576299259db960f6c5b9b69ea52422860fce" - }, - { - "ImportPath": "golang.org/x/text/secure/bidirule", - "Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01" - }, - { - "ImportPath": "golang.org/x/text/transform", - "Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01" - }, - { - "ImportPath": "golang.org/x/text/unicode/bidi", - "Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01" - }, - { - "ImportPath": "golang.org/x/text/unicode/norm", - "Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01" - }, - { - "ImportPath": "golang.org/x/time/rate", - "Rev": "f51c12702a4d776e4c1fa9b0fabab841babae631" - }, - { - "ImportPath": "gopkg.in/inf.v0", - "Rev": "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" - }, - { - "ImportPath": "gopkg.in/yaml.v2", - "Rev": "5420a8b6744d3b0345ab293f6fcba19c978f1183" - }, - { - "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/apps/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/auditregistration/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/autoscaling/v2beta2", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/batch/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/coordination/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/coordination/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/core/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/imagepolicy/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/networking/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/scheduling/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/storage/v1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "173ce66c1e39d1d0f56e0b3347ff2988068aecd0" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/naming", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "849b284f3b756a3fbb5084b09d2718dd41373068" - }, - { - "ImportPath": "k8s.io/klog", - "Rev": "8139d8cb77af419532b33dfa7dd09fbc5f1d344f" - }, - { - "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", - "Rev": "c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d" - }, - { - "ImportPath": "sigs.k8s.io/yaml", - "Rev": "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" - } - ] -} diff --git a/Godeps/OWNERS b/Godeps/OWNERS deleted file mode 100644 index 3d49f306..00000000 --- a/Godeps/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -approvers: -- dep-approvers diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d..00000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/tools/clientcmd/merged_client_builder.go b/tools/clientcmd/merged_client_builder.go index 76380db8..9cc112a2 100644 --- a/tools/clientcmd/merged_client_builder.go +++ b/tools/clientcmd/merged_client_builder.go @@ -150,7 +150,12 @@ func (config *DeferredLoadingClientConfig) Namespace() (string, bool, error) { // if we got a default namespace, determine whether it was explicit or implicit if raw, err := mergedKubeConfig.RawConfig(); err == nil { - if context := raw.Contexts[raw.CurrentContext]; context != nil && len(context.Namespace) > 0 { + // determine the current context + currentContext := raw.CurrentContext + if config.overrides != nil && len(config.overrides.CurrentContext) > 0 { + currentContext = config.overrides.CurrentContext + } + if context := raw.Contexts[currentContext]; context != nil && len(context.Namespace) > 0 { return ns, false, nil } } diff --git a/tools/clientcmd/merged_client_builder_test.go b/tools/clientcmd/merged_client_builder_test.go index 8b038676..d1910044 100644 --- a/tools/clientcmd/merged_client_builder_test.go +++ b/tools/clientcmd/merged_client_builder_test.go @@ -38,6 +38,7 @@ func (l *testLoader) Load() (*clientcmdapi.Config, error) { } type testClientConfig struct { + rawconfig *clientcmdapi.Config config *restclient.Config namespace string namespaceSpecified bool @@ -45,7 +46,10 @@ type testClientConfig struct { } func (c *testClientConfig) RawConfig() (clientcmdapi.Config, error) { - return clientcmdapi.Config{}, fmt.Errorf("unexpected call") + if c.rawconfig == nil { + return clientcmdapi.Config{}, fmt.Errorf("unexpected call") + } + return *c.rawconfig, nil } func (c *testClientConfig) ClientConfig() (*restclient.Config, error) { return c.config, c.err @@ -224,10 +228,11 @@ func TestInClusterConfigNamespace(t *testing.T) { testCases := map[string]struct { clientConfig *testClientConfig icc *testICC + overrides *ConfigOverrides checkedICC bool result string - ok bool + overridden bool err error }{ "in-cluster checked on empty error": { @@ -256,8 +261,8 @@ func TestInClusterConfigNamespace(t *testing.T) { clientConfig: &testClientConfig{namespace: "test", namespaceSpecified: true}, icc: &testICC{}, - result: "test", - ok: true, + result: "test", + overridden: true, }, "in-cluster checked when namespace is not specified, but is defaulted": { @@ -266,7 +271,7 @@ func TestInClusterConfigNamespace(t *testing.T) { checkedICC: true, result: "test", - ok: false, + overridden: false, }, "in-cluster error returned when config is empty": { @@ -294,7 +299,7 @@ func TestInClusterConfigNamespace(t *testing.T) { checkedICC: true, result: "test", - ok: true, + overridden: true, }, "in-cluster config returned when config is empty and namespace is defaulted but not explicitly set": { @@ -309,20 +314,41 @@ func TestInClusterConfigNamespace(t *testing.T) { checkedICC: true, result: "test", - ok: false, + overridden: false, + }, + + "overridden context used to verify explicit namespace in config": { + clientConfig: &testClientConfig{ + namespace: "default", + namespaceSpecified: false, // a namespace that comes from a context is not considered overridden + rawconfig: &clientcmdapi.Config{Contexts: map[string]*clientcmdapi.Context{"overridden-context": {Namespace: "default"}}}, + }, + overrides: &ConfigOverrides{CurrentContext: "overridden-context"}, + icc: &testICC{ + possible: true, + testClientConfig: testClientConfig{ + namespace: "icc", + namespaceSpecified: false, // a namespace that comes from icc is not considered overridden + }, + }, + checkedICC: true, + result: "default", + overridden: false, // a namespace that comes from a context is not considered overridden }, } for name, test := range testCases { - c := &DeferredLoadingClientConfig{icc: test.icc} - c.clientConfig = test.clientConfig + t.Run(name, func(t *testing.T) { + c := &DeferredLoadingClientConfig{icc: test.icc, overrides: test.overrides} + c.clientConfig = test.clientConfig - ns, ok, err := c.Namespace() - if test.icc.called != test.checkedICC { - t.Errorf("%s: unexpected in-cluster-config call %t", name, test.icc.called) - } - if err != test.err || ns != test.result || ok != test.ok { - t.Errorf("%s: unexpected result: %v %s %t", name, err, ns, ok) - } + ns, overridden, err := c.Namespace() + if test.icc.called != test.checkedICC { + t.Errorf("%s: unexpected in-cluster-config call %t", name, test.icc.called) + } + if err != test.err || ns != test.result || overridden != test.overridden { + t.Errorf("%s: unexpected result: %v %s %t", name, err, ns, overridden) + } + }) } }