github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Feature: add insecure_skip_verify field to registry config template
pull/2192/head
Brad Davidson 2020-09-01 15:58:26 -07:00 committed by GitHub
parent fd933c936f cf8c101b70
commit a3e9d31e6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/agent/templates/registry.go
View File

@ -28,6 +28,7 @@ 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

1
pkg/agent/templates/templates.go
View File

@ -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}}