Skip to content
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.

Sign up for GitHub

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

Jump to bottom

cmd/openshift-install/upi: Add a user-provided-infrastructure subcommand #1393

Merged
merged 1 commit into from
Mar 13, 2019
Merged

cmd/openshift-install/upi: Add a user-provided-infrastructure subcommand #1393

merged 1 commit into from
Mar 13, 2019

Conversation

wking
Copy link
Member

@wking wking commented Mar 8, 2019

To support:

  1. Call create FIXME to create the bootstrap Ignition config and admin kubeconfig, create: separate bootstrap and node ignition config assets into separate targets #1119.
  2. Creates all required cluster resources, after which the cluster will being bootstrapping.
  3. Call user-provided-infrastructure bootstrap-complete to wait until the bootstrap phase has completed.
  4. Destroy the bootstrap resources.
  5. Call user-provided-infrastructure finish to wait until the cluster finishes deploying its initial version. This also retrieves the router certificate authority from the cluster and inserts it into the admin kubeconfig.

CC @abhinavdahiya, @staebler, @cuppett

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 8, 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 Mar 8, 2019
@wking wking force-pushed the upi-entry-points branch 2 times, most recently from 210a5b0 to 5b3626e Compare March 11, 2019 20:48
@wking wking changed the title WIP: cmd/openshift-install/upi: Add a user-provided-infrastructure subcommand cmd/openshift-install/upi: Add a user-provided-infrastructure subcommand Mar 11, 2019
@openshift-ci-robot 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 Mar 11, 2019
@wking
Copy link
Member Author

wking commented Mar 11, 2019

  1. Call create FIXME to create the bootstrap Ignition config and admin kubeconfig, create: separate bootstrap and node ignition config assets into separate targets #1119.

I'd forgotten that create ignition-configs creates the admin kubeconfig since #1008, so this doesn't need to be a FIXME. #1119 just has the discussion about renaming the ignition-configs target to something more appropriate now that it's going to become just "the assets you need for UPI".

@cuppett
Copy link
Member

cuppett commented Mar 12, 2019

I was able to use this and detect the bootstrap complete event. Here are a couple notes during my session:

[scuppett@cuppett installer]$ bin/openshift-install user-provided-infrastructure bootstrap-complete
INFO Waiting up to 30m0s for the Kubernetes API...

Notes: May be useful to identify the target address here. Just in case there's a weird mismatch between what the installer is thinking and the reality of the currently configured UPI.

INFO API v1.12.4+bf1e6bd up
INFO Waiting up to 30m0s for the bootstrap-complete event...

Notes: Should we tell them to destroy the bootstrap here?

[scuppett@cuppett installer]$ bin/openshift-install user-provided-infrastructure finish
INFO Waiting up to 30m0s for the cluster to initialize...

@wking
Copy link
Member Author

wking commented Mar 12, 2019

May be useful to identify the target address here.
...
Should we tell them to destroy the bootstrap here?

Both done with 5b3626e -> 45fbb29.

abhinavdahiya
abhinavdahiya reviewed Mar 13, 2019
View reviewed changes
docs/user/customization.md Outdated
@@ -184,7 +184,7 @@ For example:
02-master-kubelet 2.2.0 137m
01-worker-container-runtime 3.11.0-744-g5b05d9d3-dirty 2.2.0 137m
01-worker-kubelet 3.11.0-744-g5b05d9d3-dirty 2.2.0 137m
99-master-3c81ffa3-3b8d-11e9-ac1e-52fdfc072182-registries 3.11.0-744-g5b05d9d3-dirty 133m
99-master-3c81ffa3-3b8d-11e9-ac1e-52fdfc072182-registries 3.11.0-744-g5b05d9d3-dirty docs/user/customization.md 133m
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

un-related change.

Copy link
Member Author

@wking wking Mar 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, rogue paste. Will fix shortly

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

un-related change.

Fixed with fefd4be -> bfc40f8.

@abhinavdahiya
Copy link
Contributor

/lgtm

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

/lgtm cancel

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 13, 2019
@wking
cmd/openshift-install/upi: Add a user-provided-infrastructure subcommand
bfc40f8 
To support the workflow described in upiLong.

I've also replaced openshiftcorp.com with example.com to comply with
[1].  That way readers don't need to worry about whether
openshiftcorp.com exists and, if so, who owns it.  I've updated the
docs/user/aws/install.md examples to follow our current (with this PR)
output:

  $ curl -s https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_installer/1393/pull-ci-openshift-installer-master-e2e-aws/4457/artifacts/e2e-aws/installer/.openshift_install.log | grep level=info | head -n13
  time="2019-03-12T16:34:33Z" level=info msg="Consuming \"Install Config\" from target directory"
  time="2019-03-12T16:34:33Z" level=info msg="Creating cluster..."
  time="2019-03-12T16:51:21Z" level=info msg="Waiting up to 30m0s for the Kubernetes API at https://api.ci-op-j33s61i6-1d3f3.origin-ci-int-aws.dev.rhcloud.com:6443..."
  time="2019-03-12T16:55:29Z" level=info msg="API v1.12.4+341c822 up"
  time="2019-03-12T16:55:29Z" level=info msg="Waiting up to 30m0s for the bootstrap-complete event..."
  time="2019-03-12T17:04:56Z" level=info msg="Destroying the bootstrap resources..."
  time="2019-03-12T17:05:36Z" level=info msg="Waiting up to 30m0s for the cluster at https://api.ci-op-j33s61i6-1d3f3.origin-ci-int-aws.dev.rhcloud.com:6443 to initialize..."
  time="2019-03-12T17:14:56Z" level=info msg="Waiting up to 10m0s for the openshift-console route to be created..."
  time="2019-03-12T17:14:56Z" level=info msg="Install complete!"
  time="2019-03-12T17:14:56Z" level=info msg="Run 'export KUBECONFIG=/tmp/artifacts/installer/auth/kubeconfig' to manage the cluster with 'oc', the OpenShift CLI."
  time="2019-03-12T17:14:56Z" level=info msg="The cluster is ready when 'oc login -u kubeadmin -p 3MJb2-RRTfu-SKyuq-5NcCb' succeeds (wait a few minutes)."
  time="2019-03-12T17:14:56Z" level=info msg="Access the OpenShift web-console here: https://console-openshift-console.apps.ci-op-j33s61i6-1d3f3.origin-ci-int-aws.dev.rhcloud.com"
  time="2019-03-12T17:14:56Z" level=info msg="Login to the console with user: kubeadmin, password: 3MJb2-RRTfu-SKyuq-5NcCb"

[1]: https://tools.ietf.org/html/rfc6761#section-6.5
@abhinavdahiya
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [abhinavdahiya,wking]

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

@openshift-merge-robot openshift-merge-robot merged commit 4b12088 into openshift:master Mar 13, 2019
@wking wking deleted the upi-entry-points branch March 13, 2019 22:32
@FlorinPeter FlorinPeter mentioned this pull request Mar 15, 2019
Closed
wking added a commit to wking/openshift-installer that referenced this pull request Apr 30, 2020
@wking
cmd/openshift-install: Drop unused 'directory' arguments
0344dd8 
Looks like I forgot to clean these up when pivoting from
destroyBootstrap to waitForBootstrapComplete and removing the only
directory consumer in bfc40f8 (cmd/openshift-install/upi: Add a
user-provided-infrastructure subcommand, 2019-03-08, openshift#1393).
@wking wking mentioned this pull request Apr 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abhinavdahiya abhinavdahiya abhinavdahiya left review comments

@crawford crawford Awaiting requested review from crawford

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@abhinavdahiya abhinavdahiya

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@wking @cuppett @abhinavdahiya @openshift-ci-robot @openshift-merge-robot