Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary constants and add type to secret #41799

Merged
merged 1 commit into from
May 8, 2017
Merged

Remove unnecessary constants and add type to secret #41799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/persistent-volume-provisioning/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`:

Expand Down
1 change: 1 addition & 0 deletions examples/persistent-volume-provisioning/quobyte/quobyte-admin-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apiVersion: v1
kind: Secret
metadata:
name: quobyte-admin-secret
type: "kubernetes.io/quobyte"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this type checked anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, at the moment the Plugin fetches the secret:

https://github.com/kubernetes/kubernetes/blob/master/pkg/volume/quobyte/quobyte.go#L466

https://github.com/kubernetes/kubernetes/blob/master/pkg/volume/util/util.go#L142

So if the type is empty the provisioning will fail.

data:
password: cXVvYnl0ZQ==
user: YWRtaW4=
Expand Down
4 changes: 0 additions & 4 deletions pkg/volume/quobyte/quobyte.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down