From e0fa2972daecc2e862f72f3e4ffe3a48b5f82fd9 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Tue, 29 Mar 2022 15:20:00 -0700
Subject: [PATCH] Redact datastore and etcd snapshot config from serialization

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e7437d4ad8f71111ca09e0e15d3b5deb59b499d5)
---
 pkg/daemons/config/types.go | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkg/daemons/config/types.go b/pkg/daemons/config/types.go
index bd20123c9a..e9111cdc9c 100644
--- a/pkg/daemons/config/types.go
+++ b/pkg/daemons/config/types.go
@@ -141,7 +141,7 @@ type Control struct {
 	KubeConfigOutput         string
 	KubeConfigMode           string
 	DataDir                  string
-	Datastore                endpoint.Config
+	Datastore                endpoint.Config `json:"-"`
 	DisableAPIServer         bool
 	DisableControllerManager bool
 	DisableETCD              bool
@@ -167,25 +167,25 @@ type Control struct {
 	EncryptSkip              bool
 	TLSMinVersion            uint16
 	TLSCipherSuites          []uint16
-	EtcdSnapshotName         string
-	EtcdDisableSnapshots     bool
-	EtcdExposeMetrics        bool
-	EtcdSnapshotDir          string
-	EtcdSnapshotCron         string
-	EtcdSnapshotRetention    int
-	EtcdSnapshotCompress     bool
-	EtcdListFormat           string
-	EtcdS3                   bool
-	EtcdS3Endpoint           string
-	EtcdS3EndpointCA         string
-	EtcdS3SkipSSLVerify      bool
-	EtcdS3AccessKey          string
-	EtcdS3SecretKey          string
-	EtcdS3BucketName         string
-	EtcdS3Region             string
-	EtcdS3Folder             string
-	EtcdS3Timeout            time.Duration
-	EtcdS3Insecure           bool
+	EtcdSnapshotName         string        `json:"-"`
+	EtcdDisableSnapshots     bool          `json:"-"`
+	EtcdExposeMetrics        bool          `json:"-"`
+	EtcdSnapshotDir          string        `json:"-"`
+	EtcdSnapshotCron         string        `json:"-"`
+	EtcdSnapshotRetention    int           `json:"-"`
+	EtcdSnapshotCompress     bool          `json:"-"`
+	EtcdListFormat           string        `json:"-"`
+	EtcdS3                   bool          `json:"-"`
+	EtcdS3Endpoint           string        `json:"-"`
+	EtcdS3EndpointCA         string        `json:"-"`
+	EtcdS3SkipSSLVerify      bool          `json:"-"`
+	EtcdS3AccessKey          string        `json:"-"`
+	EtcdS3SecretKey          string        `json:"-"`
+	EtcdS3BucketName         string        `json:"-"`
+	EtcdS3Region             string        `json:"-"`
+	EtcdS3Folder             string        `json:"-"`
+	EtcdS3Timeout            time.Duration `json:"-"`
+	EtcdS3Insecure           bool          `json:"-"`
 	ServerNodeName           string
 
 	BindAddress string