From 96e43e406e492d8b8faf84ba036ed07e300cfa82 Mon Sep 17 00:00:00 2001 From: Johannes Scheuermann Date: Tue, 21 Feb 2017 14:02:46 +0100 Subject: [PATCH] Remove unnecessary constants and add type to secret --- examples/persistent-volume-provisioning/README.md | 2 +- .../quobyte/quobyte-admin-secret.yaml | 1 + pkg/volume/quobyte/quobyte.go | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/examples/persistent-volume-provisioning/README.md b/examples/persistent-volume-provisioning/README.md index 3a5c6985c67..439a0673b37 100644 --- a/examples/persistent-volume-provisioning/README.md +++ b/examples/persistent-volume-provisioning/README.md @@ -186,7 +186,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 8e827bb7c26..f0ef7ca6d68 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 {