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

Bug 1866881: Filter Name/Cluster instance tags #343

Merged

Conversation

michaelgugino
Copy link

Currently, users can specify whatever instance tags they want
for a machineSpec. While we attempt to remove duplicates,
this results in us removing the proper values instead of
the user supplied ones.

This commit ensures we always set the proper values
for Name and cluster tags on instances.

@michaelgugino michaelgugino changed the title Filter Name/Cluster instance tags Bug 1866881: Filter Name/Cluster instance tags Aug 6, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. label Aug 6, 2020
@openshift-ci-robot
Copy link

@michaelgugino: This pull request references Bugzilla bug 1866881, which is invalid:

  • expected the bug to target the "4.6.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1866881: Filter Name/Cluster instance tags

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 openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 6, 2020
@michaelgugino
Copy link
Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/severity-unspecified Referenced Bugzilla bug's severity is unspecified for the PR. labels Aug 7, 2020
@openshift-ci-robot
Copy link

@michaelgugino: This pull request references Bugzilla bug 1866881, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla refresh

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 openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Aug 7, 2020
rawTagList := []*ec2.Tag{}
for _, tag := range machineTags {
// AWS tags are case sensitive, so we don't need to worry about other casing of "Name"
if !strings.HasPrefix(tag.Name, "kubernetes.io/cluster/") && tag.Name != "Name" {

Choose a reason for hiding this comment

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

Do we want to reserve the whole of kubernetes.io/cluster/*****? Why not just make sure it's not matching the cluster ID?

Copy link
Author

Choose a reason for hiding this comment

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

Yeah, I thought about it, and I think we should. Because if someone copied a machineset from another cluster and applied it to one in the same account, bad things could happen.

pkg/actuators/machine/instances_test.go Outdated Show resolved Hide resolved
Currently, users can specify whatever instance tags they want
for a machineSpec.  While we attempt to remove duplicates,
this results in us removing the proper values instead of
the user supplied ones.

This commit ensures we always set the proper values
for Name and cluster tags on instances.
@JoelSpeed
Copy link

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

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:

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2020
Copy link

@alexander-demicev alexander-demicev left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2020
@openshift-bot
Copy link

/retest

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

1 similar comment
@openshift-bot
Copy link

/retest

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

@JoelSpeed
Copy link

/test e2e-aws-operator

@openshift-bot
Copy link

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit e3a8dfc into openshift:master Aug 18, 2020
@openshift-ci-robot
Copy link

@michaelgugino: All pull requests linked via external trackers have merged: openshift/cluster-api-provider-aws#343. Bugzilla bug 1866881 has been moved to the MODIFIED state.

In response to this:

Bug 1866881: Filter Name/Cluster instance tags

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants