kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49195 from huangjiuyuan/fix-typo 

Automatic merge from submit-queue

fix typo in staging/src/k8s.io/apiserver/pkg/server/config.go

**What this PR does / why we need it**: Fix a typo `It's members are sorted roughly in order of importance for composers.` in `staging/src/k8s.io/apiserver/pkg/server/config.go`.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

`NONE`

Kubernetes-commit: 2bd0b3dd2616e5c4a6ef79d08dfb8bc8f5959ced
This commit is contained in:
Kubernetes Publisher 2017-08-03 07:34:43 -07:00
parent 06ea0476f0 c229fe60e4
commit 2c66dfcbee
2 changed files with 64 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
Godeps/Godeps.json generated
View File

@ -804,235 +804,235 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/equality", "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/errors", "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/meta", "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing", "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/validation", "ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path", "ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured", "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/cache", "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/clock", "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/diff", "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/framer", "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/proxy", "ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/rand", "ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid", "ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/wait", "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml", "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/version", "ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "10097186a05f7d03ca925ad0912be6185f4a202c" "Rev": "a136ee686459886c09f3f6ba379e04cd56edc0ce"
}, },
{ {
"ImportPath": "k8s.io/client-go/discovery", "ImportPath": "k8s.io/client-go/discovery",

12
pkg/server/config.go
View File

@ -74,7 +74,7 @@ const (
) )
// Config is a structure used to configure a GenericAPIServer. // Config is a structure used to configure a GenericAPIServer.
// It's members are sorted roughly in order of importance for composers. // Its members are sorted roughly in order of importance for composers.
type Config struct { type Config struct {
// SecureServingInfo is required to serve https // SecureServingInfo is required to serve https
SecureServingInfo *SecureServingInfo SecureServingInfo *SecureServingInfo
@ -104,7 +104,7 @@ type Config struct {
// Version will enable the /version endpoint if non-nil // Version will enable the /version endpoint if non-nil
Version *version.Info Version *version.Info
// LegacyAuditWriter is the destination for audit logs. If nil, they will not be written. // LegacyAuditWriter is the destination for audit logs. If nil, they will not be written.
LegacyAuditWriter io.Writer LegacyAuditWriter io.Writer
// AuditBackend is where audit events are sent to. // AuditBackend is where audit events are sent to.
AuditBackend audit.Backend AuditBackend audit.Backend
@ -126,13 +126,13 @@ type Config struct {
// BuildHandlerChainFunc allows you to build custom handler chains by decorating the apiHandler. // BuildHandlerChainFunc allows you to build custom handler chains by decorating the apiHandler.
BuildHandlerChainFunc func(apiHandler http.Handler, c *Config) (secure http.Handler) BuildHandlerChainFunc func(apiHandler http.Handler, c *Config) (secure http.Handler)
// DiscoveryAddresses is used to build the IPs pass to discovery. If nil, the ExternalAddress is // DiscoveryAddresses is used to build the IPs pass to discovery. If nil, the ExternalAddress is
// always reported // always reported
DiscoveryAddresses discovery.Addresses DiscoveryAddresses discovery.Addresses
// The default set of healthz checks. There might be more added via AddHealthzChecks dynamically. // The default set of healthz checks. There might be more added via AddHealthzChecks dynamically.
HealthzChecks []healthz.HealthzChecker HealthzChecks []healthz.HealthzChecker
// LegacyAPIGroupPrefixes is used to set up URL parsing for authorization and for validating requests // LegacyAPIGroupPrefixes is used to set up URL parsing for authorization and for validating requests
// to InstallLegacyAPIGroup. New API servers don't generally have legacy groups at all. // to InstallLegacyAPIGroup. New API servers don't generally have legacy groups at all.
LegacyAPIGroupPrefixes sets.String LegacyAPIGroupPrefixes sets.String
// RequestContextMapper maps requests to contexts. Exported so downstream consumers can provider their own mappers // RequestContextMapper maps requests to contexts. Exported so downstream consumers can provider their own mappers
// TODO confirm that anyone downstream actually uses this and doesn't just need an accessor // TODO confirm that anyone downstream actually uses this and doesn't just need an accessor
@ -293,7 +293,7 @@ type completedConfig struct {
} }
// Complete fills in any fields not set that are required to have valid data and can be derived // Complete fills in any fields not set that are required to have valid data and can be derived
// from other fields. If you're going to `ApplyOptions`, do that first. It's mutating the receiver. // from other fields. If you're going to `ApplyOptions`, do that first. It's mutating the receiver.
func (c *Config) Complete() completedConfig { func (c *Config) Complete() completedConfig {
if len(c.ExternalAddress) == 0 && c.PublicAddress != nil { if len(c.ExternalAddress) == 0 && c.PublicAddress != nil {
hostAndPort := c.PublicAddress.String() hostAndPort := c.PublicAddress.String()
@ -374,7 +374,7 @@ func (c *Config) SkipComplete() completedConfig {
} }
// New creates a new server which logically combines the handling chain with the passed server. // New creates a new server which logically combines the handling chain with the passed server.
// name is used to differentiate for logging. The handler chain in particular can be difficult as it starts delgating. // name is used to differentiate for logging. The handler chain in particular can be difficult as it starts delgating.
func (c completedConfig) New(name string, delegationTarget DelegationTarget) (*GenericAPIServer, error) { func (c completedConfig) New(name string, delegationTarget DelegationTarget) (*GenericAPIServer, error) {
// The delegationTarget and the config must agree on the RequestContextMapper // The delegationTarget and the config must agree on the RequestContextMapper