diff --git a/examples/persistent-volume-provisioning/README.md b/examples/persistent-volume-provisioning/README.md index 4ddd05b183c..b5b01c78477 100644 --- a/examples/persistent-volume-provisioning/README.md +++ b/examples/persistent-volume-provisioning/README.md @@ -215,7 +215,7 @@ parameters: * **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 ID 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. For Quobyte < 1.4 use an empty string `""` as `DEFAULT` tenant. 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/persistent-volume-provisioning/quobyte/quobyte-admin-secret.yaml b/examples/persistent-volume-provisioning/quobyte/quobyte-admin-secret.yaml index 9e395a89b31..24cc7677387 100644 --- a/examples/persistent-volume-provisioning/quobyte/quobyte-admin-secret.yaml +++ b/examples/persistent-volume-provisioning/quobyte/quobyte-admin-secret.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Secret metadata: name: quobyte-admin-secret +type: "kubernetes.io/quobyte" data: password: cXVvYnl0ZQ== user: YWRtaW4= diff --git a/pkg/volume/quobyte/quobyte.go b/pkg/volume/quobyte/quobyte.go index 10bb7677f2d..7f14568148b 100644 --- a/pkg/volume/quobyte/quobyte.go +++ b/pkg/volume/quobyte/quobyte.go @@ -61,10 +61,6 @@ var _ volume.Deleter = &quobyteVolumeDeleter{} const ( quobytePluginName = "kubernetes.io/quobyte" - - annotationQuobyteAPIServer = "quobyte.kubernetes.io/api" - annotationQuobyteAPISecret = "quobyte.kubernetes.io/apiuser" - annotationQuobyteAPISecretNamespace = "quobyte.kubernetes.io/apipassword" ) func (plugin *quobytePlugin) Init(host volume.VolumeHost) error {