Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Jul 30, 2019

This pull-request cherry-picks 253126f (#1890), although it's not a clean pick because of conflicting context in the imports between the master branch and this release-4.1 line. Once this PR lands, we can use /cherrypick release-4.1 to backport the follow-up #2046.

/assign @crawford

OpenShift telemetry is currently unable to report _how_ a cluster was
installed (i.e. user-provisioned vs installer-provisioned). We currently
use a heuristic to try to determine this information.

This patch adds a ConfigMap immediately before cluster creation with
information about the installer. This ConfigMap is not present when the
user provisions the cluster themselves since it isn't injected until the
Terraform variables are generated. This ConfipMap contains the installer
version and the name of the invoker (can be overridden with the
OPENSHIFT_INSTALL_INVOKER environment variable). This will allow us to
determine whether a cluster was user-provisioned or installer-
provisioned, whether or not a custom build of the installer was used,
and who created the cluster (e.g. Hive, CI).

This commit cherry-picks 253126f (asset/cluster: inject installer
info when creating, 2019-06-21, openshift#1890), although it's not a clean pick
because of conflicting context in the imports between the master
branch and this release-4.1 line [1].

[1]: openshift#1890 (comment)
@openshift-ci-robot
Copy link
Contributor

@wking: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

asset/cluster: inject installer info when creating

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.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 30, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2019
@wking wking added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 30, 2019
@wking
Copy link
Member Author

wking commented Jul 30, 2019

I've added bugzilla/valid-bug manually, since @crawford said we don't need backport bugs for this particular feature.

@abhinavdahiya
Copy link
Contributor

Once this PR lands, we can use /cherrypick release-4.1 to backport the follow-up #2046.

would be useful to land entire set of changes in single PR, they can be separate commits..

@crawford
Copy link
Contributor

I'd prefer to land the PRs together since this one on its own is a privacy concern.

253126f introduced this so that our telemetry could distinguish between
a user, our CI, and other future invokers of the installer. There are
privacy concerns around collecting the actual username, so we'll just
use "user" instead.

This commit is a clean cherry-pick of c5ff3aa (asset/cluster: don't
record usernames, 2019-07-18, openshift#2046).
@wking
Copy link
Member Author

wking commented Jul 30, 2019

would be useful to land entire set of changes in single PR, they can be separate commits.

But then I can't use the bot ;). Ah well, done with c2a5a26 -> 8305685.

@crawford
Copy link
Contributor

/lgtm

@jwforres is the patch manager for this round, so I'll let her apply the necessary labels. We may have missed this round though (that's my fault).

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 31, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, wking

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

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

@openshift-bot
Copy link
Contributor

/retest

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

5 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@wking
Copy link
Member Author

wking commented Jul 31, 2019

/hold

Get the robot to stop pounding the scaleup test.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2019
@crawford
Copy link
Contributor

crawford commented Aug 2, 2019

/hold cancel
/retest

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 2, 2019
@crawford crawford added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 2, 2019
@openshift-ci-robot
Copy link
Contributor

@wking: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 8305685 link /test e2e-aws-scaleup-rhel7

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.

Details

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.

@openshift-merge-robot openshift-merge-robot merged commit 4edffae into openshift:release-4.1 Aug 2, 2019
@wking wking deleted the installer-telemetry branch August 3, 2019 00:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants