From 98d55db5ecba596b853522ec49cab03210c4db4f Mon Sep 17 00:00:00 2001 From: Irfan Ur Rehman Date: Wed, 16 Nov 2016 20:51:10 +0530 Subject: [PATCH] [Federation] Review comment fixes for making federation etcd PVC size configurable --- federation/pkg/kubefed/init/init.go | 1 - federation/pkg/kubefed/init/init_test.go | 7 ++----- hack/verify-flags/known-flags.txt | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index a6b4c4b9ca1..6c4a6e0986b 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -356,7 +356,6 @@ func createControllerManagerKubeconfigSecret(clientset *client.Clientset, namesp } func createPVC(clientset *client.Clientset, namespace, svcName, etcdPVCapacity string) (*api.PersistentVolumeClaim, error) { - capacity, err := resource.ParseQuantity(etcdPVCapacity) if err != nil { return nil, err diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 981a66721d9..694cd6f0145 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -403,12 +403,9 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image, svcUrlPrefix := "/api/v1/namespaces/federation-system/services" credSecretName := svcName + "-credentials" cmKubeconfigSecretName := federationName + "-controller-manager-kubeconfig" - pvCap := "" - - if "" != etcdPVCapacity { + pvCap := "10Gi" + if etcdPVCapacity != "" { pvCap = etcdPVCapacity - } else { - pvCap = "10Gi" //test for default value } capacity, err := resource.ParseQuantity(pvCap) diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt index 348411f09fb..d913a7f25c6 100644 --- a/hack/verify-flags/known-flags.txt +++ b/hack/verify-flags/known-flags.txt @@ -169,6 +169,7 @@ etcd-config etcd-keyfile etcd-mutation-timeout etcd-prefix +etcd-pv-capacity etcd-quorum-read etcd-server etcd-servers