CORS-2604: tag user-provided azure vnet #7611

flavianmissi · 2023-10-19T10:51:59Z

Looks like tagging subnets in Azure is not supported (launch reference):

level=error
level=error msg=Error: Unsupported argument
level=error
level=error msg=  on vnet.tf line 26, in resource "azurerm_subnet" "master_subnet":
level=error msg=  26:   tags                 = "${var.cluster_id}-master-subnet"
level=error
level=error msg=An argument named "tags" is not expected here.
level=error
level=error msg=Error: Unsupported argument
level=error
level=error msg=  on vnet.tf line 39, in resource "azurerm_subnet" "worker_subnet":
level=error msg=  39:   tags                 = "${var.cluster_id}-worker-subnet"
level=error
level=error msg=An argument named "tags" is not expected here.
panic: runtime error: invalid memory address or nil pointer dereference

flavianmissi · 2023-10-30T10:54:34Z

/test e2e-azurestack

openshift-ci-robot · 2023-10-30T10:55:13Z

@flavianmissi: This pull request references CORS-2604 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 story to target either version "4.15." or "openshift-4.15.", but it targets "openshift-4.14" instead.

In 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 kubernetes/test-infra repository.

openshift-ci-robot · 2023-10-30T10:55:41Z

@flavianmissi: This pull request references CORS-2604 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 story to target either version "4.15." or "openshift-4.15.", but it targets "openshift-4.14" instead.

In response to this:

Looks like tagging subnets in Azure is not supported.

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 · 2023-10-30T10:58:29Z

@flavianmissi: This pull request references CORS-2604 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 story to target either version "4.15." or "openshift-4.15.", but it targets "openshift-4.14" instead.

In response to this:

Looks like tagging subnets in Azure is not supported (launch reference):

level=error
level=error msg=Error: Unsupported argument
level=error
level=error msg=  on vnet.tf line 26, in resource "azurerm_subnet" "master_subnet":
level=error msg=  26:   tags                 = "${var.cluster_id}-master-subnet"
level=error
level=error msg=An argument named "tags" is not expected here.
level=error
level=error msg=Error: Unsupported argument
level=error
level=error msg=  on vnet.tf line 39, in resource "azurerm_subnet" "worker_subnet":
level=error msg=  39:   tags                 = "${var.cluster_id}-worker-subnet"
level=error
level=error msg=An argument named "tags" is not expected here.
panic: runtime error: invalid memory address or nil pointer dereference

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.

patrickdillon · 2023-11-03T17:55:12Z

Installer-created vnets are already tagged with the owned value

installer/data/data/azure/vnet/main.tf

Lines 2 to 7 in 0840dd7

    
           tags = merge( 
        
             { 
        
               "kubernetes.io_cluster.${var.cluster_id}" = "owned" 
        
             }, 
        
             var.azure_extra_tags, 
        
           )

I think what the installer is missing, is tagging user provided vnets.

We do it in AWS here:
https://github.com/openshift/installer/blob/361c6aaa6667c48d6effbc66e369c47a8ff34378/pkg/asset/cluster/aws/aws.go#L36C16-L42

pkg/asset/cluster/azure/azure.go

flavianmissi · 2023-11-06T15:00:08Z

I have not tested the code here yet - I'm actually not sure how.
@patrickdillon are there any automated tests that cover the PreTerraform functionality, e2e or otherwise?

patrickdillon · 2023-11-06T17:23:49Z

I have not tested the code here yet - I'm actually not sure how. @patrickdillon are there any automated tests that cover the PreTerraform functionality, e2e or otherwise?

e2e-azure-ovn-shared-vpc should be the one.

flavianmissi · 2023-11-07T11:12:31Z

/test golint

flavianmissi · 2023-11-08T10:47:58Z

/retest

flavianmissi · 2023-11-08T13:47:53Z

/test okd-e2e-aws-ovn-upgrade

flavianmissi · 2023-11-09T08:18:00Z

/test e2e-azurestack

patrickdillon · 2023-11-10T18:03:53Z

/test e2e-azurestack

azurestack e2e is permafailing. Installs are working, but some of the e2e tests for non-installer related reasons.

in preparation for vnet code for tagging

comment taken from openshift@ebd7ee6

r4f4

/lgtm

jhixson74 · 2023-11-22T21:37:51Z

/lgtm

jhixson74 · 2023-11-22T21:39:14Z

/test e2e-azure-ovn
/test e2e-azure-oven-shared-vpc

r4f4 · 2023-11-23T08:54:43Z

azure-ovn-shared-vpc:

during install:

time="2023-11-22T16:59:29Z" level=debug msg="Tagging do-not-delete-shared-vnet-eastus with kubernetes.io_cluster.ci-op-p5pppcf3-51d74-674fk: shared"

during destroy:

time="2023-11-22T19:14:45Z" level=debug msg="removing shared tag from resource \"do-not-delete-shared-vnet-eastus\"" resource=do-not-delete-shared-vnet-eastus type=microsoft.network/virtualnetworks
time="2023-11-22T19:14:46Z" level=info msg="removed shared tag" resource=do-not-delete-shared-vnet-eastus type=microsoft.network/virtualnetworks

/approve

openshift-ci · 2023-11-23T08:55:39Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: r4f4

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:

~~OWNERS~~ [r4f4]

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

flavianmissi · 2023-11-23T09:23:59Z

/retest

r4f4 · 2023-11-23T15:55:47Z

/skip

r4f4 · 2023-11-23T15:58:23Z

/label acknowledge-critical-fixes-only

openshift-ci-robot · 2023-11-23T20:30:18Z

/retest-required

Remaining retests: 0 against base HEAD e2d6013 and 2 for PR HEAD ca2d65e in total

openshift-ci · 2023-11-24T00:25:54Z

@flavianmissi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/altinfra-e2e-aws-ovn-upi	`2fd4061`	link	true	`/test altinfra-e2e-aws-ovn-upi`
ci/prow/okd-e2e-aws-ovn-upgrade	`ca2d65e`	link	false	`/test okd-e2e-aws-ovn-upgrade`
ci/prow/e2e-azurestack	`ca2d65e`	link	false	`/test e2e-azurestack`

Full PR test history. Your PR dashboard.

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-bot · 2023-11-24T04:27:45Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-installer-altinfra-container-v4.15.0-202311240233.p0.g1488a19.assembly.stream for distgit ose-installer-altinfra.
All builds following this will include this PR.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 19, 2023

openshift-ci bot requested review from jhixson74 and mtulio October 19, 2023 10:55

flavianmissi force-pushed the CORS-2604 branch from 68f17d7 to 0840dd7 Compare October 24, 2023 09:13

flavianmissi changed the title ~~WIP: tag azure vnet and subnet~~ WIP: CORS-2604: tag azure vnet and subnet Oct 30, 2023

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 30, 2023

flavianmissi changed the title ~~WIP: CORS-2604: tag azure vnet and subnet~~ WIP: CORS-2604: tag azure vnet Oct 30, 2023

flavianmissi force-pushed the CORS-2604 branch from 0840dd7 to 6490c7f Compare November 6, 2023 14:53

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2023

flavianmissi commented Nov 6, 2023

View reviewed changes

pkg/asset/cluster/azure/azure.go Show resolved Hide resolved

flavianmissi force-pushed the CORS-2604 branch from 6490c7f to 15227fe Compare November 6, 2023 14:59

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2023

flavianmissi force-pushed the CORS-2604 branch from 15227fe to d58b505 Compare November 6, 2023 15:38

flavianmissi force-pushed the CORS-2604 branch from d58b505 to 3a5de77 Compare November 7, 2023 10:20

flavianmissi force-pushed the CORS-2604 branch from 3a5de77 to 2fd4061 Compare November 8, 2023 09:47

flavianmissi changed the title ~~WIP: CORS-2604: tag azure vnet~~ CORS-2604: tag shared azure vnet Nov 8, 2023

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 8, 2023

flavianmissi changed the title ~~CORS-2604: tag shared azure vnet~~ CORS-2604: tag user-provided azure vnet Nov 8, 2023

flavianmissi force-pushed the CORS-2604 branch from 6e325b4 to dccdea6 Compare November 22, 2023 08:32

flavianmissi added 5 commits November 22, 2023 15:56

pkg/asset/cluster/azure: split resource group tagging code

eaca64e

in preparation for vnet code for tagging

pkg/asset/cluster/azure: tag user provided vnet

1917318

add armnetwork so that we can tag user provided azure vnet

a085cca

pkg/asset/cluster/azure: comment on reason for using owned tag

ba2be90

comment taken from openshift@ebd7ee6

pkg/asset/cluster/azure: use fmt.Errorf instead of errors.Wrap

2b5041a

flavianmissi force-pushed the CORS-2604 branch from dccdea6 to 5e38047 Compare November 22, 2023 14:57

flavianmissi added 3 commits November 22, 2023 15:59

pkg/destroy/azure: remove shared tag from resources on destroy

c9b74e3

add azure resourcegraph pkg

0ca9eef

vendor azure armresources sdk for tag management

ca2d65e

flavianmissi force-pushed the CORS-2604 branch from 5e38047 to ca2d65e Compare November 22, 2023 15:00

r4f4 reviewed Nov 22, 2023

View reviewed changes

openshift-ci bot assigned r4f4 Nov 22, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 22, 2023

openshift-ci bot assigned jhixson74 Nov 22, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 23, 2023

openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Nov 23, 2023

openshift-merge-bot bot merged commit 1488a19 into openshift:master Nov 24, 2023
25 checks passed

flavianmissi deleted the CORS-2604 branch November 24, 2023 07:46

jinyunma mentioned this pull request Nov 30, 2023

auto case OCP-69092 openshift/release#46179

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CORS-2604: tag user-provided azure vnet #7611

CORS-2604: tag user-provided azure vnet #7611

flavianmissi commented Oct 19, 2023 •

edited

flavianmissi commented Oct 30, 2023

openshift-ci-robot commented Oct 30, 2023 •

edited by openshift-ci bot

openshift-ci-robot commented Oct 30, 2023 •

edited by openshift-ci bot

openshift-ci-robot commented Oct 30, 2023 •

edited by openshift-ci bot

patrickdillon commented Nov 3, 2023

flavianmissi commented Nov 6, 2023

patrickdillon commented Nov 6, 2023

flavianmissi commented Nov 7, 2023

flavianmissi commented Nov 8, 2023

flavianmissi commented Nov 8, 2023

flavianmissi commented Nov 9, 2023

patrickdillon commented Nov 10, 2023

r4f4 left a comment

jhixson74 commented Nov 22, 2023

jhixson74 commented Nov 22, 2023

r4f4 commented Nov 23, 2023

openshift-ci bot commented Nov 23, 2023

flavianmissi commented Nov 23, 2023

r4f4 commented Nov 23, 2023

r4f4 commented Nov 23, 2023

openshift-ci-robot commented Nov 23, 2023

openshift-ci bot commented Nov 24, 2023

openshift-bot commented Nov 24, 2023

CORS-2604: tag user-provided azure vnet #7611

CORS-2604: tag user-provided azure vnet #7611

Conversation

flavianmissi commented Oct 19, 2023 • edited

flavianmissi commented Oct 30, 2023

openshift-ci-robot commented Oct 30, 2023 • edited by openshift-ci bot

openshift-ci-robot commented Oct 30, 2023 • edited by openshift-ci bot

openshift-ci-robot commented Oct 30, 2023 • edited by openshift-ci bot

patrickdillon commented Nov 3, 2023

flavianmissi commented Nov 6, 2023

patrickdillon commented Nov 6, 2023

flavianmissi commented Nov 7, 2023

flavianmissi commented Nov 8, 2023

flavianmissi commented Nov 8, 2023

flavianmissi commented Nov 9, 2023

patrickdillon commented Nov 10, 2023

r4f4 left a comment

Choose a reason for hiding this comment

jhixson74 commented Nov 22, 2023

jhixson74 commented Nov 22, 2023

r4f4 commented Nov 23, 2023

openshift-ci bot commented Nov 23, 2023

flavianmissi commented Nov 23, 2023

r4f4 commented Nov 23, 2023

r4f4 commented Nov 23, 2023

openshift-ci-robot commented Nov 23, 2023

openshift-ci bot commented Nov 24, 2023

openshift-bot commented Nov 24, 2023

flavianmissi commented Oct 19, 2023 •

edited

openshift-ci-robot commented Oct 30, 2023 •

edited by openshift-ci bot

openshift-ci-robot commented Oct 30, 2023 •

edited by openshift-ci bot

openshift-ci-robot commented Oct 30, 2023 •

edited by openshift-ci bot