collapse onto upstream version command #21434

deads2k · 2018-11-06T15:38:51Z

In 3.11, oc version communicates with endpoints on joint apiserver process. Those endpoints are going away and because of API aggregation, the idea that a particular kube-apiserver maps to a particular openshift-apiserver is no longer valid. This fixes the oc version command to exactly match the upstream behavior.

/assign @soltysh @juanvallejo
/cc @sttts @jhadvig

sttts · 2018-11-06T15:43:14Z

"exactly match the upstream behavior." means that we see 1.11? Or that we see 3.11?

deads2k · 2018-11-06T15:48:02Z

"exactly match the upstream behavior." means that we see 1.11? Or that we see 3.11?

exactly except I allow for injecting a client version.

sttts · 2018-11-06T15:49:39Z

Sgtm.

soltysh

/lgtm
/approve

openshift-bot · 2018-11-06T19:12:25Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2018-11-06T21:13:45Z

/retest

Please review the full test history for this PR and help us cut down flakes.

deads2k · 2018-11-08T19:31:26Z

/retest

deads2k · 2018-11-14T13:06:00Z

/retest

soltysh · 2018-11-15T09:51:08Z

/hold
for the rebase to land

soltysh

/lgtm

openshift-ci-robot · 2019-02-18T14:26:04Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, juanvallejo, soltysh

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~contrib/completions/OWNERS~~ [deads2k,soltysh]
~~hack/OWNERS~~ [deads2k]
~~pkg/oc/OWNERS~~ [deads2k,soltysh]
~~test/cmd/OWNERS~~ [deads2k,soltysh]
~~vendor/k8s.io/kubernetes/pkg/OWNERS~~ [deads2k]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

deads2k · 2019-02-18T19:02:28Z

/retest

deads2k · 2019-02-19T15:29:45Z

/retest

soltysh · 2019-02-20T16:27:49Z

test/cmd/basicresources.sh

-os::cmd::expect_success_and_text 'oc version' "kubernetes ${kube_git_regex}"
-os::cmd::expect_success_and_text 'oc version' "features: Basic-Auth"
-os::cmd::expect_success_and_text 'openshift version' "openshift ${os_git_regex}"
+os::cmd::expect_success_and_text 'oc version' "Client Version: .*GitVersion${os_git_regex}"


This needs to be:

os::cmd::expect_success_and_text 'oc version' "Client Version: .*GitVersion:\"${os_git_regex}"

notice the :\" between GitVersion and ${os_git_regex}.

openshift-ci-robot · 2019-02-20T16:35:10Z

New changes are detected. LGTM label has been removed.

… in the absence of kubeconfig

openshift-ci-robot · 2019-02-20T20:13:44Z

New changes are detected. LGTM label has been removed.

deads2k · 2019-02-20T23:59:29Z

/retest

soltysh · 2019-02-21T11:55:09Z

/retest

openshift-ci-robot · 2019-02-21T14:13:46Z

@deads2k: The following tests failed for commit 8d0ae2a, say /retest to rerun them:

Test name	Details	Rerun command
ci/openshift-jenkins/cmd	`3a483f9`	link
ci/prow/e2e-aws-serial	link	`/test e2e-aws-serial`

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.

deads2k · 2019-02-22T14:01:06Z

network

/retest

soltysh · 2019-02-22T15:09:34Z

/retest

deads2k · 2019-02-22T20:15:54Z

/retest

deads2k · 2019-02-22T22:41:57Z

/retest

deads2k · 2019-02-23T02:13:44Z

serial is a known flake.

(Used "Red Hat-Managed" option, which is presently hidden for most external users - it's partially, but not yet fully, what one will get in OpenShift Dedicated 4.1. May differ slightly from self-installed OCP?) env DIR=openshift-4.1.0-rc.3 URL="https://api.cben-oapi.bexf.p1.openshiftapps.com:6443" WAIT_OKS="healthz readyz" tools/scrape.sh --insecure - Notably /oapi is completely gone now! (openshift/origin#21782) - TODO: /version/openshift no longer available (openshift/origin#21434) Probably need to scrape `oc get clusterversion` operator CR?

openshift-ci-robot assigned juanvallejo and soltysh Nov 6, 2018

openshift-ci-robot requested review from jhadvig and sttts November 6, 2018 15:39

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 6, 2018

soltysh approved these changes Nov 6, 2018

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2018

juanvallejo approved these changes Nov 6, 2018

View reviewed changes

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2018

deads2k force-pushed the version-01 branch 2 times, most recently from 3841346 to 3a483f9 Compare November 6, 2018 21:31

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 15, 2018

soltysh mentioned this pull request Nov 16, 2018

Change in the openshift server binary version output from 3.9.0 to 3.10.0 #20571

Closed

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 25, 2019

deads2k force-pushed the version-01 branch from 3a483f9 to dbfc263 Compare February 12, 2019 13:23

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 12, 2019

deads2k removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 12, 2019

soltysh approved these changes Feb 12, 2019

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2019

deads2k force-pushed the version-01 branch from dbfc263 to 0d30fe7 Compare February 14, 2019 18:01

deads2k unassigned juanvallejo Feb 14, 2019

deads2k added the lgtm Indicates that a PR is ready to be merged. label Feb 18, 2019

soltysh reviewed Feb 20, 2019

View reviewed changes

deads2k force-pushed the version-01 branch from f91179e to 2e93ff6 Compare February 20, 2019 16:35

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2019

deads2k added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2019

deads2k added 4 commits February 20, 2019 15:13

UPSTREAM: <carry>: inject version into kubectl

86404ec

UPSTREAM: 70713: kubectl version should print just client information…

1fb6a51

… in the absence of kubeconfig

generated

ddee457

collapse onto upstream version function

8d0ae2a

deads2k force-pushed the version-01 branch from 2e93ff6 to 8d0ae2a Compare February 20, 2019 20:13

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2019

deads2k added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2019

deads2k merged commit adedf59 into openshift:master Feb 23, 2019

xingxingxia mentioned this pull request Feb 26, 2019

fix for oc version openshift/verification-tests#89

Merged

xiuwang mentioned this pull request Mar 25, 2019

Modify jenkins steps to adjust 4.0 change openshift/verification-tests#98

Merged

cben mentioned this pull request May 24, 2019

openshift version no longer shown #22901

Closed

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

collapse onto upstream version command #21434

collapse onto upstream version command #21434

deads2k commented Nov 6, 2018

sttts commented Nov 6, 2018

deads2k commented Nov 6, 2018

sttts commented Nov 6, 2018

soltysh left a comment

openshift-bot commented Nov 6, 2018

openshift-bot commented Nov 6, 2018

deads2k commented Nov 8, 2018

deads2k commented Nov 14, 2018

soltysh commented Nov 15, 2018

soltysh left a comment

openshift-ci-robot commented Feb 18, 2019

deads2k commented Feb 18, 2019

deads2k commented Feb 19, 2019

soltysh Feb 20, 2019

openshift-ci-robot commented Feb 20, 2019

openshift-ci-robot commented Feb 20, 2019

deads2k commented Feb 20, 2019

soltysh commented Feb 21, 2019

openshift-ci-robot commented Feb 21, 2019 •

edited

Loading

deads2k commented Feb 22, 2019

soltysh commented Feb 22, 2019

deads2k commented Feb 22, 2019

deads2k commented Feb 22, 2019

deads2k commented Feb 23, 2019

collapse onto upstream version command #21434

collapse onto upstream version command #21434

Conversation

deads2k commented Nov 6, 2018

sttts commented Nov 6, 2018

deads2k commented Nov 6, 2018

sttts commented Nov 6, 2018

soltysh left a comment

Choose a reason for hiding this comment

openshift-bot commented Nov 6, 2018

openshift-bot commented Nov 6, 2018

deads2k commented Nov 8, 2018

deads2k commented Nov 14, 2018

soltysh commented Nov 15, 2018

soltysh left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Feb 18, 2019

deads2k commented Feb 18, 2019

deads2k commented Feb 19, 2019

soltysh Feb 20, 2019

Choose a reason for hiding this comment

openshift-ci-robot commented Feb 20, 2019

openshift-ci-robot commented Feb 20, 2019

deads2k commented Feb 20, 2019

soltysh commented Feb 21, 2019

openshift-ci-robot commented Feb 21, 2019 • edited Loading

deads2k commented Feb 22, 2019

soltysh commented Feb 22, 2019

deads2k commented Feb 22, 2019

deads2k commented Feb 22, 2019

deads2k commented Feb 23, 2019

openshift-ci-robot commented Feb 21, 2019 •

edited

Loading