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

Merge pull request #6171 from rbtcollins/master 

Add experimental and metrics flags for docker
This commit is contained in:
Kubernetes Prow Robot 2018-12-06 07:38:04 -08:00 committed by GitHub
parent c900dc48db f5689c2332
commit 6dc2fbee29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/dockerconfig.go
View File

@ -30,6 +30,8 @@ type DockerConfig struct {
DefaultUlimit []string `json:"defaultUlimit,omitempty" flag:"default-ulimit,repeat"`
// ExecRoot is the root directory for execution state files (default "/var/run/docker")
ExecRoot *string `json:"execRoot,omitempty" flag:"exec-root"`
// Experimental features permits enabling new features such as dockerd metrics
Experimental *bool `json:"experimental,omitempty" flag:"experimental"`
// Hosts enables you to configure the endpoints the docker daemon listens on i.e tcp://0.0.0.0.2375 or unix:///var/run/docker.sock etc
Hosts []string `json:"hosts,omitempty" flag:"host,repeat"`
// IPMasq enables ip masquerading for containers
@ -46,6 +48,8 @@ type DockerConfig struct {
LogLevel *string `json:"logLevel,omitempty" flag:"log-level"`
// Logopt is a series of options given to the log driver options for containers
LogOpt []string `json:"logOpt,omitempty" flag:"log-opt,repeat"`
// Metrics address is the endpoint to serve with Prometheus format metrics
MetricsAddress *string `json:"metricsAddress,omitempty" flag:"metrics-addr"`
// MTU is the containers network MTU
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
// RegistryMirrors is a referred list of docker registry mirror

4
pkg/apis/kops/v1alpha1/dockerconfig.go
View File

@ -30,6 +30,8 @@ type DockerConfig struct {
DefaultUlimit []string `json:"defaultUlimit,omitempty" flag:"default-ulimit,repeat"`
// ExecRoot is the root directory for execution state files (default "/var/run/docker")
ExecRoot *string `json:"execRoot,omitempty" flag:"exec-root"`
// Experimental features permits enabling new features such as dockerd metrics
Experimental *bool `json:"experimental,omitempty" flag:"experimental"`
// Hosts enables you to configure the endpoints the docker daemon listens on i.e tcp://0.0.0.0.2375 or unix:///var/run/docker.sock etc
Hosts []string `json:"hosts,omitempty" flag:"host,repeat"`
// IPMasq enables ip masquerading for containers
@ -46,6 +48,8 @@ type DockerConfig struct {
LogLevel *string `json:"logLevel,omitempty" flag:"log-level"`
// Logopt is a series of options given to the log driver options for containers
LogOpt []string `json:"logOpt,omitempty" flag:"log-opt,repeat"`
// Metrics address is the endpoint to serve with Prometheus format metrics
MetricsAddress *string `json:"metricsAddress,omitempty" flag:"metrics-addr"`
// MTU is the containers network MTU
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
// RegistryMirrors is a referred list of docker registry mirror

4
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -1395,6 +1395,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.DataRoot = in.DataRoot
out.DefaultUlimit = in.DefaultUlimit
out.ExecRoot = in.ExecRoot
out.Experimental = in.Experimental
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
@ -1403,6 +1404,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.LogDriver = in.LogDriver
out.LogLevel = in.LogLevel
out.LogOpt = in.LogOpt
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage
@ -1424,6 +1426,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
out.DataRoot = in.DataRoot
out.DefaultUlimit = in.DefaultUlimit
out.ExecRoot = in.ExecRoot
out.Experimental = in.Experimental
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
@ -1432,6 +1435,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
out.LogDriver = in.LogDriver
out.LogLevel = in.LogLevel
out.LogOpt = in.LogOpt
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage

18
pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
View File

@ -1095,6 +1095,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
**out = **in
}
}
if in.Experimental != nil {
in, out := &in.Experimental, &out.Experimental
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.Hosts != nil {
in, out := &in.Hosts, &out.Hosts
*out = make([]string, len(*in))
@ -1159,6 +1168,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.MetricsAddress != nil {
in, out := &in.MetricsAddress, &out.MetricsAddress
if *in == nil {
*out = nil
} else {
*out = new(string)
**out = **in
}
}
if in.MTU != nil {
in, out := &in.MTU, &out.MTU
if *in == nil {

4
pkg/apis/kops/v1alpha2/dockerconfig.go
View File

@ -30,6 +30,8 @@ type DockerConfig struct {
DefaultUlimit []string `json:"defaultUlimit,omitempty" flag:"default-ulimit,repeat"`
// ExecRoot is the root directory for execution state files (default "/var/run/docker")
ExecRoot *string `json:"execRoot,omitempty" flag:"exec-root"`
// Experimental features permits enabling new features such as dockerd metrics
Experimental *bool `json:"experimental,omitempty" flag:"experimental"`
// Hosts enables you to configure the endpoints the docker daemon listens on i.e tcp://0.0.0.0.2375 or unix:///var/run/docker.sock etc
Hosts []string `json:"hosts,omitempty" flag:"host,repeat"`
// IPMasq enables ip masquerading for containers
@ -46,6 +48,8 @@ type DockerConfig struct {
LogLevel *string `json:"logLevel,omitempty" flag:"log-level"`
// Logopt is a series of options given to the log driver options for containers
LogOpt []string `json:"logOpt,omitempty" flag:"log-opt,repeat"`
// Metrics address is the endpoint to serve with Prometheus format metrics
MetricsAddress *string `json:"metricsAddress,omitempty" flag:"metrics-addr"`
// MTU is the containers network MTU
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
// RegistryMirrors is a referred list of docker registry mirror

4
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -1496,6 +1496,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.DataRoot = in.DataRoot
out.DefaultUlimit = in.DefaultUlimit
out.ExecRoot = in.ExecRoot
out.Experimental = in.Experimental
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
@ -1504,6 +1505,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.LogDriver = in.LogDriver
out.LogLevel = in.LogLevel
out.LogOpt = in.LogOpt
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage
@ -1525,6 +1527,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.DataRoot = in.DataRoot
out.DefaultUlimit = in.DefaultUlimit
out.ExecRoot = in.ExecRoot
out.Experimental = in.Experimental
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
@ -1533,6 +1536,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.LogDriver = in.LogDriver
out.LogLevel = in.LogLevel
out.LogOpt = in.LogOpt
out.MetricsAddress = in.MetricsAddress
out.MTU = in.MTU
out.RegistryMirrors = in.RegistryMirrors
out.Storage = in.Storage

18
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View File

@ -1062,6 +1062,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
**out = **in
}
}
if in.Experimental != nil {
in, out := &in.Experimental, &out.Experimental
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.Hosts != nil {
in, out := &in.Hosts, &out.Hosts
*out = make([]string, len(*in))
@ -1126,6 +1135,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.MetricsAddress != nil {
in, out := &in.MetricsAddress, &out.MetricsAddress
if *in == nil {
*out = nil
} else {
*out = new(string)
**out = **in
}
}
if in.MTU != nil {
in, out := &in.MTU, &out.MTU
if *in == nil {

18
pkg/apis/kops/zz_generated.deepcopy.go
View File

@ -1190,6 +1190,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
**out = **in
}
}
if in.Experimental != nil {
in, out := &in.Experimental, &out.Experimental
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
if in.Hosts != nil {
in, out := &in.Hosts, &out.Hosts
*out = make([]string, len(*in))
@ -1254,6 +1263,15 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.MetricsAddress != nil {
in, out := &in.MetricsAddress, &out.MetricsAddress
if *in == nil {
*out = nil
} else {
*out = new(string)
**out = **in
}
}
if in.MTU != nil {
in, out := &in.MTU, &out.MTU
if *in == nil {