-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
oc describe build output improvements #8293
oc describe build output improvements #8293
Conversation
de43648
to
b75b543
Compare
This is looking a lot better, the only thing i'm not sure about is that all the source details are before the Strategy: Source line. |
@jwforres Yes, I can re-order them: $ oc describe build ruby-hello-world-1
...
Strategy: Source
From Image: DockerImage centos/ruby-22-centos7@sha256:990326b8ad8c4ae2619b24d019b7871bb10ab08c41e9d5b19d0b72cb0200e28c
Output to: ImageStreamTag ruby-hello-world:latest
Push Secret: builder-dockercfg-m9x7z
URL: https://github.com/openshift/ruby-hello-world.git
Commit: bd94cbb (Merge pull request #52 from bparees/stdout)
Author/Committer: Ben Parees $ oc describe bc/ruby-hello-world
...
Strategy: Source
From Image: ImageStreamTag ruby-22-centos7:latest
Output to: ImageStreamTag ruby-hello-world:latest
Triggered by: Config, ImageChange
Webhook GitHub: https://localhost:8443/oapi/v1/namespaces/test/buildconfigs/ruby-hello-world/webhooks/Fbklht-OP-w1EMEWOJXY/github
Webhook Generic: https://localhost:8443/oapi/v1/namespaces/test/buildconfigs/ruby-hello-world/webhooks/xshVl6kq2OYcdLJYabPl/generic
URL: https://github.com/openshift/ruby-hello-world.git |
i'm not convinced we need a line break between the strategy/from/etc block and the url/commit/etc block. all those items are config/input into the buildconfig or build that was run, so i think they can be grouped together ("From Image" has just as much impact on your build result as your "URL", for example, and either one can change for a given build) putting the URL right under the strategy seems desirable since for most cases we'd then have:
which has a very natural flow to it, imo |
otherwise i second @jwforres, this is a huge improvement, thanks! |
will Author/Committer show two values if they are different? (under what circumstances could they be different? i'm not up on my git terminology :) ) |
Author is the original author of the commit (I think) and then in cases On Fri, Apr 1, 2016 at 11:22 AM, Ben Parees [email protected]
|
@bparees Yes, it will show 2 values on the same line. For example:
When you're |
cool, sounds good. |
b75b543
to
b11459d
Compare
I've combine them together. |
@php-coder can you paste a sample of the new output for a BC and build? I think we're in good shape but it'd be easier to confirm w/ a sample. |
@bparees I updated the example in the description. |
I hate that we called our build sequence id "last version" but that's part of the api, so not your problem :) can I see an example with a BC/build that declares 2+ image input sources, some with 1 path and some with multiple paths? this template contains the skeleton for such a BC: |
@bparees Yes, sure: $ oc describe bc/imagesourcebuild
Name: imagesourcebuild
Created: 6 minutes ago
Labels: build=imagesourcebuild
Annotations: <none>
Latest Version: 1
Strategy: Source
URL: https://github.com/openshift/ruby-hello-world.git
From Image: ImageStreamTag openshift/ruby:latest
Force Pull: yes
Output to: ImageStreamTag imagesourceapp:latest
Image Source: copies /usr/lib/jenkins/jenkins.war from openshift/jenkins:latest to injected/dir
Triggered by: <none>
Build Status Duration Creation Time
imagesourcebuild-1 running running for 3m4s 2016-04-04 12:21:05 +0000 UTC
$ oc describe build/imagesourcebuild-1
Name: imagesourcebuild-1
Created: 3 minutes ago
Labels: build=imagesourcebuild
buildconfig=imagesourcebuild
openshift.io/build-config.name=imagesourcebuild
Annotations: openshift.io/build.number=1
openshift.io/build.pod-name=imagesourcebuild-1-build
Status: Complete
Started: Mon, 04 Apr 2016 12:21:08 UTC
Duration: 3m5s
Build Config: imagesourcebuild
Build Pod: imagesourcebuild-1-build
Strategy: Source
URL: https://github.com/openshift/ruby-hello-world.git
Commit: bd94cbb (Merge pull request #52 from bparees/stdout)
Author/Committer: Ben Parees
From Image: DockerImage centos/ruby-22-centos7@sha256:990326b8ad8c4ae2619b24d019b7871bb10ab08c41e9d5b19d0b72cb0200e28c
Force Pull: yes
Output to: ImageStreamTag imagesourceapp:latest
Image Source: copies /usr/lib/jenkins/jenkins.war from openshift/jenkins-1-centos7@sha256:be195f14530529244b45995aa7220b21b0eb407a37739c43ba9aaa6a5b4f0732 to injected/dir
Push Secret: builder-dockercfg-y92fy
Events:
FirstSeen LastSeen Count From SubobjectPath Type Reason Message
--------- -------- ----- ---- ------------- -------- ------ -------
3m 3m 1 {default-scheduler } Normal Scheduled Successfully assigned imagesourcebuild-1-build to localhost.localdomain
3m 3m 1 {kubelet localhost.localdomain} spec.containers{sti-build} Normal Pulled Container image "openshift/origin-sti-builder:v1.1.4" already present on machine
3m 3m 1 {kubelet localhost.localdomain} spec.containers{sti-build} Normal Created Created container with docker id 25acb47b78a6
3m 3m 1 {kubelet localhost.localdomain} spec.containers{sti-build} Normal Started Started container with docker id 25acb47b78a6 |
Looking pretty good. Can we use the short name printer for the images On Mon, Apr 4, 2016 at 8:28 AM, Vyacheslav Semushin <
|
@smarterclayton i think @php-coder tried to shorten the names and found they weren't pullable once he truncated the hash... is there some other shortening mechanism you're referring to? |
Yes, it doesn't work: $ docker pull centos/ruby-22-centos7@sha256:990326b
Trying to pull repository docker.io/centos/ruby-22-centos7 ... failed
manifest unknown: manifest unknown
$ docker pull centos/ruby-22-centos7@sha256:990326b8ad8c4ae2619b24d019b7871bb10ab08c41e9d5b19d0b72cb0200e28c
Trying to pull repository docker.io/centos/ruby-22-centos7 ... sha256:990326b8ad8c4ae2619b24d019b7871bb10ab08c41e9d5b19d0b72cb0200e28c: Pulling from centos/ruby-22-centos7
Digest: sha256:990326b8ad8c4ae2619b24d019b7871bb10ab08c41e9d5b19d0b72cb0200e28c
Status: Image is up to date for docker.io/centos/ruby-22-centos7@sha256:990326b8ad8c4ae2619b24d019b7871bb10ab08c41e9d5b19d0b72cb0200e28c |
For image stream tags, the expectation is the default command is: oc describe istag/ruby-22-centos@sha256:990326b not docker pull. The docker pull may be a bug that is fixable. On Mon, Apr 4, 2016 at 12:10 PM, Vyacheslav Semushin <
|
ok but in this case it's a DockerImage, not an ImageStreamTag:
so we'd truncate when it's an imagestreamtag reference and not when it's a dockerimage reference? |
Yeah. On Mon, Apr 4, 2016 at 12:28 PM, Ben Parees [email protected]
|
In case of imagestreamtag there is nothing to truncate because we're not showing this hash: $ oc describe bc/s2i-test | grep ImageStreamTag
From Image: ImageStreamTag java:8
Output to: ImageStreamTag s2i-test:latest
$ oc get istag
NAME DOCKER REF UPDATED IMAGENAME
java:8 java@sha256:cedc6a5dcba447e77a300351faeae6f926d2b22cd384d35d102fc4bfb117abd2 4 hours ago sha256:cedc6a5dcba447e77a300351faeae6f926d2b22cd384d35d102fc4bfb117abd2 |
The docker pull issue is fixable, but only if we can patch the registry to On Mon, Apr 4, 2016 at 12:24 PM, Clayton Coleman [email protected]
|
Spawned #8354 for image pull by On Tue, Apr 5, 2016 at 12:25 AM, Clayton Coleman [email protected]
|
@smarterclayton What else I should improve as part of this PR? Add truncation for (unimplemented yet) docker's sums? Show truncated sum for ImageStreamTags? |
we can avoid truncation for now, are the examples up to date? On Tue, Apr 5, 2016 at 6:04 AM, Vyacheslav Semushin <
|
@smarterclayton yes, they are up to date. |
@jwforres @smarterclayton i'm good w/ this going into 3.2, does it have api/ux approval? |
Approved for 3.2 |
[merge] |
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/5538/) (Image: devenv-rhel7_3927) |
Evaluated for origin merge up to b11459d |
[Test]ing while waiting on the merge queue |
Evaluated for origin test up to b11459d |
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/2793/) |
woo. nice work @php-coder |
PR kubernetes/kubernetes#23988 for showing multiple labels/annotations on multiple lines was merged. |
Trello card: https://trello.com/c/l8CyWprA/863-3-clean-up-the-build-describe-output
Fix #5247
PTAL @bparees @jwforres @smarterclayton
Note: build config describer mostly unchanged.
Example output: