Skip to content

Commit 46dccda

Browse files
author
Jay Boyd
committed
Squashed 'cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog/' changes from 7011d9e816..3aacfedec6
3aacfedec6 carry: Set external plan name for service-catalog walkthrough 3ec9e5b07a origin build: add origin tooling 8bb631f v0.1.0-rc1 chart updates (#1359) 400e37f Move API to v1beta1 (#1356) 8f55a99 0.0.24 chart updates (#1357) 7ebb8ae Rename Service[Broker|Class|Plan]Status => ClusterService... (#1349) 82a6103 Detect removed catalog entries (#1353) 85125fd Refactor instance spec (#1350) 99c0644 Update to Kubernetes 1.8 (#1334) a537490 Reformatting printed messages for controller_instance (#1341) 0763ac0 Use field selector for broker delete (#1348) 93fb0e5 remaining renames from ServiceInstanceCredential to ServiceBinding (#1347) cfdb2ed add text about how updating secrets/params require a 'poke' (#1337) 1d04776 Change PresentInCatalog -> MissingFromBrokerCatalog (#1342) c95309c Update Service[Broker|Class|Plan] to ClusterService[Broker|Class|Plan] (#1345) 9365039 Fix controller binding queue name, update documents (#1344) 6375eb3 Do not set Ready/False condition in API Server when updating an instance. (#1335) 108f05d Merge branch 'pr/1340' bd0cb7b gofmt e0ce4b5 Jenkins modifications 9341cbf unit and integration tests pass 076bfb2 Disambiguate k8s and external names in log messages for broker (#1336) c59e1e5 types.go changes for review 4ceaaab Rename resources from Service[Class|Plan] to ClusterService[Class|Plan] (#1327) 556c7d8 Add status.presentInCatalog field to service/plan (#1328) a6ad96a #1148: Support updates to Instances (#1289) e36d286 fix RBAC resource names for ClusterServiceBroker (#1330) 78d09ae add timeout (#1326) 92ac8b5 Address comments raised after 1305 was merged (#1321) aca7543 Rename ServiceBroker to ClusterServiceBroker (#1319) a2b6ac0 Implementation for binding orphan mitigation (#1241) bffe4de Chart updates for 0.0.23 release (#1325) REVERT: 7011d9e816 origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: 3aacfedec6f8d3d07a5b922e0fcd4a9b28a0e5d2
1 parent 41fb245 commit 46dccda

File tree

14,209 files changed

+1426853
-1462095
lines changed

Some content is hidden

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

14,209 files changed

+1426853
-1462095
lines changed

‎Jenkinsfile

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ def test_account = params.TEST_ACCOUNT
6565
def test_zone = params.TEST_ZONE ?: 'us-west1-b'
6666
def namespace = 'catalog'
6767
def root_path = 'src/github.com/kubernetes-incubator/service-catalog'
68+
def timeoutMin = 30
6869

6970
node {
7071
echo "Service Catalog end-to-end test"
@@ -90,45 +91,47 @@ node {
9091
def version = sh([returnStdout: true, script: 'git describe --always --abbrev=7 --dirty']).trim()
9192

9293
try {
93-
// These are done in parallel since creating the cluster takes a while,
94-
// and the build doesn't depend on it.
95-
parallel(
96-
'Cluster': {
97-
withCredentials([file(credentialsId: "${test_account}", variable: 'TEST_SERVICE_ACCOUNT')]) {
98-
sh """${env.ROOT}/contrib/jenkins/init_cluster.sh ${clustername} \
94+
timeout(timeoutMin) {
95+
// These are done in parallel since creating the cluster takes a while,
96+
// and the build doesn't depend on it.
97+
parallel(
98+
'Cluster': {
99+
withCredentials([file(credentialsId: "${test_account}", variable: 'TEST_SERVICE_ACCOUNT')]) {
100+
sh """${env.ROOT}/contrib/jenkins/init_cluster.sh ${clustername} \
101+
--project ${test_project} \
102+
--zone ${test_zone} \
103+
--credentials ${env.TEST_SERVICE_ACCOUNT}"""
104+
}
105+
},
106+
'Build & Unit/Integration Tests': {
107+
sh """${env.ROOT}/contrib/jenkins/build.sh \
99108
--project ${test_project} \
100-
--zone ${test_zone} \
101-
--credentials ${env.TEST_SERVICE_ACCOUNT}"""
109+
--version ${version}"""
102110
}
103-
},
104-
'Build & Unit/Integration Tests': {
105-
sh """${env.ROOT}/contrib/jenkins/build.sh \
106-
--project ${test_project} \
107-
--version ${version}"""
108-
}
109-
)
110-
111-
// Run through the walkthrough on the cluster, once with an etcd-backed API server and once
112-
// with a TPR-backed one.
113-
sh """${env.ROOT}/contrib/jenkins/test_walkthrough.sh \
114-
--registry gcr.io/${test_project}/catalog/ \
115-
--version ${version} \
116-
--cleanup \
117-
--fix-auth \
118-
--create-artifacts
119-
"""
120-
121-
ansiColor('xterm-darker-gray') {
122-
// Run the e2e test framework
123-
sh """${env.ROOT}/contrib/jenkins/run_e2e.sh \
111+
)
112+
113+
// Run through the walkthrough on the cluster, once with an etcd-backed API server and once
114+
// with a TPR-backed one.
115+
sh """${env.ROOT}/contrib/jenkins/test_walkthrough.sh \
124116
--registry gcr.io/${test_project}/catalog/ \
125117
--version ${version} \
126118
--cleanup \
119+
--fix-auth \
127120
--create-artifacts
128121
"""
129-
}
130122

131-
echo 'Run succeeded.'
123+
ansiColor('xterm-darker-gray') {
124+
// Run the e2e test framework
125+
sh """${env.ROOT}/contrib/jenkins/run_e2e.sh \
126+
--registry gcr.io/${test_project}/catalog/ \
127+
--version ${version} \
128+
--cleanup \
129+
--create-artifacts
130+
"""
131+
}
132+
133+
echo 'Run succeeded.'
134+
}
132135
} catch (Exception e) {
133136
echo 'Run failed.'
134137
currentBuild.result = 'FAILURE'

‎Makefile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -143,24 +143,24 @@ $(BINDIR)/controller-manager: .init .generate_files cmd/controller-manager $(NEW
143143
touch $@
144144

145145
$(BINDIR)/defaulter-gen: .init
146-
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/kubernetes/cmd/libs/go2idl/defaulter-gen
146+
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/code-generator/cmd/defaulter-gen
147147

148148
$(BINDIR)/deepcopy-gen: .init
149-
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/kubernetes/cmd/libs/go2idl/deepcopy-gen
149+
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/code-generator/cmd/deepcopy-gen
150150

151151
$(BINDIR)/conversion-gen: .init
152-
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/kubernetes/cmd/libs/go2idl/conversion-gen
152+
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/code-generator/cmd/conversion-gen
153153

154154
$(BINDIR)/client-gen: .init
155-
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/kubernetes/cmd/libs/go2idl/client-gen
155+
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/code-generator/cmd/client-gen
156156

157157
$(BINDIR)/lister-gen: .init
158-
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/kubernetes/cmd/libs/go2idl/lister-gen
158+
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/code-generator/cmd/lister-gen
159159

160160
$(BINDIR)/informer-gen: .init
161-
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/kubernetes/cmd/libs/go2idl/informer-gen
161+
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/vendor/k8s.io/code-generator/cmd/informer-gen
162162

163-
$(BINDIR)/openapi-gen: vendor/k8s.io/kubernetes/cmd/libs/go2idl/openapi-gen
163+
$(BINDIR)/openapi-gen: vendor/k8s.io/code-generator/cmd/openapi-gen
164164
$(DOCKER_CMD) go build -o $@ $(SC_PKG)/$^
165165

166166
$(BINDIR)/e2e.test: .init $(NEWEST_E2ETEST_SOURCE) $(NEWEST_GO_FILE)
@@ -173,35 +173,33 @@ $(BINDIR)/e2e.test: .init $(NEWEST_E2ETEST_SOURCE) $(NEWEST_GO_FILE)
173173
--v 1 --logtostderr \
174174
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
175175
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog" \
176-
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1alpha1" \
176+
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1beta1" \
177177
--extra-peer-dirs "$(SC_PKG)/pkg/apis/servicecatalog" \
178-
--extra-peer-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1alpha1" \
178+
--extra-peer-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1beta1" \
179179
--output-file-base "zz_generated.defaults"
180180
# Generate deep copies
181181
$(DOCKER_CMD) $(BINDIR)/deepcopy-gen \
182182
--v 1 --logtostderr \
183183
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
184184
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog" \
185-
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1alpha1" \
185+
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1beta1" \
186186
--bounding-dirs "github.com/kubernetes-incubator/service-catalog" \
187187
--output-file-base zz_generated.deepcopy
188188
# Generate conversions
189189
$(DOCKER_CMD) $(BINDIR)/conversion-gen \
190190
--v 1 --logtostderr \
191191
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
192192
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog" \
193-
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1alpha1" \
193+
--input-dirs "$(SC_PKG)/pkg/apis/servicecatalog/v1beta1" \
194194
--output-file-base zz_generated.conversion
195195
# generate all pkg/client contents
196196
$(DOCKER_CMD) $(BUILD_DIR)/update-client-gen.sh
197197
# generate openapi
198198
$(DOCKER_CMD) $(BINDIR)/openapi-gen \
199199
--v 1 --logtostderr \
200200
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
201-
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1alpha1,k8s.io/client-go/pkg/api/v1,k8s.io/apimachinery/pkg/apis/meta/v1" \
201+
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1,k8s.io/api/core/v1,k8s.io/apimachinery/pkg/apis/meta/v1" \
202202
--output-package "github.com/kubernetes-incubator/service-catalog/pkg/openapi"
203-
# generate codec
204-
$(DOCKER_CMD) $(BUILD_DIR)/update-codecgen.sh
205203
touch $@
206204

207205
# Some prereq stuff
@@ -232,7 +230,7 @@ verify: .init .generate_files verify-client-gen
232230
'for i in $$(find $(TOP_SRC_DIRS) -name *.go \
233231
| grep -v generated \
234232
| grep -v ^pkg/client/ \
235-
| grep -v v1alpha1/defaults.go); \
233+
| grep -v v1beta1/defaults.go); \
236234
do \
237235
golint --set_exit_status $$i || exit 1; \
238236
done'
@@ -321,7 +319,7 @@ purge-generated:
321319
find $(TOP_SRC_DIRS) -name zz_generated* -exec rm {} \;
322320
find $(TOP_SRC_DIRS) -type d -name *_generated -exec rm -rf {} \;
323321
rm -f pkg/openapi/openapi_generated.go
324-
echo 'package v1alpha1' > pkg/apis/servicecatalog/v1alpha1/types.generated.go
322+
echo 'package v1beta1' > pkg/apis/servicecatalog/v1beta1/types.generated.go
325323

326324
clean-coverage:
327325
rm -f $(COVERAGE)

‎build/update-client-gen.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ ${BINDIR}/client-gen "$@" \
3434
# Generate the versioned clientset (pkg/client/clientset_generated/clientset)
3535
${BINDIR}/client-gen "$@" \
3636
--input-base "github.com/kubernetes-incubator/service-catalog/pkg/apis/" \
37-
--input "servicecatalog/v1alpha1" \
37+
--input "servicecatalog/v1beta1" \
3838
--clientset-path "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/" \
3939
--clientset-name "clientset" \
4040
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt"
4141
# generate lister
4242
${BINDIR}/lister-gen "$@" \
4343
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog" \
44-
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1alpha1" \
44+
--input-dirs="github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1" \
4545
--output-package "github.com/kubernetes-incubator/service-catalog/pkg/client/listers_generated" \
4646
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt"
4747
# generate informer
4848
${BINDIR}/informer-gen "$@" \
4949
--go-header-file "vendor/github.com/kubernetes/repo-infra/verify/boilerplate/boilerplate.go.txt" \
5050
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog" \
51-
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1alpha1" \
51+
--input-dirs "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1beta1" \
5252
--internal-clientset-package "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/internalclientset" \
5353
--versioned-clientset-package "github.com/kubernetes-incubator/service-catalog/pkg/client/clientset_generated/clientset" \
5454
--listers-package "github.com/kubernetes-incubator/service-catalog/pkg/client/listers_generated" \

‎build/update-codecgen.sh

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎charts/catalog/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ chart and their default values.
4040

4141
| Parameter | Description | Default |
4242
|-----------|-------------|---------|
43-
| `apiserver.image` | apiserver image to use | `quay.io/kubernetes-service-catalog/apiserver:v0.0.22` |
43+
| `apiserver.image` | apiserver image to use | `quay.io/kubernetes-service-catalog/apiserver:v0.1.0-rc1` |
4444
| `apiserver.imagePullPolicy` | `imagePullPolicy` for the apiserver | `Always` |
4545
| `apiserver.tls.cert` | Base64-encoded x509 certificate | A self-signed certificate |
4646
| `apiserver.tls.key` | Base64-encoded private key | The private key for the certificate above |
@@ -53,7 +53,7 @@ chart and their default values.
5353
| `apiserver.storage.etcd.servers` | If storage type is `etcd`: etcd URL(s); override this if NOT using embedded etcd | `http://localhost:2379` |
5454
| `apiserver.verbosity` | Log level; valid values are in the range 0 - 10 | `10` |
5555
| `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.22` |
56+
| `controllerManager.image` | controller-manager image to use | `quay.io/kubernetes-service-catalog/controller-manager:v0.1.0-rc1` |
5757
| `controllerManager.imagePullPolicy` | `imagePullPolicy` for the controller-manager | `Always` |
5858
| `controllerManager.verbosity` | Log level; valid values are in the range 0 - 10 | `10` |
5959
| `controllerManager.resyncInterval` | How often the controller should resync informers; duration format (`20m`, `1h`, etc) | `5m` |

‎charts/catalog/templates/apiregistration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ apiVersion: apiregistration.k8s.io/v1alpha1
66
{{- end }}
77
kind: APIService
88
metadata:
9-
name: v1alpha1.servicecatalog.k8s.io
9+
name: v1beta1.servicecatalog.k8s.io
1010
spec:
1111
group: servicecatalog.k8s.io
12-
version: v1alpha1
12+
version: v1beta1
1313
service:
1414
namespace: {{ .Release.Namespace }}
1515
name: {{ template "fullname" . }}-apiserver

0 commit comments

Comments
 (0)