CORS-2890: aws/machines: add CAPI sg, subnet filters#8006
Conversation
Adds filters to the machine api machinesets so they will recognize CAPI-created security groups and subnets. Adds these filters in addition to the Terraform-specific filters, which should be subsequently removed.
openshift-ci-robot
added
the
jira/valid-reference
|
@patrickdillon: This pull request references CORS-2890 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.16.0" version, but no target version was set. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
pkg/asset/machines/aws/machines.go
Outdated
| if in.role == "master" { | ||
| cpFilter := machineapi.Filter{ | ||
| Name: "tag:Name", | ||
| Values: []string{fmt.Sprintf("%s-controlplane", in.clusterID)}} |
There was a problem hiding this comment.
Nit:
| Values: []string{fmt.Sprintf("%s-controlplane", in.clusterID)}} | |
| Values: []string{fmt.Sprintf("%s-controlplane", in.clusterID)}, | |
| } |
|
/lgtm |
|
/approve |
openshift-ci
bot
added
the
tide/merge-method-squash
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: patrickdillon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
lgtm
|
@patrickdillon: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
A previous commit revendored installer which picked up openshift/installer#8006 which adds two default security group filters. We need to take this into account when the `extra-worker-security-group` annotation is in play, as we need to add that additional SG name and its VPC filter to *all* the SecurityGroups in the worker MachineSets. This needs to be done both for day 0 (install manager) and day 2 (MachinePool controller). Carried along with HIVE-2476
A previous commit revendored installer which picked up openshift/installer#8006 which adds two default security group filters. We need to take this into account when the `extra-worker-security-group` annotation is in play, as we need to add that additional SG name and its VPC filter to *all* the SecurityGroups in the worker MachineSets. This needs to be done both for day 0 (install manager) and day 2 (MachinePool controller). Carried along with HIVE-2476
3 participants
Adds filters to the machine api machinesets so they will recognize CAPI-created security groups and subnets. Adds these filters in addition to the Terraform-specific filters, which should be subsequently removed.