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.

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

Quick version update #1296

Merged
merged 3 commits into from
Jan 9, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/user_doc/vic_vsphere_admin/pre_upgrade_tasks.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Tasks to Perform Before Upgrading the vSphere Integrated Containers Appliance #

To ensure a successful upgrade, you must perform several tasks before upgrading the vSphere Integrated Containers appliance. These pre-upgrade tasks are necessary due to differences in implementation between versions 1.1 and 1.2 of the vSphere Integrated Containers Registry and Management Portal, in particular the merging of the user interfaces and the transition to the Platform Services Controller for identity management.
To ensure a successful upgrade, you must perform several tasks before upgrading the vSphere Integrated Containers appliance. These pre-upgrade tasks are necessary due to differences in implementation between versions 1.2 and 1.3 of the vSphere Integrated Containers Registry and Management Portal, in particular the merging of the user interfaces and the transition to the Platform Services Controller for identity management.

- Make sure that the previous version of the vSphere Integrated Containers appliance allows SSH connections.

Expand Down
4 changes: 2 additions & 2 deletions docs/user_doc/vic_vsphere_admin/upgrading_vic.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Upgrading vSphere Integrated Containers #

You can upgrade vSphere Integrated Containers from version 1.1.x to 1.2.x, or from 1.2.x to a later 1.2.y update release.
You can upgrade vSphere Integrated Containers from version 1.2.x to 1.3.x, or from 1.3.x to a later 1.2.y update release.
Copy link
Contributor

Choose a reason for hiding this comment

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

or from 1.3.x to a later 1.2.y update release.

==> or from 1.3.x to a later 1.3.y update release.


You cannot upgrade any of the components of vSphere Integrated Containers 1.0, namely vSphere Integrated Containers Engine 0.8 and vSphere Integrated Containers Registry 0.5, to 1.2.x. Similarly, you cannot upgrade an instance of vSphere Integrated Containers Management Portal (Admiral) that predates version 1.1.0 to version 1.2.x.
You cannot upgrade any of the components of vSphere Integrated Containers 1.0, namely vSphere Integrated Containers Engine 0.8 and vSphere Integrated Containers Registry 0.5, to 1.3.x. Similarly, you cannot upgrade an instance of vSphere Integrated Containers Management Portal (Admiral) that predates version 1.2.0 to version 1.3.x.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that we can reduce this to:

"You cannot upgrade vSphere Integrated Containers 1.1.x to version 1.3.x."

The stuff about the separate components was because prior to 1.2 you had upgrade everything individually.


You upgrade vSphere Integrated Containers in three stages:

Expand Down