Skip to content

Commit 2ff4203

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16358 from jboyd01/master
Automatic merge from submit-queue promote to Service Catalog V0.0.20 Update vendored version of service-catalog incubator to v0.0.20
2 parents 87f0882 + d536e7b commit 2ff4203

File tree

82 files changed

+5853
-1458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+5853
-1458
lines changed

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/Jenkinsfile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ node {
118118
--create-artifacts
119119
"""
120120

121-
sh """${env.ROOT}/contrib/jenkins/test_walkthrough.sh \
122-
--registry gcr.io/${test_project}/catalog/ \
123-
--version ${version} \
124-
--with-tpr \
125-
--cleanup \
126-
--fix-auth \
127-
--create-artifacts
128-
"""
129-
130121
ansiColor('xterm-darker-gray') {
131122
// Run the e2e test framework
132123
sh """${env.ROOT}/contrib/jenkins/run_e2e.sh \

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/Makefile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ $(BINDIR)/e2e.test: .init
214214
.PHONY: verify verify-client-gen
215215
verify: .init .generate_files verify-client-gen
216216
@echo Running gofmt:
217-
@$(DOCKER_CMD) gofmt -l -s $(TOP_TEST_DIRS) $(TOP_SRC_DIRS) &> .out || true
217+
@$(DOCKER_CMD) gofmt -l -s $(TOP_TEST_DIRS) $(TOP_SRC_DIRS)>.out 2>&1||true
218218
@bash -c '[ "`cat .out`" == "" ] || \
219219
(echo -e "\n*** Please 'gofmt' the following:" ; cat .out ; echo ; false)'
220220
@rm .out
@@ -237,8 +237,9 @@ verify: .init .generate_files verify-client-gen
237237
@bash -c '[ "`cat .out`" == "" ] || (cat .out ; false)'
238238
@rm .out
239239
@#
240-
@echo Running href checker:
241-
@$(DOCKER_CMD) verify-links.sh .
240+
#disabled because of so many flakes during PR verifications
241+
#@echo Running href checker:
242+
#@$(DOCKER_CMD) verify-links.sh .
242243
@echo Running errexit checker:
243244
@$(DOCKER_CMD) build/verify-errexit.sh
244245

@@ -288,11 +289,11 @@ test-e2e: .generate_files $(BINDIR)/e2e.test
288289
clean: clean-bin clean-build-image clean-generated clean-coverage
289290

290291
clean-bin:
291-
rm -rf $(BINDIR)
292+
$(DOCKER_CMD) rm -rf $(BINDIR)
292293
rm -f .generate_exes
293294

294295
clean-build-image:
295-
rm -rf .pkg
296+
$(DOCKER_CMD) rm -rf .pkg
296297
rm -f .scBuildImage
297298
docker rmi -f scbuildimage > /dev/null 2>&1 || true
298299

@@ -397,4 +398,6 @@ endif
397398

398399
release-push: $(addprefix release-push-,$(ALL_ARCH))
399400
release-push-%:
401+
$(MAKE) clean-bin
402+
$(MAKE) ARCH=$* build
400403
$(MAKE) ARCH=$* push

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/charts/catalog/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
Service Catalog is a Kubernetes Incubator project that provides a
44
Kubernetes-native workflow for integrating with
5-
[Open Service Brokers](https://www.openservicebrokerapi.org/)
5+
[Open Service Brokers](https://www.openservicebrokerapi.org/)
66
to provision and bind to application dependencies like databases, object
77
storage, message-oriented middleware, and more.
88

9-
For more information, [visit the project on github]
10-
(https://github.com/kubernetes-incubator/service-catalog).
9+
For more information,
10+
[visit the project on github](https://github.com/kubernetes-incubator/service-catalog).
1111

1212
## Prerequisites
1313

1414
- Kubernetes 1.6+ with Beta APIs enabled
15+
- `charts/catalog` already exists in your local machine
1516

1617
## Installing the Chart
1718

@@ -39,7 +40,7 @@ chart and their default values.
3940

4041
| Parameter | Description | Default |
4142
|-----------|-------------|---------|
42-
| `apiserver.image` | apiserver image to use | `quay.io/kubernetes-service-catalog/apiserver:v0.0.17` |
43+
| `apiserver.image` | apiserver image to use | `quay.io/kubernetes-service-catalog/apiserver:v0.0.19` |
4344
| `apiserver.imagePullPolicy` | `imagePullPolicy` for the apiserver | `Always` |
4445
| `apiserver.tls.cert` | Base64-encoded x509 certificate | A self-signed certificate |
4546
| `apiserver.tls.key` | Base64-encoded private key | The private key for the certificate above |
@@ -53,7 +54,7 @@ chart and their default values.
5354
| `apiserver.storage.tpr.globalNamespace` | If storage type is `tpr`: Some service catalog resources are not namespaced, but third party resources must be; setting this designates a namespace that will be treated as a container for such resources | `servicecatalog` |
5455
| `apiserver.verbosity` | Log level; valid values are in the range 0 - 10 | `10` |
5556
| `apiserver.auth.enabled` | Enable authentication and authorization | `false` |
56-
| `controllerManager.image` | controller-manager image to use | `quay.io/kubernetes-service-catalog/controller-manager:v0.0.17` |
57+
| `controllerManager.image` | controller-manager image to use | `quay.io/kubernetes-service-catalog/controller-manager:v0.0.19` |
5758
| `controllerManager.imagePullPolicy` | `imagePullPolicy` for the controller-manager | `Always` |
5859
| `controllerManager.verbosity` | Log level; valid values are in the range 0 - 10 | `10` |
5960
| `controllerManager.resyncInterval` | How often the controller should resync informers; duration format (`20m`, `1h`, etc) | `5m` |

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/charts/catalog/templates/apiserver-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
- {{ .Values.apiserver.audit.logPath }}
3939
{{- end}}
4040
- --admission-control
41-
- "KubernetesNamespaceLifecycle,DefaultServicePlan"
41+
- "KubernetesNamespaceLifecycle,DefaultServicePlan,ServiceInstanceCredentialsLifecycle,ServicePlanChangeValidator"
4242
- --secure-port
4343
- "8443"
4444
- --storage-type

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/charts/catalog/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
useAggregator: false
44
apiserver:
55
# apiserver image to use
6-
image: quay.io/kubernetes-service-catalog/apiserver:v0.0.17
6+
image: quay.io/kubernetes-service-catalog/apiserver:v0.0.19
77
# imagePullPolicy for the apiserver; valid values are "IfNotPresent",
88
# "Never", and "Always"
99
imagePullPolicy: Always
@@ -72,7 +72,7 @@ apiserver:
7272
serviceAccount: service-catalog-apiserver
7373
controllerManager:
7474
# controller-manager image to use
75-
image: quay.io/kubernetes-service-catalog/controller-manager:v0.0.17
75+
image: quay.io/kubernetes-service-catalog/controller-manager:v0.0.19
7676
# imagePullPolicy for the controller-manager; valid values are
7777
# "IfNotPresent", "Never", and "Always"
7878
imagePullPolicy: Always

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/charts/ups-broker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Service Broker
3434

3535
| Parameter | Description | Default |
3636
|-----------|-------------|---------|
37-
| `image` | Image to use | `quay.io/kubernetes-service-catalog/user-broker:v0.0.17` |
37+
| `image` | Image to use | `quay.io/kubernetes-service-catalog/user-broker:v0.0.19` |
3838
| `imagePullPolicy` | `imagePullPolicy` for the ups-broker | `Always` |
3939

4040
Specify each parameter using the `--set key=value[,key=value]` argument to

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/charts/ups-broker/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Default values for User-Provided Service Broker
22
# Image to use
3-
image: quay.io/kubernetes-service-catalog/user-broker:v0.0.17
3+
image: quay.io/kubernetes-service-catalog/user-broker:v0.0.19
44
# ImagePullPolicy; valid values are "IfNotPresent", "Never", and "Always"
55
imagePullPolicy: Always
66
# Certificate details to use for TLS. Leave blank to not use TLS

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/cmd/apiserver/apiserver.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// The apiserver is the api server and master for the service catalog.
18-
// It is responsible for serving the service catalog management API.
19-
17+
// The apiserver serves the REST APIs for the service catalog API.
2018
package main
2119

2220
import (

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/cmd/apiserver/app/plugins.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ package app
2222
import (
2323
// Admission policies
2424
_ "github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/namespace/lifecycle"
25+
_ "github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceinstancecredentials/lifecycle"
26+
_ "github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceplan/changevalidator"
2527
_ "github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceplan/defaultserviceplan"
2628
)

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/cmd/apiserver/app/server/server.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525
"github.com/kubernetes-incubator/service-catalog/pkg"
2626
"github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
2727
"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/namespace/lifecycle"
28+
siclifecycle "github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceinstancecredentials/lifecycle"
29+
"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceplan/changevalidator"
2830
"github.com/kubernetes-incubator/service-catalog/plugin/pkg/admission/serviceplan/defaultserviceplan"
2931
"github.com/spf13/cobra"
3032
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -137,4 +139,6 @@ func NewCommandServer(
137139
func registerAllAdmissionPlugins(plugins *admission.Plugins) {
138140
lifecycle.Register(plugins)
139141
defaultserviceplan.Register(plugins)
142+
siclifecycle.Register(plugins)
143+
changevalidator.Register(plugins)
140144
}

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/cmd/apiserver/app/server/util.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ import (
2525

2626
"k8s.io/apimachinery/pkg/runtime/schema"
2727
"k8s.io/apiserver/pkg/admission"
28+
"k8s.io/apiserver/pkg/authorization/authorizerfactory"
2829
genericapiserver "k8s.io/apiserver/pkg/server"
2930
kubeinformers "k8s.io/client-go/informers"
3031
kubeclientset "k8s.io/client-go/kubernetes"
3132
restclient "k8s.io/client-go/rest"
3233

3334
scadmission "github.com/kubernetes-incubator/service-catalog/pkg/apiserver/admission"
35+
"github.com/kubernetes-incubator/service-catalog/pkg/apiserver/authenticator"
3436
"github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/internalclientset"
3537
informers "github.com/kubernetes-incubator/service-catalog/pkg/client/informers_generated/internalversion"
3638
"github.com/kubernetes-incubator/service-catalog/pkg/registry/servicecatalog/server"
@@ -76,7 +78,9 @@ func buildGenericConfig(s *ServiceCatalogServerOptions) (*genericapiserver.Confi
7678
}
7779
} else {
7880
// always warn when auth is disabled, since this should only be used for testing
79-
glog.Infof("Authentication and authorization disabled for testing purposes")
81+
glog.Warning("Authentication and authorization disabled for testing purposes")
82+
genericConfig.Authenticator = &authenticator.AnyUserAuthenticator{}
83+
genericConfig.Authorizer = authorizerfactory.NewAlwaysAllowAuthorizer()
8084
}
8185

8286
if err := s.AuditOptions.ApplyTo(genericConfig); err != nil {

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/cmd/controller-manager/app/controller_manager.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ func StartControllers(s *options.ControllerManagerServer,
335335
s.ServiceBrokerRelistInterval,
336336
s.OSBAPIPreferredVersion,
337337
recorder,
338+
s.ReconciliationRetryDuration,
338339
)
339340
if err != nil {
340341
return err

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/cmd/controller-manager/app/options/options.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ const (
4848
defaultOSBAPIContextProfile = true
4949
defaultConcurrentSyncs = 5
5050
defaultLeaderElectionNamespace = "kube-system"
51+
defaultReconciliationRetryDuration = 7 * 24 * time.Hour
5152
)
5253

5354
var defaultOSBAPIPreferredVersion = osb.LatestAPIVersion().HeaderValue()
@@ -71,6 +72,7 @@ func NewControllerManagerServer() *ControllerManagerServer {
7172
LeaderElectionNamespace: defaultLeaderElectionNamespace,
7273
EnableProfiling: true,
7374
EnableContentionProfiling: false,
75+
ReconciliationRetryDuration: defaultReconciliationRetryDuration,
7476
},
7577
}
7678
s.LeaderElection.LeaderElect = true
@@ -96,4 +98,5 @@ func (s *ControllerManagerServer) AddFlags(fs *pflag.FlagSet) {
9698
fs.BoolVar(&s.EnableContentionProfiling, "contention-profiling", s.EnableContentionProfiling, "Enable lock contention profiling, if profiling is enabled")
9799
leaderelection.BindFlags(&s.LeaderElection, fs)
98100
fs.StringVar(&s.LeaderElectionNamespace, "leader-election-namespace", s.LeaderElectionNamespace, "Namespace to use for leader election lock")
101+
fs.DurationVar(&s.ReconciliationRetryDuration, "reconciliation-retry-duration", s.ReconciliationRetryDuration, "The maximum amount of time to retry reconciliations on a resource before failing")
99102
}

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/contrib/examples/apiserver/serviceclass.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ plans:
1010
- name: example-plan-1
1111
externalID: 10e03cb7-b2cf-40dd-a954-16a382b92446
1212
description: "plan 1 description"
13-
osbFree: true
13+
free: true
1414
- name: example-plan-2
1515
externalID: b8269ab4-7d2d-456d-8c8b-5aab63b321d1
1616
description: "plan 2 description"
17-
osbFree: false
17+
free: false

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/contrib/jenkins/run_e2e.sh

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ while [[ $# -gt 0 ]]; do
2424
case "${1}" in
2525
--registry) REGISTRY="${2:-}"; shift ;;
2626
--version) VERSION="${2:-}"; shift ;;
27-
--with-tpr) WITH_TPR=1 ;;
2827
--cleanup) CLEANUP=1 ;;
2928
--create-artifacts) CREATE_ARTIFACTS=1 ;;
3029
--fix-auth) FIX_CONFIGMAP=1 ;;
@@ -43,12 +42,7 @@ function cleanup() {
4342

4443
if [[ -n "${CREATE_ARTIFACTS:-}" ]]; then
4544
echo 'Creating artifacts...'
46-
PREFIX="e2e.test_"
47-
if [[ -n "${WITH_TPR:-}" ]]; then
48-
PREFIX+='tpr-backed'
49-
else
50-
PREFIX+='etcd-backed'
51-
fi
45+
PREFIX="e2e.test"
5246

5347
"${ROOT}/contrib/hack/create_artifacts.sh" \
5448
--prefix "${PREFIX}" --location "${ROOT}" \
@@ -60,15 +54,6 @@ function cleanup() {
6054
{
6155
helm delete --purge "${CATALOG_RELEASE}" || true
6256
rm -f "${SC_KUBECONFIG}"
63-
64-
# TODO: Hack in order to delete TPRs. Will need to be removed when TPRs can be deleted
65-
# by the catalog API server.
66-
if [[ -n "${WITH_TPR:-}" ]]; then
67-
kubectl delete thirdpartyresources service-instance-credential.servicecatalog.k8s.io
68-
kubectl delete thirdpartyresources service-instance.servicecatalog.k8s.io
69-
kubectl delete thirdpartyresources service-broker.servicecatalog.k8s.io
70-
kubectl delete thirdpartyresources service-class.servicecatalog.k8s.io
71-
fi
7257
} &> /dev/null
7358
}
7459

@@ -82,9 +67,6 @@ echo "Running 'e2e.test'..."
8267
ARGUMENTS="--registry ${REGISTRY}"
8368
ARGUMENTS+=" --version ${VERSION}"
8469
ARGUMENTS+=" --fix-auth"
85-
if [[ -n "${WITH_TPR:-}" ]]; then
86-
ARGUMENTS+=" --with-tpr"
87-
fi
8870

8971
${ROOT}/contrib/jenkins/install_catalog.sh ${ARGUMENTS} \
9072
|| error_exit "Error installing catalog in cluster."

‎cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/contrib/jenkins/test_walkthrough.sh

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ while [[ $# -gt 0 ]]; do
2424
case "${1}" in
2525
--registry) REGISTRY="${2:-}"; shift ;;
2626
--version) VERSION="${2:-}"; shift ;;
27-
--with-tpr) WITH_TPR=true ;;
2827
--cleanup) CLEANUP=true ;;
2928
--create-artifacts) CREATE_ARTIFACTS=true ;;
3029
--fix-auth) FIX_CONFIGMAP=true ;;
@@ -35,7 +34,6 @@ done
3534

3635
REGISTRY="${REGISTRY:-}"
3736
VERSION="${VERSION:-"canary"}"
38-
WITH_TPR="${WITH_TPR:-false}"
3937
CLEANUP="${CLEANUP:-false}"
4038
CREATE_ARTIFACTS="${CREATE_ARTIFACTS:-false}"
4139
FIX_CONFIGMAP="${FIX_CONFIGMAP:-false}"
@@ -45,12 +43,7 @@ UPS_BROKER_IMAGE="${REGISTRY}user-broker:${VERSION}"
4543
function cleanup() {
4644
if [[ "${CREATE_ARTIFACTS}" == true ]]; then
4745
echo 'Creating artifacts...'
48-
PREFIX='walkthrough_'
49-
if [[ "${WITH_TPR}" == true ]]; then
50-
PREFIX+='tpr-backed'
51-
else
52-
PREFIX+='etcd-backed'
53-
fi
46+
PREFIX='walkthrough'
5447

5548
"${ROOT}/contrib/hack/create_artifacts.sh" \
5649
--prefix "${PREFIX}" --location "${ROOT}" \
@@ -122,7 +115,6 @@ echo 'Deploying service catalog...'
122115
FLAGS=()
123116
[[ -n "${REGISTRY}" ]] && FLAGS+="--registry ${REGISTRY} "
124117
[[ -n "${VERSION}" ]] && FLAGS+="--version ${VERSION} "
125-
[[ "${WITH_TPR}" == true ]] && FLAGS+="--with-tpr "
126118
[[ "${FIX_CONFIGMAP}" == true ]] && FLAGS+="--fix-auth "
127119

128120
${ROOT}/contrib/jenkins/install_catalog.sh ${FLAGS} \
@@ -194,39 +186,36 @@ wait_for_expected_output -e 'InjectedBindResult' \
194186
[[ "$(kubectl get secrets -n test-ns)" == *ups-instance-credential* ]] \
195187
|| error_exit '"ups-instance-credential" not present when listing secrets.'
196188

197-
# TODO: TPR deletion currently is buggy; only delete if using an etcd-backed API server
198-
if [[ "${WITH_TPR}" != true ]]; then
199-
#Unbind from the instance
189+
#Unbind from the instance
200190

201-
echo 'Unbinding from instance...'
191+
echo 'Unbinding from instance...'
202192

203-
kubectl --context=service-catalog delete -n test-ns serviceinstancecredentials ups-instance-credential \
204-
|| error_exit 'Error when deleting ups-instance-credential.'
193+
kubectl --context=service-catalog delete -n test-ns serviceinstancecredentials ups-instance-credential \
194+
|| error_exit 'Error when deleting ups-instance-credential.'
205195

206-
wait_for_expected_output -x -e "ups-instance-credential" \
207-
kubectl get secrets -n test-ns \
208-
|| error_exit '"ups-instance-credential" secret not removed upon deleting ups-instance-credential.'
196+
wait_for_expected_output -x -e "ups-instance-credential" \
197+
kubectl get secrets -n test-ns \
198+
|| error_exit '"ups-instance-credential" secret not removed upon deleting ups-instance-credential.'
209199

210-
# Deprovision the instance
200+
# Deprovision the instance
211201

212-
echo 'Deprovisioning instance...'
202+
echo 'Deprovisioning instance...'
213203

214-
kubectl --context=service-catalog delete -n test-ns serviceinstances ups-instance \
215-
|| error_exit 'Error when deleting ups-instance.'
204+
kubectl --context=service-catalog delete -n test-ns serviceinstances ups-instance \
205+
|| error_exit 'Error when deleting ups-instance.'
216206

217-
# Delete the broker
207+
# Delete the broker
218208

219-
echo 'Deleting broker...'
209+
echo 'Deleting broker...'
220210

221-
kubectl --context=service-catalog delete servicebrokers ups-broker \
222-
|| error_exit 'Error when deleting ups-broker.'
211+
kubectl --context=service-catalog delete servicebrokers ups-broker \
212+
|| error_exit 'Error when deleting ups-broker.'
223213

224-
wait_for_expected_output -x -e 'user-provided-service' \
225-
kubectl --context=service-catalog get serviceclasses \
226-
|| {
227-
kubectl --context=service-catalog get serviceclasses
228-
error_exit 'Service classes not successfully removed upon deleting ups-broker.'
229-
}
230-
fi
214+
wait_for_expected_output -x -e 'user-provided-service' \
215+
kubectl --context=service-catalog get serviceclasses \
216+
|| {
217+
kubectl --context=service-catalog get serviceclasses
218+
error_exit 'Service classes not successfully removed upon deleting ups-broker.'
219+
}
231220

232221
echo 'Walkthrough completed successfully.'

0 commit comments

Comments
 (0)