Merge pull request #34705 from humblec/gluster-pvc-namespace-1

examples/experimental/persistent-volume-provisioning/README.md

@@ -107,14 +107,12 @@ metadata:
   name: slow
 provisioner: kubernetes.io/glusterfs
 parameters:
-  endpoint: "glusterfs-cluster"
   resturl: "http://127.0.0.1:8081"
   restuser: "admin"
   secretNamespace: "default"
   secretName: "heketi-secret"
 ```
 
-* `endpoint`: `glusterfs-cluster` is the endpoint name which includes GlusterFS trusted pool IP addresses. This parameter is mandatory. We need to also create a service for this endpoint, so that the endpoint will be persisted. This service can be without a selector to tell Kubernetes we want to add its endpoints manually.  Please note that, glusterfs plugin looks for the endpoint in the pod namespace, so it is mandatory that the endpoint and service have to be created in Pod's namespace for successful mount of gluster volumes in the pod.
 * `resturl` : Gluster REST service/Heketi service url which provision gluster volumes on demand. The general format should be `IPaddress:Port` and this is a mandatory parameter for GlusterFS dynamic provisioner. If Heketi service is exposed as a routable service in openshift/kubernetes setup, this can have a format similar to
 `http://heketi-storage-project.cloudapps.mystorage.com` where the fqdn is a resolvable heketi service url.
 * `restauthenabled` : Gluster REST service authentication boolean that enables authentication to the REST server. If this value is 'true', `restuser` and `restuserkey` or `secretNamespace` + `secretName` have to be filled. This option is deprecated, authentication is enabled when any of `restuser`, `restuserkey`, `secretName` or `secretNamespace` is specified.
@@ -128,31 +126,8 @@ Example of a secret can be found in [glusterfs-provisioning-secret.yaml](gluster
 
 Reference : ([How to configure Heketi](https://github.com/heketi/heketi/wiki/Setting-up-the-topology))
 
-Create endpoints
+When the persistent volumes are dynamically provisioned, the Gluster plugin automatically create an endpoint and a headless service in the name `gluster-dynamic-<claimname>`. This dynamic endpoint and service will be deleted automatically when the persistent volume claim is deleted.
 
-As in example [glusterfs-endpoints.json](../../volumes/glusterfs/glusterfs-endpoints.json) file, the "IP" field should be filled with the address of a node in the Glusterfs server cluster. It is fine to give any valid value (from 1 to 65535) to the "port" field.
-
-Create the endpoints,
-
-```sh
-$ kubectl create -f examples/volumes/glusterfs/glusterfs-endpoints.json
-```
-
-You can verify that the endpoints are successfully created by running
-
-```sh
-$ kubectl get endpoints
-NAME                ENDPOINTS
-glusterfs-cluster   10.240.106.152:1,10.240.79.157:1
-```
-
-We need also create a service for this endpoints, so that the endpoints will be persisted. It is possible to create `service` without a selector to tell Kubernetes we want to add its endpoints manually. For an example service file refer [glusterfs-service.json](../../volumes/glusterfs/glusterfs-service.json).
-
-Use this command to create the service:
-
-```sh
-$ kubectl create -f examples/volumes/glusterfs/glusterfs-service.json
-```
 
 #### OpenStack Cinder
 

examples/experimental/persistent-volume-provisioning/glusterfs-dp.yaml

@@ -4,7 +4,6 @@ metadata:
   name: slow
 provisioner: kubernetes.io/glusterfs
 parameters:
-  endpoint: "glusterfs-cluster"
   resturl: "http://127.0.0.1:8081"
   restuser: "admin"
   secretNamespace: "default"

pkg/volume/glusterfs/glusterfs_test.go

@@ -257,7 +257,6 @@ func TestParseClassParameters(t *testing.T) {
 		{
 			"password",
 			map[string]string{
-				"endpoint":    "endpointname",
 				"resturl":     "https://localhost:8080",
 				"restuser":    "admin",
 				"restuserkey": "password",
@@ -265,7 +264,6 @@ func TestParseClassParameters(t *testing.T) {
 			nil,   // secret
 			false, // expect error
 			&provisioningConfig{
-				endpoint:    "endpointname",
 				url:         "https://localhost:8080",
 				user:        "admin",
 				userKey:     "password",
@@ -275,7 +273,6 @@ func TestParseClassParameters(t *testing.T) {
 		{
 			"secret",
 			map[string]string{
-				"endpoint":        "endpointname",
 				"resturl":         "https://localhost:8080",
 				"restuser":        "admin",
 				"secretname":      "mysecret",
@@ -284,7 +281,6 @@ func TestParseClassParameters(t *testing.T) {
 			&secret,
 			false, // expect error
 			&provisioningConfig{
-				endpoint:        "endpointname",
 				url:             "https://localhost:8080",
 				user:            "admin",
 				secretName:      "mysecret",
@@ -295,21 +291,18 @@ func TestParseClassParameters(t *testing.T) {
 		{
 			"no authentication",
 			map[string]string{
-				"endpoint":        "endpointname",
 				"resturl":         "https://localhost:8080",
 				"restauthenabled": "false",
 			},
 			&secret,
 			false, // expect error
 			&provisioningConfig{
-				endpoint: "endpointname",
-				url:      "https://localhost:8080",
+				url: "https://localhost:8080",
 			},
 		},
 		{
 			"missing secret",
 			map[string]string{
-				"endpoint":        "endpointname",
 				"resturl":         "https://localhost:8080",
 				"secretname":      "mysecret",
 				"secretnamespace": "default",
@@ -321,7 +314,6 @@ func TestParseClassParameters(t *testing.T) {
 		{
 			"secret with no namespace",
 			map[string]string{
-				"endpoint":   "endpointname",
 				"resturl":    "https://localhost:8080",
 				"secretname": "mysecret",
 			},
@@ -332,18 +324,6 @@ func TestParseClassParameters(t *testing.T) {
 		{
 			"missing url",
 			map[string]string{
-				"endpoint":    "endpointname",
-				"restuser":    "admin",
-				"restuserkey": "password",
-			},
-			nil,  // secret
-			true, // expect error
-			nil,
-		},
-		{
-			"missing endpoint",
-			map[string]string{
-				"resturl":     "https://localhost:8080",
 				"restuser":    "admin",
 				"restuserkey": "password",
 			},