Sync v0.1.0 rc2 #16908

jboyd01 · 2017-10-17T15:31:46Z

sync'ing Service Catalog v 0.1.0 rc2 to Origin

…service-catalog/' changes from 3aacfedec6..aa27078754 aa27078754 origin build: add origin tooling bcf37fd 0.1.0-rc2 chart updates (openshift#1410) 4ab0a0a add back 'Processing' message for instance deletion (openshift#1332) 0ecbcb1 Update logs for Cluster service plans. (openshift#1389) 8b491ef Fix a quoting nit (openshift#1400) 63685e4 add orphan mitigation-specific conditions for instances (openshift#1378) adee662 Updated missed fields in service and plan specs (openshift#1406) 2095919 Handle default plan setting when using k8s names (openshift#1405) 607ba66 Document rbacEnable. (openshift#1404) 268294e Adding rbac definition for v1 api endpoint. (openshift#1284) 103288d differentiate between failed updates and provisions during deletion (openshift#1383) eba8ba4 enable API aggregation and Service Catalog RBAC on Jenkins (openshift#1333) 5a93315 Validate relistDuration is non-negative (openshift#1395) e279d21 Fix log messages for secrets (openshift#1385) 87fa8c9 fix status update when starting orphan mitigation (openshift#1372) 11f18f3 Switch to wget for integration apiserver checks (openshift#1384) 8c44a7d update OSB client to 2.13 (openshift#1392) e64bbd1 default plan admission controller: filter list of service plans/service classes by the class name (openshift#1351) 6648c0e Check field names. Fix issue 1291 (openshift#1379) 5319841 update comment for instance generation check (openshift#1382) 7d5823f remove internal poll method (openshift#1381) 07d3068 Rework the logging for controller_instance. (openshift#1371) 5f4ca01 address PR comment as a followup (openshift#1380) 485d5e6 Add support for specifying plan using K8S names. (openshift#1377) 662bba8 Log number of secret keys created for binding credential (openshift#1375) 8ad6a31 Move controller constants into correct files (openshift#1373) 7bd66dd Adding type to log. (openshift#1339) 1ce5c4d Remove k8s/k8s dependency (openshift#1355) b458323 Adding log formatting for BindingController. (openshift#1352) 275eb11 rename test variables to be consistent (openshift#1315) ffd6b8b travis: skip cleanup before deploy (openshift#1368) d5ecc04 fix travis tag checker (openshift#1365) 2cae0ee Minor updates to README (openshift#1360) REVERT: 3aacfedec6 carry: Set external plan name for service-catalog walkthrough REVERT: 3ec9e5b07a origin build: add origin tooling git-subtree-dir: cmd/service-catalog/go/src/github.com/kubernetes-incubator/service-catalog git-subtree-split: aa2707875461dd51be3731b1d94b5cfc3b9a3976

…penshift/service-catalog:v0.1.0-rc2+origin

jboyd01 · 2017-10-17T15:32:05Z

/test service-catalog

jboyd01 · 2017-10-17T15:56:34Z

@pmorie ready to go, Jenkins catalog e2e passed.

jboyd01 · 2017-10-17T16:12:56Z

/test unit

jboyd01 · 2017-10-17T17:31:04Z

/retest

jboyd01 · 2017-10-17T18:54:11Z

Flaking... extended_confomance_gce failing with
[INFO] [CLEANUP] Dumping container logs to _output/scripts/conformance/logs/containers
[INFO] [CLEANUP] Truncating log files over 200M
[INFO] [CLEANUP] Stopping docker containers
[INFO] [CLEANUP] Removing docker containers
[INFO] [CLEANUP] Killing child processes
[INFO] [CLEANUP] Pruning etcd data directory
rm: cannot remove â€˜/tmp/etcdâ€™: Operation not permitted
[ERROR] test/extended/conformance.sh exited with code 1 after 00h 17m 54s
make: *** [test-extended] Error 1

/retest

jboyd01 · 2017-10-17T20:17:07Z

same failure in extended_conformance_gce, error pruning ~/tmp/etcd

jboyd01 · 2017-10-17T20:32:18Z

/retest

jboyd01 · 2017-10-17T20:41:48Z

discussed with Cesar, created #16917 for the test flake

pmorie · 2017-10-17T23:36:22Z

/lgtm
/approve

stevekuznetsov · 2017-10-18T14:24:29Z

hack/lib/build/version.sh

@@ -26,6 +26,19 @@ readonly -f os::build::version::get_vars
 function os::build::version::openshift_vars() {
 	local git=(git --work-tree "${OS_ROOT}")

+	if [[ -z ${OS_GIT_CATALOG_VERSION-} ]]; then


if [[ -z "${OS_GIT_CATALOG_VERSION:-}" ]]; then ^ ^ ^

stevekuznetsov · 2017-10-18T14:25:01Z

hack/lib/build/version.sh

+	if [[ -z ${OS_GIT_CATALOG_VERSION-} ]]; then
+		# search git merge commits for template text and extract version
+		# subject template: Merge version v0.0.14 of Service Catalog from https://github.com/openshift/service-catalog:v0.0.14+origin
+		local summary_text=$(${git[@]} log --merges --grep "Merge version v.* of Service Catalog from https://github.com/openshift/service-catalog" --pretty=%s -1)


Don't mix scoping statements with subshells.

local summary_text summary_text="$( ... )"

stevekuznetsov · 2017-10-18T14:25:31Z

hack/lib/build/version.sh

+		# search git merge commits for template text and extract version
+		# subject template: Merge version v0.0.14 of Service Catalog from https://github.com/openshift/service-catalog:v0.0.14+origin
+		local summary_text=$(${git[@]} log --merges --grep "Merge version v.* of Service Catalog from https://github.com/openshift/service-catalog" --pretty=%s -1)
+		if [[ $summary_text =~ Merge[[:space:]]version[[:space:]](v.*)[[:space:]]of[[:space:]]Service[[:space:]]Catalog ]]; then


if [[ "${summary_text}" ^ ^ ^^

Since you have the grep above in the git call you can probably make this less busy if you want

if [[ "${summary_text}" =~ .*[[:space:]](v.*)[[:space:]].* ]]; then

stevekuznetsov · 2017-10-18T14:27:22Z

hack/lib/build/version.sh

+		# subject template: Merge version v0.0.14 of Service Catalog from https://github.com/openshift/service-catalog:v0.0.14+origin
+		local summary_text=$(${git[@]} log --merges --grep "Merge version v.* of Service Catalog from https://github.com/openshift/service-catalog" --pretty=%s -1)
+		if [[ $summary_text =~ Merge[[:space:]]version[[:space:]](v.*)[[:space:]]of[[:space:]]Service[[:space:]]Catalog ]]; then
+			OS_GIT_CATALOG_VERSION=${BASH_REMATCH[1]}


OS_GIT_CATALOG_VERSION="${BASH_REMATCH[1]}" ^ ^

stevekuznetsov · 2017-10-18T14:27:30Z

hack/lib/build/version.sh

+		local summary_text=$(${git[@]} log --merges --grep "Merge version v.* of Service Catalog from https://github.com/openshift/service-catalog" --pretty=%s -1)
+		if [[ $summary_text =~ Merge[[:space:]]version[[:space:]](v.*)[[:space:]]of[[:space:]]Service[[:space:]]Catalog ]]; then
+			OS_GIT_CATALOG_VERSION=${BASH_REMATCH[1]}
+		fi


Handle the else with os::log::fatal

Currently the version is derived from the upstream service catalog tag. also adds build date in ldflags

pmorie · 2017-10-18T15:33:58Z

/lgtm
/approve

pmorie · 2017-10-18T15:34:12Z

/test service-catalog

pmorie · 2017-10-18T15:34:22Z

/lgtm cancel

jboyd01 · 2017-10-18T16:11:29Z

/test service-catalog

pmorie · 2017-10-18T16:58:01Z

/retest

pmorie · 2017-10-18T16:58:14Z

Catalog failure looks like a flake

pmorie · 2017-10-18T18:01:19Z

/lgtm
/approve

jpeeler · 2017-10-19T14:39:14Z

/retest

stevekuznetsov · 2017-10-19T15:08:09Z

build changes

/lgtm
/approve

openshift-merge-robot · 2017-10-19T15:08:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jboyd01, pmorie, stevekuznetsov

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

~~OWNERS~~ [stevekuznetsov]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

jboyd01 · 2017-10-19T15:17:29Z

/retest

pmorie · 2017-10-19T15:23:25Z

it's not necessary to keep retesting - conformance doesn't block the merge queue temporarily @jboyd01

Adding kind/bug because this closes several bugs.

jboyd01 · 2017-10-19T18:54:06Z

/retest

pmorie · 2017-10-19T20:41:42Z

/test extended_conformance_install_update

openshift-merge-robot · 2017-10-19T23:30:21Z

/test all [submit-queue is verifying that this PR is safe to merge]

openshift-merge-robot · 2017-10-20T00:50:02Z

Automatic merge from submit-queue (batch tested with PRs 16896, 16908, 16935, 16898, 16090).

openshift-merge-robot · 2017-10-20T00:51:07Z

Automatic merge from submit-queue (batch tested with PRs 16896, 16908, 16935, 16898, 16090).

openshift-ci-robot · 2017-10-20T01:07:28Z

@jboyd01: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/extended_conformance_gce	`6520da4`	link	`/test extended_conformance_gce`
ci/openshift-jenkins/extended_conformance_install_update	`6520da4`	link	`/test extended_conformance_install_update`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Jay Boyd added 2 commits October 17, 2017 11:13

Merge version v0.1.0-rc2 of Service Catalog from https://github.com/o…

cfe9131

…penshift/service-catalog:v0.1.0-rc2+origin

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 17, 2017

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 17, 2017

openshift-merge-robot assigned pmorie and smarterclayton Oct 17, 2017

openshift-merge-robot added needs-api-review vendor-update Touching vendor dir or related files labels Oct 17, 2017

jboyd01 changed the title ~~WIP Sync v0.1.0 rc2~~ Sync v0.1.0 rc2 Oct 17, 2017

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 17, 2017

jboyd01 mentioned this pull request Oct 17, 2017

extended_conformance_gce fails in cleanup deleting tmp/etcd #16917

Closed

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2017

stevekuznetsov reviewed Oct 18, 2017

View reviewed changes

catalog: add versioning for release build

6520da4

Currently the version is derived from the upstream service catalog tag. also adds build date in ldflags

jboyd01 force-pushed the sync-v0.1.0-rc2 branch from 96322a7 to 6520da4 Compare October 18, 2017 15:16

openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2017

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2017

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2017

openshift-merge-robot added the needs-upstream label Oct 18, 2017

0xmichalis removed the needs-upstream label Oct 18, 2017

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2017

openshift-ci-robot assigned stevekuznetsov Oct 19, 2017

openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 19, 2017

pmorie added kind/bug Categorizes issue or PR as related to a bug. and removed kind/bug Categorizes issue or PR as related to a bug. labels Oct 19, 2017

openshift-merge-robot merged commit 5345dad into openshift:master Oct 20, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync v0.1.0 rc2 #16908

Sync v0.1.0 rc2 #16908

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

pmorie commented Oct 17, 2017

stevekuznetsov Oct 18, 2017

stevekuznetsov Oct 18, 2017

stevekuznetsov Oct 18, 2017

stevekuznetsov Oct 18, 2017

stevekuznetsov Oct 18, 2017

stevekuznetsov Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

jboyd01 commented Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

jpeeler commented Oct 19, 2017

stevekuznetsov commented Oct 19, 2017

openshift-merge-robot commented Oct 19, 2017

jboyd01 commented Oct 19, 2017

pmorie commented Oct 19, 2017

jboyd01 commented Oct 19, 2017

pmorie commented Oct 19, 2017

openshift-merge-robot commented Oct 19, 2017

openshift-merge-robot commented Oct 20, 2017

openshift-merge-robot commented Oct 20, 2017

openshift-ci-robot commented Oct 20, 2017

Sync v0.1.0 rc2 #16908

Sync v0.1.0 rc2 #16908

Conversation

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

jboyd01 commented Oct 17, 2017

pmorie commented Oct 17, 2017

stevekuznetsov Oct 18, 2017

Choose a reason for hiding this comment

stevekuznetsov Oct 18, 2017

Choose a reason for hiding this comment

stevekuznetsov Oct 18, 2017

Choose a reason for hiding this comment

stevekuznetsov Oct 18, 2017

Choose a reason for hiding this comment

stevekuznetsov Oct 18, 2017

Choose a reason for hiding this comment

stevekuznetsov Oct 18, 2017

Choose a reason for hiding this comment

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

jboyd01 commented Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

pmorie commented Oct 18, 2017

jpeeler commented Oct 19, 2017

stevekuznetsov commented Oct 19, 2017

openshift-merge-robot commented Oct 19, 2017

jboyd01 commented Oct 19, 2017

pmorie commented Oct 19, 2017

jboyd01 commented Oct 19, 2017

pmorie commented Oct 19, 2017

openshift-merge-robot commented Oct 19, 2017

openshift-merge-robot commented Oct 20, 2017

openshift-merge-robot commented Oct 20, 2017

openshift-ci-robot commented Oct 20, 2017