Update quobyteApiServer to quobyteAPIServer

kubernetes · Sep 17, 2016 · 02db13b · 02db13b
1 parent 799c54f
commit 02db13b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/examples/experimental/persistent-volume-provisioning/README.md b/examples/experimental/persistent-volume-provisioning/README.md
@@ -158,7 +158,7 @@ metadata:
    name: slow
 provisioner: kubernetes.io/quobyte
 parameters:
-    quobyteApiServer: "http://138.68.74.142:7860"
+    quobyteAPIServer: "http://138.68.74.142:7860"
     registry: "138.68.74.142:7861"
     adminSecretName: "quobyte-admin-secret"
     adminSecretNamespace: "kube-system"
@@ -171,14 +171,14 @@ parameters:
 [Download example](quobyte/quobyte-storage-class.yaml?raw=true)
 <!-- END MUNGE: EXAMPLE quobyte/quobyte-storage-class.yaml -->
 
-* **quobyteApiServer** API Server of Quobyte in the format http(s)://api-server:7860
+* **quobyteAPIServer** API Server of Quobyte in the format http(s)://api-server:7860
 * **registry** Quobyte registry to use to mount the volume. You can specifiy the registry as <host>:<port> pair or if you want to specify multiple registries you just have to put a comma between them e.q. <host1>:<port>,<host2>:<port>,<host3>:<port>. The host can be an IP address or if you have a working DNS you can also provide the DNS names.
 * **adminSecretName** secret that holds information about the Quobyte user and the password to authenticate agains the API server.
 * **adminSecretNamespace** The namespace for **adminSecretName**. Default is `default`.
 * **user** maps all access to this user. Default is `root`.
 * **group** maps all access to this group. Default is `nfsnobody`.
 * **quobyteConfig** use the specified configuration to create the volume. You can create a new configuration or modify an existing one with the Web console or the quobyte CLI. Default is `BASE`
-* **quobyteTenant** use the specified tenant to create/delete the volume. This Quobyte tenant has to be already present in Quobyte. Default is `DEFAULT`
+* **quobyteTenant** use the specified tenant ID to create/delete the volume. This Quobyte tenant has to be already present in Quobyte. Default is `DEFAULT`
 
 First create Quobyte admin's Secret in the system namespace. Here the Secret is created in `kube-system`:
 

diff --git a/examples/experimental/persistent-volume-provisioning/quobyte/quobyte-storage-class.yaml b/examples/experimental/persistent-volume-provisioning/quobyte/quobyte-storage-class.yaml
@@ -4,7 +4,7 @@ metadata:
    name: slow
 provisioner: kubernetes.io/quobyte
 parameters:
-    quobyteApiServer: "http://138.68.74.142:7860"
+    quobyteAPIServer: "http://138.68.74.142:7860"
     registry: "138.68.74.142:7861"
     adminSecretName: "quobyte-admin-secret"
     adminSecretNamespace: "kube-system"

diff --git a/pkg/volume/quobyte/quobyte.go b/pkg/volume/quobyte/quobyte.go
@@ -48,7 +48,7 @@ type quobytePlugin struct {
 type quobyteAPIConfig struct {
 	quobyteUser      string
 	quobytePassword  string
-	quobyteApiServer string
+	quobyteAPIServer string
 }
 
 var _ volume.VolumePlugin = &quobytePlugin{}
@@ -189,7 +189,6 @@ func (plugin *quobytePlugin) newUnmounterInternal(volName string, podUID types.U
 }
 
 // Quobyte volumes represent a bare host directory mount of an quobyte export.
-//TODO add configuration + tenant
 type quobyte struct {
 	volName string
 	pod     *api.Pod
@@ -402,7 +401,7 @@ func (provisioner *quobyteVolumeProvisioner) Provision() (*api.PersistentVolume,
 	provisioner.volume = fmt.Sprintf("kubernetes-dynamic-pvc-%s", uuid.NewUUID())
 
 	cfg := &quobyteAPIConfig{
-		quobyteApiServer: apiServer,
+		quobyteAPIServer: apiServer,
 		quobyteUser:      quobyteUser,
 		quobytePassword:  quobytePassword,
 	}
@@ -468,7 +467,7 @@ func (deleter *quobyteVolumeDeleter) Delete() error {
 		config: &quobyteAPIConfig{
 			quobyteUser:      quobyteUser,
 			quobytePassword:  quobytePassword,
-			quobyteApiServer: annotations[annotationQuobyteAPIServer],
+			quobyteAPIServer: annotations[annotationQuobyteAPIServer],
 		},
 	}
 	return manager.deleteVolume(deleter)

diff --git a/pkg/volume/quobyte/quobyte_util.go b/pkg/volume/quobyte/quobyte_util.go
@@ -63,7 +63,7 @@ func (manager *quobyteVolumeManager) deleteVolume(deleter *quobyteVolumeDeleter)
 
 func (manager *quobyteVolumeManager) createQuobyteClient() *quobyte_api.QuobyteClient {
 	return quobyte_api.NewQuobyteClient(
-		manager.config.quobyteApiServer,
+		manager.config.quobyteAPIServer,
 		manager.config.quobyteUser,
 		manager.config.quobytePassword,
 	)