[Federation] Review comment fixes for making federation etcd PVC size configurable

This commit is contained in:
Irfan Ur Rehman 2016-11-16 20:51:10 +05:30
parent 58b631fe77
commit 98d55db5ec
3 changed files with 3 additions and 6 deletions

View File

@ -356,7 +356,6 @@ func createControllerManagerKubeconfigSecret(clientset *client.Clientset, namesp
} }
func createPVC(clientset *client.Clientset, namespace, svcName, etcdPVCapacity string) (*api.PersistentVolumeClaim, error) { func createPVC(clientset *client.Clientset, namespace, svcName, etcdPVCapacity string) (*api.PersistentVolumeClaim, error) {
capacity, err := resource.ParseQuantity(etcdPVCapacity) capacity, err := resource.ParseQuantity(etcdPVCapacity)
if err != nil { if err != nil {
return nil, err return nil, err

View File

@ -403,12 +403,9 @@ func fakeInitHostFactory(federationName, namespaceName, ip, dnsZoneName, image,
svcUrlPrefix := "/api/v1/namespaces/federation-system/services" svcUrlPrefix := "/api/v1/namespaces/federation-system/services"
credSecretName := svcName + "-credentials" credSecretName := svcName + "-credentials"
cmKubeconfigSecretName := federationName + "-controller-manager-kubeconfig" cmKubeconfigSecretName := federationName + "-controller-manager-kubeconfig"
pvCap := "" pvCap := "10Gi"
if etcdPVCapacity != "" {
if "" != etcdPVCapacity {
pvCap = etcdPVCapacity pvCap = etcdPVCapacity
} else {
pvCap = "10Gi" //test for default value
} }
capacity, err := resource.ParseQuantity(pvCap) capacity, err := resource.ParseQuantity(pvCap)

View File

@ -169,6 +169,7 @@ etcd-config
etcd-keyfile etcd-keyfile
etcd-mutation-timeout etcd-mutation-timeout
etcd-prefix etcd-prefix
etcd-pv-capacity
etcd-quorum-read etcd-quorum-read
etcd-server etcd-server
etcd-servers etcd-servers