Follow up file / renames from #1142 (#1152)

* Follow up file / renames from #1142

* fix whitespace

Author: Ville Aikas

contrib/examples/walkthrough/ups-binding.yaml renamed to contrib/examples/walkthrough/ups-instance-credential.yaml

@@ -1,7 +1,7 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
 kind: ServiceInstanceCredential
 metadata:
-  name: ups-binding
+  name: ups-instance-credential
   namespace: test-ns
 spec:
   instanceRef:

contrib/jenkins/test_walkthrough.sh

@@ -175,37 +175,37 @@ wait_for_expected_output -e 'ProvisionedSuccessfully' \
 
 echo 'Binding to instance...'
 
-kubectl --context=service-catalog create -f "${ROOT}/contrib/examples/walkthrough/ups-binding.yaml" \
-  || error_exit 'Error when creating ups-binding.'
+kubectl --context=service-catalog create -f "${ROOT}/contrib/examples/walkthrough/ups-instance-credential.yaml" \
+  || error_exit 'Error when creating ups-instance-credential.'
 
 wait_for_expected_output -e 'InjectedBindResult' \
-  kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-binding -o yaml \
+  kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-instance-credential -o yaml \
   || {
-    kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-binding -o yaml
-    error_exit 'Did not receive expected condition when injecting ups-binding.'
+    kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-instance-credential -o yaml
+    error_exit 'Did not receive expected condition when injecting ups-instance-credential.'
   }
 
-[[ "$(kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-binding -o yaml)" == *"status: \"True\""* ]] \
+[[ "$(kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-instance-credential -o yaml)" == *"status: \"True\""* ]] \
   || {
-    kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-binding -o yaml
-    error_exit 'Failure status reported when attempting to inject ups-binding.'
+    kubectl --context=service-catalog get serviceinstancecredentials -n test-ns ups-instance-credential -o yaml
+    error_exit 'Failure status reported when attempting to inject ups-instance-credential.'
   }
 
-[[ "$(kubectl get secrets -n test-ns)" == *ups-binding* ]] \
-  || error_exit '"ups-binding" not present when listing secrets.'
+[[ "$(kubectl get secrets -n test-ns)" == *ups-instance-credential* ]] \
+  || error_exit '"ups-instance-credential" not present when listing secrets.'
 
 # TODO: TPR deletion currently is buggy; only delete if using an etcd-backed API server
 if [[ "${WITH_TPR}" != true ]]; then
   #Unbind from the instance
 
   echo 'Unbinding from instance...'
 
-  kubectl --context=service-catalog delete -n test-ns serviceinstancecredentials ups-binding \
-    || error_exit 'Error when deleting ups-binding.'
+  kubectl --context=service-catalog delete -n test-ns serviceinstancecredentials ups-instance-credential \
+    || error_exit 'Error when deleting ups-instance-credential.'
 
-  wait_for_expected_output -x -e "ups-binding" \
+  wait_for_expected_output -x -e "ups-instance-credential" \
       kubectl get secrets -n test-ns \
-    || error_exit '"ups-binding" secret not removed upon deleting ups-binding.'
+    || error_exit '"ups-instance-credential" secret not removed upon deleting ups-instance-credential.'
 
   # Deprovision the instance
 

docs/walkthrough.md

@@ -134,11 +134,11 @@ managed service to make that available for use by one or more in-cluster
 applications. When a new `ServiceInstance` resource is created, the service catalog
 controller will connect to the appropriate broker server and instruct it to
 provision the service instance.
-- `ServiceInstanceCredential`: A "binding" to an `ServiceInstance`. These are created by cluster users
-who wish for their applications to make use of a service `ServiceInstance`. Upon
-creation, the service catalog controller will create a Kubernetes `Secret`
-containing connection details and credentials for the service instance. Such
-`Secret`s can be mounted into pods as usual.
+- `ServiceInstanceCredential`: Access credential to a `ServiceInstance`. These
+are created by cluster users who wish for their applications to make use of a
+service `ServiceInstance`. Upon creation, the service catalog controller will
+create a Kubernetes `Secret` containing connection details and credentials for
+the service instance. Such `Secret`s can be mounted into pods as usual.
 
 These concepts and resources are the building blocks of the service catalog.
 
@@ -384,18 +384,18 @@ status:
 ## Step 9 - ServiceInstanceCredential to the ServiceInstance
 
 Now that our `ServiceInstance` has been created, we can bind to it. To accomplish this,
-we will create a [`ServiceInstanceCredential`](../contrib/examples/walkthrough/ups-binding.yaml)
+we will create a [`ServiceInstanceCredential`](../contrib/examples/walkthrough/ups-instance-credential.yaml)
 resource.
 
 ```console
-kubectl --context=service-catalog create -f contrib/examples/walkthrough/ups-binding.yaml
+kubectl --context=service-catalog create -f contrib/examples/walkthrough/ups-instance-credential.yaml
 ```
 
 
 That command should output:
 
 ```console
-binding "ups-binding" created
+binding "ups-instance-credential" created
 ```
 
 After the `ServiceInstanceCredential` resource is created, the service catalog controller will
@@ -405,13 +405,13 @@ service catalog controller will insert into a Kubernetes `Secret`. We can check
 the status of this process like so:
 
 ```console
-kubectl --context=service-catalog get bindings -n test-ns ups-binding -o yaml
+kubectl --context=service-catalog get bindings -n test-ns ups-instance-credential -o yaml
 ```
 
 _NOTE: if using the API aggregator, you will need to use the fully qualified name of the binding resource due to [issue 1008](https://github.com/kubernetes-incubator/service-catalog/issues/1008):_
 
 ```console
-kubectl get bindings.v1alpha1.servicecatalog.k8s.io -n test-ns ups-binding -o yaml
+kubectl get bindings.v1alpha1.servicecatalog.k8s.io -n test-ns ups-instance-credential -o yaml
 ```
 
 We should see something like:
@@ -423,16 +423,16 @@ metadata:
   creationTimestamp: 2017-03-07T01:44:36Z
   finalizers:
   - kubernetes
-  name: ups-binding
+  name: ups-instance-credential
   namespace: test-ns
   resourceVersion: "29"
-  selfLink: /apis/servicecatalog.k8s.io/v1alpha1/namespaces/test-ns/bindings/ups-binding
+  selfLink: /apis/servicecatalog.k8s.io/v1alpha1/namespaces/test-ns/bindings/ups-instance-credential
   uid: 9eb2cdce-02d7-11e7-8edb-0242ac110005
 spec:
   instanceRef:
     name: ups-instance
   externalID: b041db94-a5a0-41a2-87ae-1025ba760918
-  secretName: ups-binding
+  secretName: ups-instance-credential
 status:
   conditions:
   - message: Injected bind result
@@ -447,24 +447,24 @@ see a new one:
 
 ```console
 kubectl get secrets -n test-ns
-NAME                  TYPE                                  DATA      AGE
-default-token-3k61z   kubernetes.io/service-account-token   3         29m
-ups-binding           Opaque                                2         1m
+NAME                              TYPE                                  DATA      AGE
+default-token-3k61z               kubernetes.io/service-account-token   3         29m
+ups-instance-credential           Opaque                                2         1m
 ```
 
-Notice that a new `Secret` named `ups-binding` has been created.
+Notice that a new `Secret` named `ups-instance-credential` has been created.
 
 ## Step 10 - Unbinding from the ServiceInstance
 
 Now, let's unbind from the instance.  To do this, we simply *delete* the
 `ServiceInstanceCredential` resource that we previously created:
 
 ```console
-kubectl --context=service-catalog delete -n test-ns bindings ups-binding
+kubectl --context=service-catalog delete -n test-ns bindings ups-instance-credential
 ```
 
 Checking the `Secret`s in the `test-ns` namespace, we should see that
-`ups-binding` has also been deleted:
+`ups-instance-credential` has also been deleted:
 
 ```console
 kubectl get secrets -n test-ns

test/e2e/walkthrough.go

@@ -64,7 +64,7 @@ var _ = framework.ServiceCatalogDescribe("walkthrough", func() {
 			serviceclassName = "user-provided-service"
 			testns           = "test-ns"
 			instanceName     = "ups-instance"
-			bindingName      = "ups-binding"
+			bindingName      = "ups-instance-credential"
 		)
 
 		//Broker and ServiceClass should become ready