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

Merge pull request #11027 from hakman/fix_docker_insecure_registries 

Fix rendering of multiple Docker insecure registries
This commit is contained in:
Kubernetes Prow Robot 2021-03-12 08:10:18 -08:00 committed by GitHub
parent bafbdaef6d 79a0720143
commit d1f17c6c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodeup/pkg/model/docker_test.go
View File

@ -101,6 +101,10 @@ func TestDockerBuilder_BuildFlags(t *testing.T) {
kops.DockerConfig{ExecOpt: []string{"native.cgroupdriver=systemd"}},
"--exec-opt=native.cgroupdriver=systemd",
},
{
kops.DockerConfig{InsecureRegistries: []string{"registry1", "registry2"}},
"--insecure-registry=registry1 --insecure-registry=registry2",
},
}
for _, g := range grid {

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

@ -47,7 +47,7 @@ type DockerConfig struct {
// InsecureRegistry enable insecure registry communication @question according to dockers this a list??
InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
// InsecureRegistries enables multiple insecure docker registry communications
InsecureRegistries []string `json:"insecureRegistries,omitempty" flag:"insecure-registry"`
InsecureRegistries []string `json:"insecureRegistries,omitempty" flag:"insecure-registry,repeat"`
// LiveRestore enables live restore of docker when containers are still running
LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
// LogDriver is the default driver for container logs (default "json-file")

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

@ -47,7 +47,7 @@ type DockerConfig struct {
// InsecureRegistry enable insecure registry communication @question according to dockers this a list??
InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
// InsecureRegistries enables multiple insecure docker registry communications
InsecureRegistries []string `json:"insecureRegistries,omitempty" flag:"insecure-registry"`
InsecureRegistries []string `json:"insecureRegistries,omitempty" flag:"insecure-registry,repeat"`
// LiveRestore enables live restore of docker when containers are still running
LiveRestore *bool `json:"liveRestore,omitempty" flag:"live-restore"`
// LogDriver is the default driver for container logs (default "json-file")