Skip to content

Advance Install updates#7934

Closed
gaurav-nelson wants to merge 1 commit intoopenshift:enterprise-3.5from
gaurav-nelson:adv-install-updates
Closed

Advance Install updates#7934
gaurav-nelson wants to merge 1 commit intoopenshift:enterprise-3.5from
gaurav-nelson:adv-install-updates

Conversation

@gaurav-nelson
Copy link
Copy Markdown
Contributor

@gaurav-nelson gaurav-nelson commented Feb 26, 2018

Recreation from History

Content leaked from the master branch into the enterprise-3.5 branch because of the commit in PR #6105

  • For enterprise-3.5 branch only.

How I modified this file?

  1. Created a new branch tracking the current ‘enterprise-3.5’ branch. git checkout -b fix-3.5-adv-install --track upstream/enterprise-3.5
  2. Hard reset to commit before the commit from PR#6150. git reset --hard 5efd709
  3. Manually checked and updated changes form following commits after PR#6150.
    It includes changes from the following commits:

One

[enterprise-3.5] changed all instances of emptydir and EmptyDir to em…
Required changes https://github.com/openshift/openshift-docs/pull/6084/files#diff-fe94157edddadf88425cf07b556a00a3
Changed EmptyDir to emptyDir

Two

[enterprise-3.5] link fixes weekly release (c421a44#diff-fe94157edddadf88425cf07b556a00a3)
Needed no changes (changes are already there)

Three

[enterprise-3.5] Replace dead links in install and config docs(by Ver… (5a12b83#diff-fe94157edddadf88425cf07b556a00a3)
Needed no changes (changes are already there)

Four

[enterprise-3.5] Fixed environment variables (d18e310#diff-fe94157edddadf88425cf07b556a00a3)
Moved openshift_hosted_router_selector and openshift_registry_selector to Configuring Cluster Variables section

Five

[enterprise-3.5] Fixed typo in openshift_template_service_broker_name… (886f1be#diff-fe94157edddadf88425cf07b556a00a3)
No changes

Six

[enterprise-3.5] added descriptions for openshift_image_tag and opens… (d7487fb#diff-fe94157edddadf88425cf07b556a00a3)
Added openshift_clusterid, openshift_image_tag, openshift_pkg_version variables.

Seven

[enterprise-3.5] fixes a bad link and a formatting issue (273f7fe#diff-fe94157edddadf88425cf07b556a00a3)
From https://github.com/openshift/openshift-docs/pull/7421/files
Fixed the inter link to using flannel section.

Eight

[enterprise-3.5] Weekly Release: 02/06/18 (8bf8da3#diff-fe94157edddadf88425cf07b556a00a3)
Removes openshift_clusterid variable which is not needed because of [enterprise-3.5] added descriptions for openshift_image_tag and opens…
No changes.

Others

Other were weekly release fixes which were not applicable on the restored content.

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 26, 2018
proxy mode] to use: either `iptables` for the default, pure-`iptables`
implementation, or `userspace` for the user space proxy.

|`openshift_router_selector`
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Only applicable to 3.7 and 3.9
#6609

@gaurav-nelson
Copy link
Copy Markdown
Contributor Author

@vikram-redhat PTAL

@gaurav-nelson gaurav-nelson deleted the adv-install-updates branch August 3, 2018 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

2 participants