kubelet: quote values in node.openshift.io/os_id label, use VERSION_ID instead of VERSION #549

vrutkovs · 2019-03-13T14:04:34Z

Fixes https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_openshift-ansible/11343/pull-ci-openshift-openshift-ansible-devel-40-e2e-aws-scaleup/581/build-log.txt
Related to #514

- What I did
Quoted values for labels, assigned from /etc/os-release contents, replaced VERSION with VERSION_ID

- How to verify it
Run openshift-ansible's scaleup playbook on CentOS 7 nodes, check kubelet log:
kubelet_node_status.go:92] Unable to register node "ip-10-0-172-104.ec2.internal" with API server: Node "ip-10-0-172-104.ec2.internal" is invalid: metadata.labels: Invalid value: "7 (Core)": a valid label must be an empty string or consist of alphanumeric characters, ''-'', ''_'' or ''.'', and must start and end with an alphanumeric character (e.g. ''MyValue'', or ''my_value'', or ''12345'', regex used for validation is ''(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?'')'

- Description for the changelog
Use VERSION_ID in node.openshift.io/os_version label

vrutkovs · 2019-03-13T14:06:11Z

/test e2e-rhel-scaleup

vrutkovs · 2019-03-13T14:16:11Z

/test e2e-rhel-scaleup

runcom · 2019-03-13T14:21:33Z

/cc @sjenning

rphillips · 2019-03-13T14:33:15Z

The single quotes should be double quotes. Single quotes do not usually get variable expansions.

vrutkovs · 2019-03-13T14:51:58Z

The single quotes should be double quotes. Single quotes do not usually get variable expansions.

Right, fixed

vrutkovs · 2019-03-13T14:52:08Z

/test e2e-rhel-scaleup

rphillips · 2019-03-13T15:59:21Z

/lgtm
/retest

vrutkovs · 2019-03-13T18:20:23Z

/retest

vrutkovs · 2019-03-13T19:05:16Z

/test e2e-rhel-scaleup

sdodson · 2019-03-13T20:29:53Z

/test e2e-aws
/test e2e-aws-op

kikisdeliveryservice · 2019-03-13T21:14:45Z

@vrutkovs Can you please describe and point me to/quote the portions of the error logs that are showing the problem this is fixing? They are quite long and you've only provided a link.

Also can you update the commit message to:

add quotes around values in node.openshift.io/os_id

<Some explanation of why you need to do this>

vrutkovs · 2019-03-14T08:42:37Z

@vrutkovs Can you please describe and point me to/quote the portions of the error logs that are showing the problem this is fixing? They are quite long and you've only provided a link.

In CentOS /etc/os-release has:

# cat /etc/os-release 
NAME="CentOS Linux"
VERSION="7 (Core)"
ID="centos"

so the arguments passed to kubelet look like
--node-labels=node-role.kubernetes.io/master,node.openshift.io/os_version=7 (Core),node.openshift.io/os_id=centos \.
This causes kubelet to crashloop with:
kubelet_node_status.go:92] Unable to register node "ip-10-0-172-104.ec2.internal" with API server: Node "ip-10-0-172-104.ec2.internal" is invalid: metadata.labels: Invalid value: "7 (Core)": a valid label must be an empty string or consist of alphanumeric characters, ''-'', ''_'' or ''.'', and must start and end with an alphanumeric character (e.g. ''MyValue'', or ''my_value'', or ''12345'', regex used for validation is ''(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?'')'

This PR also uses VERSION_ID instead of VERSION so that it would be a valid k8s label

vrutkovs · 2019-03-14T08:55:34Z

/test e2e-rhel-scaleup

vrutkovs · 2019-03-14T09:03:33Z

/test e2e-rhel-scaleup

rphillips · 2019-03-14T12:47:09Z

/retest

vrutkovs · 2019-03-14T15:14:17Z

/test e2e-rhel-scaleup

sdodson · 2019-03-14T15:44:31Z

According to man os-release VERSION and VERSION_ID both appear to be optional, but at least for the use cases immediately at hand they appear to be populated in all cases. Just something to be aware of.

openshift-bot · 2019-03-19T13:15:00Z

/retest

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

mtnbikenc · 2019-03-19T14:39:18Z

/retest

openshift-bot · 2019-03-19T15:10:06Z

/retest

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

vrutkovs · 2019-03-19T15:47:17Z

/retest

openshift-bot · 2019-03-19T17:11:17Z

/retest

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

kikisdeliveryservice · 2019-03-19T17:43:37Z

/lgtm cancel

VERSION_ID is used instead of VERSION, as it is a lower-case string (mostly numeric, no spaces or other characters outside of 0-9, a-z, ".", "_" and "-") DEBUG: remove quotes

kikisdeliveryservice · 2019-03-19T17:44:54Z

@vrutkovs since you aren't using the quotes anymore can you please update the commit and squash?

cc: @cgwalters

kikisdeliveryservice · 2019-03-19T17:49:03Z

thanks @vrutkovs ! I think the vsphere update will fix the failed unit test as well. :)

/lgtm

openshift-ci-robot · 2019-03-19T17:49:14Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgwalters, kikisdeliveryservice, rphillips, vrutkovs

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~~ [cgwalters,kikisdeliveryservice]

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

sdodson · 2019-03-19T20:01:23Z

/test e2e-aws

openshift-bot · 2019-03-20T03:16:08Z

/retest

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

openshift-bot · 2019-03-20T05:17:07Z

/retest

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

openshift-bot · 2019-03-20T07:18:07Z

/retest

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

vrutkovs · 2019-03-20T09:05:50Z

/test e2e-aws

vrutkovs · 2019-03-20T10:57:46Z

/test e2e-aws

sdodson · 2019-03-20T12:55:06Z

/override ci/prow/e2e-aws
Previous runs show green status for all tests, this failure is a flake.

openshift-ci-robot · 2019-03-20T12:55:17Z

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-aws

Details

In response to this:

/override ci/prow/e2e-aws
Previous runs show green status for all tests, this failure is a flake.

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 · 2019-03-20T13:11:03Z

@vrutkovs: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/e2e-rhel-scaleup	13fd14a7073a99d9894d69f94c1d898f4ee3118b	link	`/test e2e-rhel-scaleup`
ci/prow/e2e-aws	`17f988e`	link	`/test e2e-aws`

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.

vrutkovs · 2019-03-20T13:24:32Z

/override ci/prow/e2e-aws-op

Flake, passed previously

openshift-ci-robot · 2019-03-20T13:24:36Z

@vrutkovs: vrutkovs unauthorized: /override is restricted to repo administrators

Details

In response to this:

/override ci/prow/e2e-aws-op

Flake, passed previously

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-bot · 2019-03-20T13:24:53Z

/retest

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

openshift-ci-robot requested review from LorbusChris and runcom March 13, 2019 14:04

openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 13, 2019

vrutkovs force-pushed the quote_id_label branch from e1c0e84 to ccf8ee3 Compare March 13, 2019 14:05

openshift-ci-robot requested a review from sjenning March 13, 2019 14:21

vrutkovs force-pushed the quote_id_label branch from ccf8ee3 to 200dc51 Compare March 13, 2019 14:51

vrutkovs mentioned this pull request Mar 13, 2019

Ensure openshift_node variables adhere to naming standard. openshift/openshift-ansible#11343

Merged

openshift-ci-robot assigned rphillips Mar 13, 2019

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

vrutkovs force-pushed the quote_id_label branch from 200dc51 to f66dd49 Compare March 14, 2019 08:36

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 14, 2019

vrutkovs force-pushed the quote_id_label branch from f66dd49 to f4f7038 Compare March 14, 2019 09:01

vrutkovs changed the title ~~kubelet: quote values in node.openshift.io/os_id label~~ kubelet: quote values in node.openshift.io/os_id label, use VERSION_ID instead of VERSION Mar 14, 2019

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 19, 2019

openshift-ci-robot assigned kikisdeliveryservice Mar 19, 2019

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 19, 2019

Use VERSION_ID in kubelet labels

17f988e

VERSION_ID is used instead of VERSION, as it is a lower-case string (mostly numeric, no spaces or other characters outside of 0-9, a-z, ".", "_" and "-") DEBUG: remove quotes

vrutkovs force-pushed the quote_id_label branch from 13fd14a to 17f988e Compare March 19, 2019 17:45

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 19, 2019

runcom mentioned this pull request Mar 20, 2019

test/e2e: wait longer for reboots #563

Merged

openshift-merge-robot merged commit 7beeb5c into openshift:master Mar 20, 2019

vrutkovs mentioned this pull request Mar 20, 2019

Merge of 4.1 development openshift/openshift-ansible#11358

Merged

kubelet: quote values in node.openshift.io/os_id label, use VERSION_ID instead of VERSION #549

kubelet: quote values in node.openshift.io/os_id label, use VERSION_ID instead of VERSION #549

Uh oh!

Conversation

vrutkovs commented Mar 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vrutkovs commented Mar 13, 2019

Uh oh!

vrutkovs commented Mar 13, 2019

Uh oh!

runcom commented Mar 13, 2019

Uh oh!

rphillips commented Mar 13, 2019

Uh oh!

vrutkovs commented Mar 13, 2019

Uh oh!

vrutkovs commented Mar 13, 2019

Uh oh!

rphillips commented Mar 13, 2019

Uh oh!

vrutkovs commented Mar 13, 2019

Uh oh!

vrutkovs commented Mar 13, 2019

Uh oh!

sdodson commented Mar 13, 2019

Uh oh!

kikisdeliveryservice commented Mar 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vrutkovs commented Mar 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vrutkovs commented Mar 14, 2019

Uh oh!

vrutkovs commented Mar 14, 2019

Uh oh!

rphillips commented Mar 14, 2019

Uh oh!

vrutkovs commented Mar 14, 2019

Uh oh!

sdodson commented Mar 14, 2019

Uh oh!

openshift-bot commented Mar 19, 2019

Uh oh!

mtnbikenc commented Mar 19, 2019

Uh oh!

openshift-bot commented Mar 19, 2019

Uh oh!

vrutkovs commented Mar 19, 2019

Uh oh!

openshift-bot commented Mar 19, 2019

Uh oh!

kikisdeliveryservice commented Mar 19, 2019

Uh oh!

kikisdeliveryservice commented Mar 19, 2019

Uh oh!

kikisdeliveryservice commented Mar 19, 2019

Uh oh!

openshift-ci-robot commented Mar 19, 2019

Uh oh!

sdodson commented Mar 19, 2019

Uh oh!

openshift-bot commented Mar 20, 2019

Uh oh!

openshift-bot commented Mar 20, 2019

Uh oh!

openshift-bot commented Mar 20, 2019

Uh oh!

vrutkovs commented Mar 20, 2019

Uh oh!

vrutkovs commented Mar 20, 2019

Uh oh!

sdodson commented Mar 20, 2019

Uh oh!

openshift-ci-robot commented Mar 20, 2019

Uh oh!

openshift-ci-robot commented Mar 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vrutkovs commented Mar 13, 2019 •

edited

Loading

kikisdeliveryservice commented Mar 13, 2019 •

edited

Loading

vrutkovs commented Mar 14, 2019 •

edited

Loading

openshift-ci-robot commented Mar 20, 2019 •

edited

Loading