From 218080cd202122a482c31692e0f46697154ec2e8 Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Wed, 27 Feb 2019 15:58:59 +0800 Subject: [PATCH 1/2] add client key and certificate for logging fluentd Problem: advance mode have support client key and certificate for fluentd logging target but normal mode not yet Solution: add client key and certificate for fluentd Issue: https://github.com/rancher/rancher/issues/18438 --- apis/management.cattle.io/v3/logging_types.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apis/management.cattle.io/v3/logging_types.go b/apis/management.cattle.io/v3/logging_types.go index c167e079..7df54836 100644 --- a/apis/management.cattle.io/v3/logging_types.go +++ b/apis/management.cattle.io/v3/logging_types.go @@ -151,6 +151,10 @@ type SyslogConfig struct { type FluentForwarderConfig struct { EnableTLS bool `json:"enableTls,omitempty" norman:"default=false"` Certificate string `json:"certificate,omitempty"` + ClientCert string `json:"clientCert,omitempty"` + ClientKey string `json:"clientKey,omitempty"` + ClientKeyPass string `json:"clientKeyPass,omitempty"` + SSLVerify bool `json:"sslVerify,omitempty"` Compress bool `json:"compress,omitempty" norman:"default=true"` FluentServers []FluentServer `json:"fluentServers,omitempty" norman:"required"` } From 8a698a37a0e9efd7869200278e0952457f87161f Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Wed, 27 Feb 2019 16:01:49 +0800 Subject: [PATCH 2/2] update vendor --- .../management/v3/zz_generated_fluent_forwarder_config.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/client/management/v3/zz_generated_fluent_forwarder_config.go b/client/management/v3/zz_generated_fluent_forwarder_config.go index 9dc9ceb5..cd341125 100644 --- a/client/management/v3/zz_generated_fluent_forwarder_config.go +++ b/client/management/v3/zz_generated_fluent_forwarder_config.go @@ -3,14 +3,22 @@ package client const ( FluentForwarderConfigType = "fluentForwarderConfig" FluentForwarderConfigFieldCertificate = "certificate" + FluentForwarderConfigFieldClientCert = "clientCert" + FluentForwarderConfigFieldClientKey = "clientKey" + FluentForwarderConfigFieldClientKeyPass = "clientKeyPass" FluentForwarderConfigFieldCompress = "compress" FluentForwarderConfigFieldEnableTLS = "enableTls" FluentForwarderConfigFieldFluentServers = "fluentServers" + FluentForwarderConfigFieldSSLVerify = "sslVerify" ) type FluentForwarderConfig struct { Certificate string `json:"certificate,omitempty" yaml:"certificate,omitempty"` + ClientCert string `json:"clientCert,omitempty" yaml:"clientCert,omitempty"` + ClientKey string `json:"clientKey,omitempty" yaml:"clientKey,omitempty"` + ClientKeyPass string `json:"clientKeyPass,omitempty" yaml:"clientKeyPass,omitempty"` Compress bool `json:"compress,omitempty" yaml:"compress,omitempty"` EnableTLS bool `json:"enableTls,omitempty" yaml:"enableTls,omitempty"` FluentServers []FluentServer `json:"fluentServers,omitempty" yaml:"fluentServers,omitempty"` + SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` }