Revert "Rename our resources to have ServiceCatalog prefix (#1054)" (#…

…1061)

This reverts commit 4e47ec1.

Jenkinsfile

@@ -140,7 +140,6 @@ node {
       echo 'Run succeeded.'
     } catch (Exception e) {
       echo 'Run failed.'
-	  echo "${e.message}"
       currentBuild.result = 'FAILURE'
     } finally {
       archiveArtifacts artifacts: 'walkthrough*.txt', fingerprint: true
@@ -149,7 +148,6 @@ node {
         sh """${env.ROOT}/contrib/jenkins/cleanup_cluster.sh --kubeconfig ${KUBECONFIG}"""
       } catch (Exception e) {
         echo 'Exception caught during cleanup.'
-	    echo "${e.message}"
         currentBuild.result = 'FAILURE'
       }
     }

Makefile

@@ -65,7 +65,7 @@ else ifeq ($(ARCH),ppc64le)
 else ifeq ($(ARCH),s390x)
 	BASEIMAGE?=s390x/debian:jessie
 else
-    $(error Unsupported platform to compile for)
+$(error Unsupported platform to compile for)
 endif
 
 GO_BUILD       = env GOOS=$(PLATFORM) GOARCH=$(ARCH) go build -i $(GOFLAGS) \
@@ -226,7 +226,6 @@ verify: .init .generate_files verify-client-gen
 	  'for i in $$(find $(TOP_SRC_DIRS) -name *.go \
 	    | grep -v generated \
 	    | grep -v ^pkg/client/ \
-	    | grep -v ^pkg/apis/servicecatalog/ \
 	    | grep -v v1alpha1/defaults.go); \
 	  do \
 	   golint --set_exit_status $$i || exit 1; \
@@ -291,7 +290,6 @@ clean: clean-bin clean-build-image clean-generated clean-coverage
 clean-bin:
 	rm -rf $(BINDIR)
 	rm -f .generate_exes
-	rm -f .init
 
 clean-build-image:
 	rm -rf .pkg
@@ -314,7 +312,7 @@ clean-generated:
 
 # purge-generated removes generated files from the filesystem.
 purge-generated:
-	find $(TOP_SRC_DIRS) -name zz_generated* -exec rm -f {} \;
+	find $(TOP_SRC_DIRS) -name zz_generated* -exec rm {} \;
 	find $(TOP_SRC_DIRS) -type d -name *_generated -exec rm -rf {} \;
 	rm -f pkg/openapi/openapi_generated.go
 	echo 'package v1alpha1' > pkg/apis/servicecatalog/v1alpha1/types.generated.go

cmd/controller-manager/app/controller_manager.go

@@ -84,7 +84,7 @@ the core control loops shipped with the service catalog.`,
 const controllerManagerAgentName = "service-catalog-controller-manager"
 const controllerDiscoveryAgentName = "service-catalog-controller-discovery"
 
-var catalogGVR = schema.GroupVersionResource{Group: "servicecatalog.k8s.io", Version: "v1alpha1", Resource: "servicecatalogbrokers"}
+var catalogGVR = schema.GroupVersionResource{Group: "servicecatalog.k8s.io", Version: "v1alpha1", Resource: "brokers"}
 
 // Run runs the service-catalog controller-manager; should never exit.
 func Run(controllerManagerOptions *options.ControllerManagerServer) error {
@@ -327,10 +327,10 @@ func StartControllers(s *options.ControllerManagerServer,
 		serviceCatalogController, err := controller.NewController(
 			coreClient,
 			serviceCatalogClientBuilder.ClientOrDie(controllerManagerAgentName).ServicecatalogV1alpha1(),
-			serviceCatalogSharedInformers.ServiceCatalogBrokers(),
-			serviceCatalogSharedInformers.ServiceCatalogServiceClasses(),
-			serviceCatalogSharedInformers.ServiceCatalogInstances(),
-			serviceCatalogSharedInformers.ServiceCatalogBindings(),
+			serviceCatalogSharedInformers.Brokers(),
+			serviceCatalogSharedInformers.ServiceClasses(),
+			serviceCatalogSharedInformers.Instances(),
+			serviceCatalogSharedInformers.Bindings(),
 			osb.NewClient,
 			s.BrokerRelistInterval,
 			s.OSBAPIPreferredVersion,

contrib/examples/apiserver/binding.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogBinding
+kind: Binding
 metadata:
   name: test-binding
   namespace: test-ns

contrib/examples/apiserver/broker.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogBroker
+kind: Broker
 metadata:
   name: test-broker
 spec:

contrib/examples/apiserver/instance.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogInstance
+kind: Instance
 metadata:
   name: test-instance
   namespace: test-ns

contrib/examples/apiserver/serviceclass.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogServiceClass
+kind: ServiceClass
 metadata:
   name: test-serviceclass
 brokerName: test-broker

contrib/examples/walkthrough/ups-binding-pp.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogBinding
+kind: Binding
 metadata:
   name: ups-binding
   namespace: test-ns

contrib/examples/walkthrough/ups-binding.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogBinding
+kind: Binding
 metadata:
   name: ups-binding
   namespace: test-ns

contrib/examples/walkthrough/ups-broker.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogBroker
+kind: Broker
 metadata:
   name: ups-broker
 spec:

contrib/examples/walkthrough/ups-instance.yaml

@@ -1,5 +1,5 @@
 apiVersion: servicecatalog.k8s.io/v1alpha1
-kind: ServiceCatalogInstance
+kind: Instance
 metadata:
   name: ups-instance
   namespace: test-ns

contrib/hack/cleanup.sh

@@ -18,7 +18,7 @@ set -o nounset
 set -o errexit
 
 KUBECTL=kubectl
-TYPES='servicecatalogbrokers servicecatalogserviceclasses servicecataloginstances servicecatalogbindings'
+TYPES='servicebrokers serviceclasses serviceinstances servicebindings'
 
 for i in $TYPES; do
   for j in `$KUBECTL get --no-headers $i | cut -d ' ' -f 1`; do

contrib/hack/test-apiserver.sh

@@ -47,10 +47,10 @@ NO_TTY=1 kubectl create -f contrib/examples/apiserver/serviceclass.yaml
 NO_TTY=1 kubectl create -f contrib/examples/apiserver/instance.yaml
 NO_TTY=1 kubectl create -f contrib/examples/apiserver/binding.yaml
 
-NO_TTY=1 kubectl get servicecatalogbroker test-broker -o yaml
-NO_TTY=1 kubectl get servicecatalogserviceclass test-serviceclass -o yaml
-NO_TTY=1 kubectl get servicecataloginstance test-instance --namespace test-ns -o yaml
-NO_TTY=1 kubectl get servicecatalogbinding test-binding --namespace test-ns -o yaml
+NO_TTY=1 kubectl get broker test-broker -o yaml
+NO_TTY=1 kubectl get serviceclass test-serviceclass -o yaml
+NO_TTY=1 kubectl get instance test-instance --namespace test-ns -o yaml
+NO_TTY=1 kubectl get binding test-binding --namespace test-ns -o yaml
 
 NO_TTY=1 kubectl delete -f contrib/examples/apiserver/broker.yaml
 NO_TTY=1 kubectl delete -f contrib/examples/apiserver/serviceclass.yaml

contrib/hack/test_walkthrough.sh

@@ -85,10 +85,10 @@ function cleanup() {
     # TODO: Hack in order to delete TPRs. Will need to be removed when TPRs can be deleted
     # by the catalog API server.
     if [[ -n "${WITH_TPR:-}" ]]; then
-      kubectl delete thirdpartyresources service-catalog-binding.servicecatalog.k8s.io
-      kubectl delete thirdpartyresources service-catalog-instance.servicecatalog.k8s.io
-      kubectl delete thirdpartyresources service-catalog-broker.servicecatalog.k8s.io
-      kubectl delete thirdpartyresources service-catalog-service-class.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources binding.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources instance.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources broker.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources service-class.servicecatalog.k8s.io
     fi
   } &> /dev/null
 }
@@ -215,7 +215,7 @@ kubectl config set-context service-catalog-ctx --cluster=service-catalog-cluster
 kubectl config use-context service-catalog-ctx
 
 retry -n 10 \
-  kubectl get servicecatalogbrokers,servicecatalogserviceclasses,servicecataloginstances,servicecatalogbindings \
+  kubectl get brokers,serviceclasses,instances,bindings \
   || error_exit 'Issue listing resources from service catalog API server.'
 
 # Create the broker
@@ -226,19 +226,19 @@ kubectl create -f "${ROOT}/contrib/examples/walkthrough/ups-broker.yaml" \
   || error_exit 'Error when creating ups-broker.'
 
 wait_for_expected_output -e 'FetchedCatalog' -n 10 \
-    kubectl get servicecatalogbrokers ups-broker -o yaml \
+    kubectl get brokers ups-broker -o yaml \
   || {
-    kubectl get servicecatalogbrokers ups-broker -o yaml
+    kubectl get brokers ups-broker -o yaml
     error_exit 'Did not receive expected condition when creating ups-broker.'
   }
 
-[[ "$(kubectl get servicecatalogbrokers ups-broker -o yaml)" == *"status: \"True\""* ]] \
+[[ "$(kubectl get brokers ups-broker -o yaml)" == *"status: \"True\""* ]] \
   || {
-    kubectl get servicecatalogbrokers ups-broker -o yaml
+    kubectl get brokers ups-broker -o yaml
     error_exit 'Failure status reported when attempting to fetch catalog from ups-broker.'
   }
 
-[[ "$(kubectl get servicecatalogserviceclasses)" == *user-provided-service* ]] \
+[[ "$(kubectl get serviceclasses)" == *user-provided-service* ]] \
   || error_exit 'user-provided-service not listed when fetching service classes.'
 
 # Provision an instance
@@ -249,15 +249,15 @@ kubectl create -f "${ROOT}/contrib/examples/walkthrough/ups-instance.yaml" \
   || error_exit 'Error when creating ups-instance.'
 
 wait_for_expected_output -e 'ProvisionedSuccessfully' -n 10 \
-  kubectl get servicecataloginstances -n test-ns ups-instance -o yaml \
+  kubectl get instances -n test-ns ups-instance -o yaml \
   || {
-    kubectl get servicecataloginstances -n test-ns ups-instance -o yaml
+    kubectl get instances -n test-ns ups-instance -o yaml
     error_exit 'Did not receive expected condition when provisioning ups-instance.'
   }
 
-[[ "$(kubectl get servicecataloginstances -n test-ns ups-instance -o yaml)" == *"status: \"True\""* ]] \
+[[ "$(kubectl get instances -n test-ns ups-instance -o yaml)" == *"status: \"True\""* ]] \
   || {
-    kubectl get servicecataloginstances -n test-ns ups-instance -o yaml
+    kubectl get instances -n test-ns ups-instance -o yaml
     error_exit 'Failure status reported when attempting to provision ups-instance.'
   }
 
@@ -269,15 +269,15 @@ kubectl create -f "${ROOT}/contrib/examples/walkthrough/ups-binding.yaml" \
   || error_exit 'Error when creating ups-binding.'
 
 wait_for_expected_output -e 'InjectedBindResult' -n 10 \
-  kubectl get servicecatalogbindings -n test-ns ups-binding -o yaml \
+  kubectl get bindings -n test-ns ups-binding -o yaml \
   || {
-    kubectl get servicecatalogbindings -n test-ns ups-binding -o yaml
+    kubectl get bindings -n test-ns ups-binding -o yaml
     error_exit 'Did not receive expected condition when injecting ups-binding.'
   }
 
-[[ "$(kubectl get servicecatalogbindings -n test-ns ups-binding -o yaml)" == *"status: \"True\""* ]] \
+[[ "$(kubectl get bindings -n test-ns ups-binding -o yaml)" == *"status: \"True\""* ]] \
   || {
-    kubectl get servicecatalogbindings -n test-ns ups-binding -o yaml
+    kubectl get bindings -n test-ns ups-binding -o yaml
     error_exit 'Failure status reported when attempting to inject ups-binding.'
   }
 
@@ -292,7 +292,7 @@ if [[ -z "${WITH_TPR:-}" ]]; then
 
   echo 'Unbinding from instance...'
 
-  kubectl delete -n test-ns servicecatalogbindings ups-binding \
+  kubectl delete -n test-ns bindings ups-binding \
     || error_exit 'Error when deleting ups-binding.'
 
   export KUBECONFIG="${K8S_KUBECONFIG}"
@@ -305,20 +305,20 @@ if [[ -z "${WITH_TPR:-}" ]]; then
 
   echo 'Deprovisioning instance...'
 
-  kubectl delete -n test-ns servicecataloginstances ups-instance \
+  kubectl delete -n test-ns instances ups-instance \
     || error_exit 'Error when deleting ups-instance.'
 
   # Delete the broker
 
   echo 'Deleting broker...'
 
-  kubectl delete servicecatalogbrokers ups-broker \
+  kubectl delete brokers ups-broker \
     || error_exit 'Error when deleting ups-broker.'
 
   wait_for_expected_output -x -e 'user-provided-service' -n 10 \
-      kubectl get servicecatalogserviceclasses \
+      kubectl get serviceclasses \
     || {
-      kubectl get servicecatalogserviceclasses
+      kubectl get serviceclasses
       error_exit 'Service classes not successfully removed upon deleting ups-broker.'
     }
 fi

contrib/jenkins/run_e2e.sh

@@ -64,10 +64,10 @@ function cleanup() {
     # TODO: Hack in order to delete TPRs. Will need to be removed when TPRs can be deleted
     # by the catalog API server.
     if [[ -n "${WITH_TPR:-}" ]]; then
-      kubectl delete thirdpartyresources service-catalog-binding.servicecatalog.k8s.io
-      kubectl delete thirdpartyresources service-catalog-instance.servicecatalog.k8s.io
-      kubectl delete thirdpartyresources service-catalog-broker.servicecatalog.k8s.io
-      kubectl delete thirdpartyresources service-catalog-service-class.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources binding.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources instance.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources broker.servicecatalog.k8s.io
+      kubectl delete thirdpartyresources service-class.servicecatalog.k8s.io
     fi
   } &> /dev/null
 }

contrib/jenkins/setup-sc-kubectl.sh

@@ -43,7 +43,7 @@ kubectl config set-context service-catalog-ctx --cluster=service-catalog-cluster
 kubectl config use-context service-catalog-ctx
 
 retry -n 10 \
-  kubectl get servicecatalogbrokers,servicecatalogserviceclasses,servicecataloginstances,servicecatalogbindings \
+  kubectl get brokers,serviceclasses,instances,bindings \
   || error_exit 'Issue listing resources from service catalog API server.'
 
 echo 'Set up service catalog kubeconfig.'