Merge pull request #70138 from liggitt/optional-ca-bundle

Correct optional/omitempty indicator on webhook cabundle

Kubernetes-commit: 1fe288ec02735a6c51452741dffe5e772036864b
This commit is contained in:
Kubernetes Publisher 2018-10-23 13:52:38 -07:00
commit e7898cb3b5
2 changed files with 115 additions and 91 deletions

168
Godeps/Godeps.json generated
View File

@ -280,339 +280,339 @@
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/auditregistration/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta2",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/coordination/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/scheduling/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "049920e654584910f24144786a75b837be5a84e6"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "fddbff74510a1159770789381aeaccd2effa2d4e"
"Rev": "323bac2d03757f0b097eaf318f1d5423d3e2b1d0"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -93,20 +93,32 @@ stR0Yiw0buV6DL/moUO0HIM9Bjh96HJp+LxiIS6UCdIhMPp5HoQa
func TestNew(t *testing.T) {
testCases := map[string]struct {
Config *Config
Err bool
TLS bool
TLSCert bool
TLSErr bool
Default bool
Config *Config
Err bool
TLS bool
TLSCert bool
TLSErr bool
Default bool
Insecure bool
DefaultRoots bool
}{
"default transport": {
Default: true,
Config: &Config{},
},
"insecure": {
TLS: true,
Insecure: true,
DefaultRoots: true,
Config: &Config{TLS: TLSConfig{
Insecure: true,
}},
},
"server name": {
TLS: true,
TLS: true,
DefaultRoots: true,
Config: &Config{TLS: TLSConfig{
ServerName: "foo",
}},
@ -266,6 +278,18 @@ func TestNew(t *testing.T) {
return
}
switch {
case testCase.DefaultRoots && transport.TLSClientConfig.RootCAs != nil:
t.Fatalf("got %#v, expected nil root CAs", transport.TLSClientConfig.RootCAs)
case !testCase.DefaultRoots && transport.TLSClientConfig.RootCAs == nil:
t.Fatalf("got %#v, expected non-nil root CAs", transport.TLSClientConfig.RootCAs)
}
switch {
case testCase.Insecure != transport.TLSClientConfig.InsecureSkipVerify:
t.Fatalf("got %#v, expected %#v", transport.TLSClientConfig.InsecureSkipVerify, testCase.Insecure)
}
switch {
case testCase.TLSCert && transport.TLSClientConfig.GetClientCertificate == nil:
t.Fatalf("got %#v, expected TLSClientConfig.GetClientCertificate", transport.TLSClientConfig)