Alibaba: Update tag and API types to mirror other providers #5381

kwoodson · 2021-11-12T21:33:47Z

Work summary:

Update vendor dependent libraries to no longer depend on machine-api-operator's machine api
Updating the tag types used to search for provider objects
Remove DNS entry for *.apps. This is created by the ingress-operator.

staebler · 2021-11-16T02:33:11Z

I am going to assume that this is a WIP PR since it includes numerous disjoint changes and a vendor of a personal repo.

/retitle [WIP] Alibaba: Update tag types to mirror other providers

kwoodson · 2021-11-16T20:22:15Z

@staebler Thanks, I should have tidied this up. I'm waiting for the mapi to update and then this one is eligible.

kwoodson · 2021-11-17T15:17:43Z

@staebler @patrickdillon I was awaiting changes to land in the cluster-api-provider-alibaba repository (openshift/cluster-api-provider-alibaba#12). These changes landed and in order to get the changes to fit I had to refactor and remove the machine api libraries from the other providers.

Please let me know if you have any questions. Thanks!

kwoodson · 2021-11-17T16:23:49Z

Seems like cluster was still installing but test timed out (ovirt)?

fail [github.com/onsi/ginkgo@v4.7.0-origin.0+incompatible/internal/leafnodes/runner.go:113]: Nov 12 22:31:42.482: ClusterVersion Progressing=True: : Working towards 4.10.0-0.ci.test-2021-11-12-220056-ci-op-s4nky6rq-latest: 705 of 773 done (91% complete)

kwoodson · 2021-11-17T17:24:27Z

/test e2e-aws-upgrade

kwoodson · 2021-11-17T20:11:19Z

/retest

staebler

The last commit seems unrelated to tagging.

The other commits could use some elaboration in their commits messages. For example, "update and simplify tag types" does not tell me anything about how or why the tag types are being updated or simplified.

staebler · 2021-11-18T04:24:04Z

pkg/asset/machines/master.go

@@ -544,7 +542,7 @@ func (m *Master) Machines() ([]machineapi.Machine, error) {
 	libvirtapi.AddToScheme(scheme)
 	openstackapi.AddToScheme(scheme)
 	ovirtproviderapi.AddToScheme(scheme)
-	vsphereapi.AddToScheme(scheme)
+	machineapi.AddToScheme(scheme)


See #5350 (review) for why this won't work.

@staebler Since there are multiple PRs attempting to solve this issue, what do you recommend?

@kirankt is working on it. I recommend waiting for his fix. Is this something that is blocking this PR?

@staebler The issue here is that the cluster-api-provider-alibaba requires a newer version of the machine-api-operator. The vsphere provider requires an older version. Those conflict based upon the machine libraries moving to openshift/api. There might be some go.mod pinning to work around this but I wanted to provide the correct fix by cleaning up the installer dependencies and moving the requirement to openshift/api. I will wait to see what @kirankt comes up with unless you have a suggestion.

I don't have a good solution. The recent vendoring brought back MAO probably because of cap-alibaba deps.

@kirankt The issue here isn't cap-Alibaba. The dependency for mao in cap-Alibaba is recent. The issue is we need to clean up the vsphere libraries. The vsphere and openstack caps depend on the older version. I created merged PRs in both of those repositories to update the mao dependency.

@kirankt I checked out your PR. It appears that you are adding the scheme and addressing @staebler's feedback. I'll await your changes and will rebase when yours completes. Thanks

kwoodson · 2021-11-18T04:56:21Z

@staebler I have updated the commit message and removed the last commit and created a new PR #5396

kwoodson · 2021-11-22T22:00:29Z

Awaiting #5350 and then will clean this PR up.

staebler · 2021-11-24T03:29:17Z

pkg/types/alibabacloud/machinepool.go

 	// +optional
-	SystemDiskSize int `json:"systemDiskSize,omitempty"`
+	SystemDisk machinev1.SystemDiskProperties `json:"systemDisk,omitempty"`


Is this change intentional? There is no mention of it in the commit description. Generally, it is discouraged to use a type defined elsewhere in the install config. Doing so makes it much more difficult to ensure the API stability of the install config.

It was intentional to align with the new API types. I have gone back and replaced it with what was previously there from your comments.

staebler · 2021-11-24T03:49:57Z

go.mod

 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.22.2
-	k8s.io/apiextensions-apiserver v0.21.0-rc.0
+	k8s.io/apiextensions-apiserver v0.22.0-rc.0


If we are changing this anyway, we may as well change it to v0.22.2 so that it matches the version of k8s.io/api that we are using.

Suggested change

k8s.io/apiextensions-apiserver v0.22.0-rc.0

k8s.io/apiextensions-apiserver v0.22.2

staebler · 2021-11-24T21:02:00Z

/lgtm
/approve

kwoodson · 2021-11-24T21:02:07Z

Updated vendor to resolve conflicts.

staebler · 2021-11-24T21:03:17Z

/lgtm cancel
I think you have merge conflicts now, probably against #5402.

staebler · 2021-11-24T21:04:26Z

go.mod

 	github.com/openshift/machine-config-operator v0.0.0
 	github.com/ovirt/go-ovirt v0.0.0-20210308100159-ac0bcbc88d7c
 	github.com/ovirt/terraform-provider-ovirt v0.99.1-0.20211019085223-db1ac552ec57
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/pkg/sftp v1.10.1
+<<<<<<< HEAD


Unresolved conflicts.

I noticed this moved to go 1.17. Updated.

Thanks!

…ating ovirt and openstack. Remove AliyunContainerService/ to openshift/.

…brary. The updates include renaming and replacing the ResourceTagReference as well as modifying the SystemDisk property. The tag update changes the type to an AlibabaResourceReference which is a struct that contains an ID field and a slice of tags. This reduces the need for two separate API fields and simplifies the logic into a single field. The reference can hold the information in which to search for a component inside of the provider or reference it by ID. The SystemDisk info update is an attempt to reduce the surface area of the API and consolidate all information of the SystemDisk into a single struct.

kwoodson · 2021-11-25T04:28:29Z

/test e2e-aws-upgrade

openshift-ci · 2021-11-25T06:24:01Z

@kwoodson: 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/e2e-crc	`03b791c`	link	false	`/test e2e-crc`
ci/prow/e2e-aws-workers-rhel7	`03b791c`	link	false	`/test e2e-aws-workers-rhel7`

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.

kwoodson · 2021-11-29T15:04:36Z

/test e2e-aws-upgrade

kwoodson · 2021-11-29T15:05:03Z

@staebler I fixed the rebase issues from the previous go 1.17 update. Please TAL

staebler · 2021-11-29T17:51:12Z

This looks good to me. I'd like to see a successful openstack and ovirt e2e job. The e2e-ovirt history looks pretty bad, unrelated to this PR. We should be able to get a successful openstack job (note that the openshift-kuryr job was successful).

/test e2e-openstack
/test e2e-ovirt

kwoodson · 2021-11-29T20:33:58Z

@staebler Looks like e2e-{ovirt,openstack} are now passing. Mind bumping this along?

staebler · 2021-11-29T20:36:06Z

/lgtm
/approve

openshift-ci · 2021-11-29T20:36:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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~~ [staebler]

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

openshift-bot · 2021-11-29T21:43:37Z

/retest-required

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

openshift-bot · 2021-11-29T21:52:17Z

/retest-required

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

openshift-bot · 2021-11-29T22:04:20Z

/retest-required

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

zhouhao3 · 2021-12-14T08:25:24Z

Hi @kwoodson Is there any special use for specifying the version of gophercloud in gomod? I noticed that you updated the version of gophercloud and then specified the version of gophercloud below.

kwoodson · 2021-12-14T20:50:45Z

Hi @kwoodson Is there any special use for specifying the version of gophercloud in gomod? I noticed that you updated the version of gophercloud and then specified the version of gophercloud below.
@zhouhao3 Not specifically. I believe it was a dependency of another module.

kwoodson requested a review from patrickdillon November 12, 2021 21:33

kwoodson changed the title ~~Update tag types to mirror other providers~~ Alibaba: Update tag types to mirror other providers Nov 12, 2021

openshift-ci bot requested a review from jhixson74 November 12, 2021 21:34

kwoodson mentioned this pull request Nov 12, 2021

vSwitch and SecurityGroup query refactor openshift/cluster-api-provider-alibaba#12

Merged

kwoodson force-pushed the tag_refactor branch from 8632a9c to 2419362 Compare November 12, 2021 21:44

openshift-ci bot changed the title ~~Alibaba: Update tag types to mirror other providers~~ [WIP] Alibaba: Update tag types to mirror other providers Nov 16, 2021

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 Nov 16, 2021

kwoodson force-pushed the tag_refactor branch from 2419362 to 0b12357 Compare November 17, 2021 14:50

kwoodson changed the title ~~[WIP] Alibaba: Update tag types to mirror other providers~~ Alibaba: Update tag types to mirror other providers Nov 17, 2021

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 17, 2021

kwoodson force-pushed the tag_refactor branch from 0b12357 to a91dda4 Compare November 17, 2021 15:13

kwoodson requested a review from staebler November 17, 2021 15:14

staebler reviewed Nov 18, 2021

View reviewed changes

kwoodson force-pushed the tag_refactor branch from a91dda4 to d7d5876 Compare November 18, 2021 04:51

kwoodson force-pushed the tag_refactor branch from d7d5876 to 0b17090 Compare November 22, 2021 14:42

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2021

kwoodson force-pushed the tag_refactor branch from 0b17090 to 440bd1e Compare November 23, 2021 15:22

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 23, 2021

kwoodson changed the title ~~Alibaba: Update tag types to mirror other providers~~ [WIP] Alibaba: Update tag types to mirror other providers Nov 23, 2021

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 Nov 23, 2021

kwoodson force-pushed the tag_refactor branch from 440bd1e to 5b62e9e Compare November 23, 2021 22:58

staebler reviewed Nov 24, 2021

View reviewed changes

kwoodson force-pushed the tag_refactor branch from dfdb48a to 556d97e Compare November 24, 2021 21:00

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 24, 2021

kwoodson force-pushed the tag_refactor branch from 556d97e to 25fc197 Compare November 24, 2021 21:01

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 24, 2021

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

openshift-ci bot assigned staebler Nov 24, 2021

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

staebler reviewed Nov 24, 2021

View reviewed changes

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2021

Kenny Woodson added 2 commits November 24, 2021 17:52

Vendor update: remove dependencies on the machine-api-operator by upd…

9433c30

…ating ovirt and openstack. Remove AliyunContainerService/ to openshift/.

kwoodson force-pushed the tag_refactor branch from 25fc197 to 03b791c Compare November 24, 2021 22:53

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

openshift-merge-robot merged commit 5b1a300 into openshift:master Nov 29, 2021

	k8s.io/apiextensions-apiserver v0.22.0-rc.0
	k8s.io/apiextensions-apiserver v0.22.2

Alibaba: Update tag and API types to mirror other providers #5381

Alibaba: Update tag and API types to mirror other providers #5381

Conversation

kwoodson commented Nov 12, 2021 • edited Loading

staebler commented Nov 16, 2021

kwoodson commented Nov 16, 2021

kwoodson commented Nov 17, 2021

kwoodson commented Nov 17, 2021

kwoodson commented Nov 17, 2021

kwoodson commented Nov 17, 2021

staebler left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kwoodson commented Nov 18, 2021

kwoodson commented Nov 22, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

staebler commented Nov 24, 2021

kwoodson commented Nov 24, 2021

staebler commented Nov 24, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kwoodson commented Nov 25, 2021

openshift-ci bot commented Nov 25, 2021 • edited Loading

kwoodson commented Nov 29, 2021

kwoodson commented Nov 29, 2021

staebler commented Nov 29, 2021

kwoodson commented Nov 29, 2021

staebler commented Nov 29, 2021

openshift-ci bot commented Nov 29, 2021

openshift-bot commented Nov 29, 2021

openshift-bot commented Nov 29, 2021

openshift-bot commented Nov 29, 2021

zhouhao3 commented Dec 14, 2021

kwoodson commented Dec 14, 2021 • edited Loading

kwoodson commented Nov 12, 2021 •

edited

Loading

openshift-ci bot commented Nov 25, 2021 •

edited

Loading

kwoodson commented Dec 14, 2021 •

edited

Loading