Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
Apply chagnes after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
mszostok committed Sep 27, 2019
1 parent b9462db commit 4854c3b
Show file tree
Hide file tree
Showing 32 changed files with 6 additions and 3,484 deletions.
14 changes: 3 additions & 11 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file removed charts/catalog/templates/crds.yaml
Empty file.
8 changes: 0 additions & 8 deletions contrib/examples/walkthrough/test-broker/test-binding-ns.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions contrib/examples/walkthrough/test-broker/test-instance-ns.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions contrib/hack/ci/deps_ver.sh

This file was deleted.

18 changes: 0 additions & 18 deletions contrib/hack/ci/lib/tiller-rbac.yaml

This file was deleted.

Empty file.
6 changes: 3 additions & 3 deletions pkg/apis/servicecatalog/v1beta1/recalculate.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2017 The Kubernetes Authors.
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,8 +19,8 @@ package v1beta1
import "fmt"

// RecalculatePrinterColumnStatusFields sets column status fields using status conditions
func (in *ServiceBroker) RecalculatePrinterColumnStatusFields() {
in.Status.LastConditionState = serviceBrokerLastConditionState(&in.Status.CommonServiceBrokerStatus)
func (b *ServiceBroker) RecalculatePrinterColumnStatusFields() {
b.Status.LastConditionState = serviceBrokerLastConditionState(&b.Status.CommonServiceBrokerStatus)
}

// RecalculatePrinterColumnStatusFields sets column status fields using status conditions
Expand Down
4 changes: 0 additions & 4 deletions pkg/cleaner/finalizer_cleaner.go
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,10 @@ func checkFinalizerIsRemoved(cr FinalizerGetter, err error) (bool, error) {
}

func removeServiceCatalogFinalizer(finalizersList []string) []string {
const k8sIncubatorFinalizer = "kubernetes-incubator/service-catalog"
finalizers := sets.NewString(finalizersList...)
if finalizers.Has(v1beta1.FinalizerServiceCatalog) {
finalizers.Delete(v1beta1.FinalizerServiceCatalog)
}
if finalizers.Has(k8sIncubatorFinalizer) {
finalizers.Delete(k8sIncubatorFinalizer)
}

return finalizers.List()
}
191 changes: 0 additions & 191 deletions vendor/github.com/pmorie/go-open-service-broker-client/LICENSE

This file was deleted.

Loading

0 comments on commit 4854c3b

Please sign in to comment.