Unverified Commit a3e9d31e authored by Brad Davidson's avatar Brad Davidson Committed by GitHub

Merge pull request #2097 from iwilltry42/registry-insecure-skip-verify

Feature: add insecure_skip_verify field to registry config template
parents fd933c93 cf8c101b
...@@ -25,9 +25,10 @@ type AuthConfig struct { ...@@ -25,9 +25,10 @@ type AuthConfig struct {
// TLSConfig contains the CA/Cert/Key used for a registry // TLSConfig contains the CA/Cert/Key used for a registry
type TLSConfig struct { type TLSConfig struct {
CAFile string `toml:"ca_file" yaml:"ca_file"` CAFile string `toml:"ca_file" yaml:"ca_file"`
CertFile string `toml:"cert_file" yaml:"cert_file"` CertFile string `toml:"cert_file" yaml:"cert_file"`
KeyFile string `toml:"key_file" yaml:"key_file"` KeyFile string `toml:"key_file" yaml:"key_file"`
InsecureSkipVerify bool `toml:"insecure_skip_verify" yaml:"insecure_skip_verify"`
} }
// Registry is registry settings configured // Registry is registry settings configured
......
...@@ -67,6 +67,7 @@ const ContainerdConfigTemplate = ` ...@@ -67,6 +67,7 @@ const ContainerdConfigTemplate = `
{{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}} {{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
{{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}} {{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
{{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}} {{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
{{ if $v.TLS.InsecureSkipVerify }}insecure_skip_verify = true{{end}}
{{end}} {{end}}
{{end}} {{end}}
{{end}} {{end}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment