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

Merge pull request #4497 from jaipradeesh/dockerd-tcp 

docker: Adds hosts configuration option
This commit is contained in:
k8s-ci-robot 2018-02-26 11:36:45 -08:00 committed by GitHub
parent e317a5ab00 e1074d98ff
commit a9ec4d1dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,8 @@ type DockerConfig struct {
BridgeIP *string `json:"bridgeIP,omitempty" flag:"bip"`
// DefaultUlimit is the ulimits for containers
DefaultUlimit []string `json:"defaultUlimit,omitempty" flag:"default-ulimit,repeat"`
// 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
IPMasq *bool `json:"ipMasq,omitempty" flag:"ip-masq"`
// IPtables enables addition of iptables rules

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

@ -26,6 +26,8 @@ type DockerConfig struct {
BridgeIP *string `json:"bridgeIP,omitempty" flag:"bip"`
// DefaultUlimit is the ulimits for containers
DefaultUlimit []string `json:"defaultUlimit,omitempty" flag:"default-ulimit,repeat"`
// 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
IPMasq *bool `json:"ipMasq,omitempty" flag:"ip-masq"`
// IPtables enables addition of iptables rules

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

@ -1136,6 +1136,7 @@ func autoConvert_v1alpha1_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.Bridge = in.Bridge
out.BridgeIP = in.BridgeIP
out.DefaultUlimit = in.DefaultUlimit
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
out.InsecureRegistry = in.InsecureRegistry
@ -1163,6 +1164,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha1_DockerConfig(in *kops.DockerConfi
out.Bridge = in.Bridge
out.BridgeIP = in.BridgeIP
out.DefaultUlimit = in.DefaultUlimit
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
out.InsecureRegistry = in.InsecureRegistry

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

@ -904,6 +904,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Hosts != nil {
in, out := &in.Hosts, &out.Hosts
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.IPMasq != nil {
in, out := &in.IPMasq, &out.IPMasq
if *in == nil {

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

@ -26,6 +26,8 @@ type DockerConfig struct {
BridgeIP *string `json:"bridgeIP,omitempty" flag:"bip"`
// DefaultUlimit is the ulimits for containers
DefaultUlimit []string `json:"defaultUlimit,omitempty" flag:"default-ulimit,repeat"`
// 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
IPMasq *bool `json:"ipMasq,omitempty" flag:"ip-masq"`
// IPtables enables addition of iptables rules

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

@ -1235,6 +1235,7 @@ func autoConvert_v1alpha2_DockerConfig_To_kops_DockerConfig(in *DockerConfig, ou
out.Bridge = in.Bridge
out.BridgeIP = in.BridgeIP
out.DefaultUlimit = in.DefaultUlimit
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
out.InsecureRegistry = in.InsecureRegistry
@ -1262,6 +1263,7 @@ func autoConvert_kops_DockerConfig_To_v1alpha2_DockerConfig(in *kops.DockerConfi
out.Bridge = in.Bridge
out.BridgeIP = in.BridgeIP
out.DefaultUlimit = in.DefaultUlimit
out.Hosts = in.Hosts
out.IPMasq = in.IPMasq
out.IPTables = in.IPTables
out.InsecureRegistry = in.InsecureRegistry

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

@ -898,6 +898,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Hosts != nil {
in, out := &in.Hosts, &out.Hosts
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.IPMasq != nil {
in, out := &in.IPMasq, &out.IPMasq
if *in == nil {

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

@ -1026,6 +1026,11 @@ func (in *DockerConfig) DeepCopyInto(out *DockerConfig) {
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.Hosts != nil {
in, out := &in.Hosts, &out.Hosts
*out = make([]string, len(*in))
copy(*out, *in)
}
if in.IPMasq != nil {
in, out := &in.IPMasq, &out.IPMasq
if *in == nil {