Skip to content

Conversation

@crawford
Copy link
Contributor

@crawford crawford commented Jan 31, 2020

This adds support for generating the openshift-install ConfigMap when
using a UPI installation flow. Before this, the ConfigMap was generated
during the "cluster" target rather than the manifests target, so that we
could distinguish between an IPI and a UPI installation. The user had
the option of overriding the "invoker" field using the environment
variable OPENSHIFT_INSTALL_INVOKER. Even if the environment variable was
used, the ConfigMap would not be present in a UPI installation (because
it wasn't generated in the "manifests" target). This change causes the
installer to generate that ConfigMap in the "manifests" target (in
addition to the "cluster" target) when it sees the environment variable.

We will make use of this functionality in CI, where we specify the job
as the invoker.

Cherry-pick of #2929 and #3065.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jan 31, 2020
@openshift-ci-robot
Copy link
Contributor

@crawford: This pull request references Bugzilla bug 1791440, which is invalid:

  • expected dependent Bugzilla bug 1791437 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1791440: asset/manifests: add openshift-install configmap

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/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 31, 2020
@crawford
Copy link
Contributor Author

/hold

Let me figure out if we need another patch on top of this one.

@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 Jan 31, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 12, 2020
@openshift-ci-robot
Copy link
Contributor

@crawford: This pull request references Bugzilla bug 1791440, which is valid.

Details

In response to this:

Bug 1791440: asset/manifests: add openshift-install configmap

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 removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 12, 2020
This adds support for generating the openshift-install ConfigMap when
using a UPI installation flow. Before this, the ConfigMap was generated
during the "cluster" target rather than the manifests target, so that we
could distinguish between an IPI and a UPI installation. The user had
the option of overriding the "invoker" field using the environment
variable OPENSHIFT_INSTALL_INVOKER. Even if the environment variable was
used, the ConfigMap would not be present in a UPI installation (because
it wasn't generated in the "manifests" target). This change causes the
installer to generate that ConfigMap in the "manifests" target (in
addition to the "cluster" target) when it sees the environment variable.

We will make use of this functionality in CI, where we specify the job
as the invoker.
This is a follow-up for the logic introduced in 8fcbe49. The behavior
of the openshift-install ConfigMap is reverted, making it such that the
ConfigMap is always injected in an IPI installation, but never it a UPI
installation. A new ConfigMap, openshift-install-manifests, is
introduced, which is always injected at the manifests target. Both of
these ConfigMaps contain the same data: the invoker and the installer
version, at the time of their respective creation. This will allow us to
continue determining several things:

  1. Was the cluster installed via IPI or UPI?
  2. What invoked the installer to create the cluster?

It will also allow us to determine some new information:

  1. Regardless of installation strategy, what invoked the installer to
     create the manifests?
  2. Was the version of the installer used to create the manifests the
     same as the version that created the cluster (assuming IPI)?
@abhinavdahiya
Copy link
Contributor

/approve

/lgtm

@crawford
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 12, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 12, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@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 Feb 14, 2020
@openshift-bot
Copy link
Contributor

/retest

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

4 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-merge-robot openshift-merge-robot merged commit c7325a3 into openshift:release-4.3 Feb 14, 2020
@openshift-ci-robot
Copy link
Contributor

@crawford: All pull requests linked via external trackers have merged. Bugzilla bug 1791440 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1791440: asset/manifests: add openshift-install configmap

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.

@crawford crawford deleted the invoker branch February 17, 2020 05:46
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants