Skip to content

[3.11] Hostname fixes backport#10356

Merged
openshift-merge-robot merged 3 commits intoopenshift:release-3.11from
mgugino-upstream-stage:hostname-fixes-bp-3.11
Oct 11, 2018
Merged

[3.11] Hostname fixes backport#10356
openshift-merge-robot merged 3 commits intoopenshift:release-3.11from
mgugino-upstream-stage:hostname-fixes-bp-3.11

Conversation

@michaelgugino
Copy link
Contributor

@michaelgugino michaelgugino commented Oct 8, 2018

Adding openshift_kubelet_name_override as a stand-in for
various places we will need to account for possible hostname
overrides.

(cherry picked from commit 1faee09)

Backports: #10334
Backports: #10341
Backports: #10343

Adding openshift_kubelet_name_override as a stand-in for
various places we will need to account for possible hostname
overrides.

(cherry picked from commit 1faee09)
@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 8, 2018
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 8, 2018
This allows us to optionally use override as we see fit.

(cherry picked from commit 0411517)
Sync pod should check for existence of /etc/sysconfig/KUBELET_HOSTNAME_OVERRIDE
and if present, cat value into nodeconfig.

(cherry picked from commit a225f97)
@michaelgugino michaelgugino changed the title WIP: [3.11] Hostname fixes backport [3.11] Hostname fixes backport Oct 11, 2018
@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 Oct 11, 2018
@michaelgugino
Copy link
Contributor Author

/retest

@michaelgugino
Copy link
Contributor Author

/test e2e-gcp

@sdodson
Copy link
Member

sdodson commented Oct 11, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 11, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michaelgugino, sdodson

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:
  • OWNERS [michaelgugino,sdodson]

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

@michaelgugino
Copy link
Contributor Author

/cherrypick release-3.10

@openshift-cherrypick-robot

@michaelgugino: once the present PR merges, I will cherry-pick it on top of release-3.10 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release-3.10

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
Copy link

openshift-ci-robot commented Oct 11, 2018

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

Test name Commit Details Rerun command
ci/prow/e2e-gcp-crio ef259f7 link /test e2e-gcp-crio

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 cce8e90 into openshift:release-3.11 Oct 11, 2018
@openshift-cherrypick-robot

@michaelgugino: #10356 failed to apply on top of branch "release-3.10":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	images/installer/root/usr/local/bin/generate
M	inventory/hosts.example
M	playbooks/init/cluster_facts.yml
M	playbooks/init/validate_hostnames.yml
A	playbooks/openstack/resources.py
M	roles/lib_utils/action_plugins/sanity_checks.py
M	roles/openshift_openstack/tasks/node-configuration.yml
M	roles/openshift_openstack/templates/heat_stack_server.yaml.j2
Falling back to patching base and 3-way merge...
Auto-merging roles/openshift_openstack/templates/heat_stack_server.yaml.j2
Auto-merging roles/openshift_openstack/tasks/node-configuration.yml
Auto-merging roles/lib_utils/action_plugins/sanity_checks.py
CONFLICT (content): Merge conflict in roles/lib_utils/action_plugins/sanity_checks.py
Auto-merging playbooks/openstack/inventory.py
Auto-merging playbooks/init/validate_hostnames.yml
Auto-merging playbooks/init/cluster_facts.yml
Auto-merging inventory/hosts.example
Auto-merging images/installer/root/usr/local/bin/generate
Patch failed at 0001 Fail on openshift_hostname defined; add openshift_kubelet_name_override

Details

In response to this:

/cherrypick release-3.10

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.

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. 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.

5 participants