Compare commits

..

9 Commits

Author SHA1 Message Date
Kubernetes Publisher
1b75876d45 Merge pull request #56107 from david-mcmahon/basego-clear
Automatic merge from submit-queue.

Use v0.0.0 gitVersion on branches in support of new .gitattributes solution.

Update bad link as well.
Prefer master branch untyped values.

ref #55353.

Kubernetes-commit: 2eb901553309a391962eaffe73a71fd7196f2a0f
2017-12-07 04:22:16 +00:00
Kubernetes Publisher
7d1e7662ca Merge pull request #56418 from liggitt/automated-cherry-pick-of-#56415-upstream-release-1.8
Automatic merge from submit-queue.

Automated cherry pick of #56415

Cherry pick of #56415 on release-1.8.

#56415: Include ServerName in tls transport cache key

Kubernetes-commit: 39d73e31a3ba741ad591535488cd2942aa4e4759
2017-12-07 04:22:01 +00:00
Kubernetes Publisher
7a03699350 Merge pull request #55457 from dixudx/automated-cherry-pick-of-#eac2049-upstream-release-1.8
Automatic merge from submit-queue.

Automated cherry pick of eac2049

Cherry pick of eac2049 on release-1.8.

eac2049: avoid Registry in fake REST client

Kubernetes-commit: c1d1b92688176f37893d81cf6d7a3abc5663a795
2017-12-07 04:22:00 +00:00
Jordan Liggitt
b83876e826 Include ServerName in tls transport cache key
Kubernetes-commit: 079d5e5fffad73840943d379bb5e60bc4845bd6a
2017-11-27 10:05:26 -05:00
David McMahon
b0a657da60 Use v0.0.0 gitVersion on branches in support of new .gitattributes solution.
ref #55353.

Kubernetes-commit: e576bfa209bce1505efda2695e9e7f4c2fed80f1
2017-11-20 16:25:57 -08:00
Di Xu
ede7254aff fix errors
Kubernetes-commit: 8aad68e0e7c9a0518dd40253a1e9aae6dc18c7e7
2017-11-12 18:06:32 +08:00
Kubernetes Publisher
8b23653518 Merge pull request #55493 from david-mcmahon/automated-cherry-pick-of-#55353-upstream-release-1.8
Automatic merge from submit-queue.

Automated cherry pick of #55353

Cherry pick of #55353 on release-1.8.

#55353: Capture git export-subst strings in version.sh for 'git

Kubernetes-commit: 244755cbe49b89530d1ff8d493d0e2c1d7871b65
2017-11-11 13:50:19 -08:00
David McMahon
802f4da84a Capture git export-subst strings in version.sh for 'git archive' use.
Eliminate the need to update pkg/version/base.go on release branch tagging.

Kubernetes-commit: b356c6968d63bce3640d9f931843da83757bd8f4
2017-11-08 15:37:49 -08:00
Solly Ross
456cbc0118 avoid Registry in fake REST client
Previously, the fake RESTClient in client-go required a Registry.  It
used the Registry to fetch the GroupVersion for the fake client.
However, the way it did so was dubious in some cases (it hard-coded the
default API group in places), and not strictly necssary.

This updates the fake client to just recieve the GroupVersion and
internal group name directly, instead of requiring a Registry, so that
it can be consumed in unit tests where a Registry isn't necessarily
readily available (e.g. elsewhere in client-go).

Kubernetes-commit: af2bb704411263e725c360f68d13c8cf233ecf91
2017-10-04 18:42:54 -04:00
6 changed files with 700 additions and 695 deletions

1344
Godeps/Godeps.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -39,11 +39,11 @@ var (
// them irrelevant. (Next we'll take it out, which may muck with
// scripts consuming the kubectl version output - but most of
// these should be looking at gitVersion already anyways.)
gitMajor string = "1" // major version, always numeric
gitMinor string = "8+" // minor version, numeric possibly followed by "+"
gitMajor = "1" // major version, always numeric
gitMinor = "8+" // minor version, numeric possibly followed by "+"
// semantic version, derived by build scripts (see
// https://github.com/kubernetes/kubernetes/blob/master/docs/design/versioning.md
// https://github.com/kubernetes/community/blob/master/contributors/design-proposals/release/versioning.md
// for a detailed discussion of this field)
//
// TODO: This field is still called "gitVersion" for legacy
@@ -51,9 +51,13 @@ var (
// semantic version is a git hash, but the version itself is no
// longer the direct output of "git describe", but a slight
// translation to be semver compliant.
gitVersion string = "v1.8.4-beta.0+$Format:%h$"
gitCommit string = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
buildDate string = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
// NOTE: The $Format strings are replaced during 'git archive' thanks to the
// companion .gitattributes file containing 'export-subst' in this same
// directory. See also https://git-scm.com/docs/gitattributes
gitVersion = "v0.0.0-master+$Format:%h$"
gitCommit = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
gitTreeState = "" // state of git tree, either "clean" or "dirty"
buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
)

View File

@@ -9,7 +9,6 @@ go_library(
name = "go_default_library",
srcs = ["fake.go"],
deps = [
"//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",

View File

@@ -22,7 +22,6 @@ import (
"net/http"
"net/url"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
@@ -46,8 +45,7 @@ func (f roundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
type RESTClient struct {
Client *http.Client
NegotiatedSerializer runtime.NegotiatedSerializer
GroupName string
APIRegistry *registered.APIRegistrationManager
GroupVersion schema.GroupVersion
VersionedAPIPath string
Req *http.Request
@@ -80,7 +78,7 @@ func (c *RESTClient) Verb(verb string) *restclient.Request {
}
func (c *RESTClient) APIVersion() schema.GroupVersion {
return c.APIRegistry.GroupOrDie("").GroupVersion
return c.GroupVersion
}
func (c *RESTClient) GetRateLimiter() flowcontrol.RateLimiter {
@@ -89,22 +87,20 @@ func (c *RESTClient) GetRateLimiter() flowcontrol.RateLimiter {
func (c *RESTClient) request(verb string) *restclient.Request {
config := restclient.ContentConfig{
ContentType: runtime.ContentTypeJSON,
// TODO this was hardcoded before, but it doesn't look right
GroupVersion: &c.APIRegistry.GroupOrDie("").GroupVersion,
ContentType: runtime.ContentTypeJSON,
GroupVersion: &c.GroupVersion,
NegotiatedSerializer: c.NegotiatedSerializer,
}
ns := c.NegotiatedSerializer
info, _ := runtime.SerializerInfoForMediaType(ns.SupportedMediaTypes(), runtime.ContentTypeJSON)
internalVersion := schema.GroupVersion{
Group: c.APIRegistry.GroupOrDie(c.GroupName).GroupVersion.Group,
Group: c.GroupVersion.Group,
Version: runtime.APIVersionInternal,
}
internalVersion.Version = runtime.APIVersionInternal
serializers := restclient.Serializers{
// TODO this was hardcoded before, but it doesn't look right
Encoder: ns.EncoderForVersion(info.Serializer, c.APIRegistry.GroupOrDie("").GroupVersion),
Encoder: ns.EncoderForVersion(info.Serializer, c.GroupVersion),
Decoder: ns.DecoderToVersion(info.Serializer, internalVersion),
}
if info.StreamSerializer != nil {

View File

@@ -88,5 +88,5 @@ func tlsConfigKey(c *Config) (string, error) {
return "", err
}
// Only include the things that actually affect the tls.Config
return fmt.Sprintf("%v/%x/%x/%x", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData), nil
return fmt.Sprintf("%v/%x/%x/%x/%v", c.TLS.Insecure, c.TLS.CAData, c.TLS.CertData, c.TLS.KeyData, c.TLS.ServerName), nil
}

View File

@@ -62,6 +62,20 @@ func TestTLSConfigKey(t *testing.T) {
KeyData: []byte{1},
},
},
"cert 1, key 1, servername 1": {
TLS: TLSConfig{
CertData: []byte{1},
KeyData: []byte{1},
ServerName: "1",
},
},
"cert 1, key 1, servername 2": {
TLS: TLSConfig{
CertData: []byte{1},
KeyData: []byte{1},
ServerName: "2",
},
},
"cert 1, key 2": {
TLS: TLSConfig{
CertData: []byte{1},