From 4a71f84a30107abde63b66424c2f8d55acde7ffe Mon Sep 17 00:00:00 2001 From: Maurizio Drocco Date: Fri, 10 Apr 2020 10:14:50 -0400 Subject: [PATCH 1/4] added note on --etcd-servers-overrides Added a note on etcd-servers-overrides option, to clarify CRDs are not supported (yet). --- staging/src/k8s.io/apiserver/pkg/server/options/etcd.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go index 358776a790b..5ac56109a32 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go @@ -116,7 +116,8 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) { fs.StringSliceVar(&s.EtcdServersOverrides, "etcd-servers-overrides", s.EtcdServersOverrides, ""+ "Per-resource etcd servers overrides, comma separated. The individual override "+ - "format: group/resource#servers, where servers are URLs, semicolon separated.") + "format: group/resource#servers, where servers are URLs, semicolon separated. "+ + "Note that etcd servers overrides currently do not support CRDs.") fs.StringVar(&s.DefaultStorageMediaType, "storage-media-type", s.DefaultStorageMediaType, ""+ "The media type to use to store objects in storage. "+ From 5c3d6a26a11875a8305832fa681cc5929d159eb2 Mon Sep 17 00:00:00 2001 From: Maurizio Drocco Date: Fri, 10 Apr 2020 11:12:26 -0400 Subject: [PATCH 2/4] Update etcd.go --- staging/src/k8s.io/apiserver/pkg/server/options/etcd.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go index 5ac56109a32..e43fb20ae2f 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go @@ -117,7 +117,8 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) { fs.StringSliceVar(&s.EtcdServersOverrides, "etcd-servers-overrides", s.EtcdServersOverrides, ""+ "Per-resource etcd servers overrides, comma separated. The individual override "+ "format: group/resource#servers, where servers are URLs, semicolon separated. "+ - "Note that etcd servers overrides currently do not support CRDs.") + "Note that this applies only to static API types compiled into this server binary, "+ + "so it does not affect aggregated APIs or dynamic CRDs.") fs.StringVar(&s.DefaultStorageMediaType, "storage-media-type", s.DefaultStorageMediaType, ""+ "The media type to use to store objects in storage. "+ From 368e976113ca035854083212275a0c39373f152e Mon Sep 17 00:00:00 2001 From: Maurizio Drocco Date: Fri, 10 Apr 2020 13:21:59 -0400 Subject: [PATCH 3/4] Update etcd.go --- staging/src/k8s.io/apiserver/pkg/server/options/etcd.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go index e43fb20ae2f..4adfe7bab6b 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go @@ -117,8 +117,8 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) { fs.StringSliceVar(&s.EtcdServersOverrides, "etcd-servers-overrides", s.EtcdServersOverrides, ""+ "Per-resource etcd servers overrides, comma separated. The individual override "+ "format: group/resource#servers, where servers are URLs, semicolon separated. "+ - "Note that this applies only to static API types compiled into this server binary, "+ - "so it does not affect aggregated APIs or dynamic CRDs.") + "Note that this applies only to resources compiled into this server binary, "+ + "so it does not affect resources served by aggregated API servers nor ones defined by CRDs.") fs.StringVar(&s.DefaultStorageMediaType, "storage-media-type", s.DefaultStorageMediaType, ""+ "The media type to use to store objects in storage. "+ From f6ac24bfd86d9dfce6a8ff0d611b4fdabc7bc504 Mon Sep 17 00:00:00 2001 From: Maurizio Drocco Date: Mon, 13 Apr 2020 13:29:18 -0400 Subject: [PATCH 4/4] Update etcd.go --- staging/src/k8s.io/apiserver/pkg/server/options/etcd.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go index 4adfe7bab6b..988bc0560d3 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/etcd.go @@ -117,8 +117,7 @@ func (s *EtcdOptions) AddFlags(fs *pflag.FlagSet) { fs.StringSliceVar(&s.EtcdServersOverrides, "etcd-servers-overrides", s.EtcdServersOverrides, ""+ "Per-resource etcd servers overrides, comma separated. The individual override "+ "format: group/resource#servers, where servers are URLs, semicolon separated. "+ - "Note that this applies only to resources compiled into this server binary, "+ - "so it does not affect resources served by aggregated API servers nor ones defined by CRDs.") + "Note that this applies only to resources compiled into this server binary. ") fs.StringVar(&s.DefaultStorageMediaType, "storage-media-type", s.DefaultStorageMediaType, ""+ "The media type to use to store objects in storage. "+