Move to libraries to openshift/api by kwoodson · Pull Request #20 · openshift/cluster-api-provider-alibaba

kwoodson · 2021-11-29T18:03:00Z

This PR allows us to move our libraries to openshift/api from cluster-api-provider-alibaba. This depends on github.com/openshift/api/pull/1045.

Summary

Remove API and generated files
Plumb partially existing fields
Update vendor

go.mod

pkg/actuators/machine/instances.go

kwoodson · 2021-11-30T06:35:50Z

Tested this change. Everything looked healthy.

NAME                                 STATUS   ROLES    AGE     VERSION
test-kdlxs-master-0                  Ready    master   19m     v1.22.1+bac83a5
test-kdlxs-master-1                  Ready    master   20m     v1.22.1+bac83a5
test-kdlxs-master-2                  Ready    master   25s     v1.22.1+bac83a5
test-kdlxs-worker-us-east-1a-dqr7r   Ready    worker   7m38s   v1.22.1+bac83a5
test-kdlxs-worker-us-east-1b-rdkhq   Ready    worker   8m32s   v1.22.1+bac83a5
test-kdlxs-worker-us-east-1b-ttqsr   Ready    worker   8m10s   v1.22.1+bac83a5
NAME                                 PHASE     TYPE            REGION	   ZONE         AGE
test-kdlxs-master-0                  Running   ecs.g6.xlarge   us-east-1   us-east-1b   21m
test-kdlxs-master-1                  Running   ecs.g6.xlarge   us-east-1   us-east-1a   21m
test-kdlxs-master-2                  Running   ecs.g6.xlarge   us-east-1   us-east-1b   21m
test-kdlxs-worker-us-east-1a-dqr7r   Running   ecs.g6.large    us-east-1   us-east-1a   14m
test-kdlxs-worker-us-east-1b-rdkhq   Running   ecs.g6.large    us-east-1   us-east-1b   14m

JoelSpeed

Changes here look good, just need to wait for 1045 to merge on the API side

kwoodson · 2021-11-30T19:39:22Z

Cleaned up openshift/api/pull/1045 and tested:

NAME                                 STATUS   ROLES    AGE     VERSION
test-q92hx-master-0                  Ready    master   18m     v1.22.1+bac83a5
test-q92hx-master-1                  Ready    master   17m     v1.22.1+bac83a5
test-q92hx-master-2                  Ready    master   19m     v1.22.1+bac83a5
test-q92hx-worker-us-east-1a-wwznl   Ready    worker   5m3s    v1.22.1+bac83a5
test-q92hx-worker-us-east-1b-lmtvq   Ready    worker   3m39s   v1.22.1+bac83a5
test-q92hx-worker-us-east-1b-z5kb7   Ready    worker   5m54s   v1.22.1+bac83a5
NAME                                 PHASE     TYPE            REGION      ZONE         AGE
test-q92hx-master-0                  Running   ecs.g6.xlarge   us-east-1   us-east-1b   20m
test-q92hx-master-1                  Running   ecs.g6.xlarge   us-east-1   us-east-1a   20m
test-q92hx-master-2                  Running   ecs.g6.xlarge   us-east-1   us-east-1b   20m
test-q92hx-worker-us-east-1a-wwznl   Running   ecs.g6.large    us-east-1   us-east-1a   12m
test-q92hx-worker-us-east-1b-lmtvq   Running   ecs.g6.large    us-east-1   us-east-1b   12m
test-q92hx-worker-us-east-1b-z5kb7   Running   ecs.g6.large    us-east-1   us-east-1b   12m

elmiko

the machine object is still at v1beta1, otherwise looks good

elmiko · 2021-12-06T21:11:56Z

README.md


   ```yaml
-   apiVersion: machine.openshift.io/v1beta1
+   apiVersion: machine.openshift.io/v1


this would stay at v1beta1

elmiko · 2021-12-06T21:34:23Z

config/master-machine.yaml

  providerSpec:
    value:
-      apiVersion: alibabacloudproviderconfig.openshift.io/v1alpha1
+      apiVersion: alibabacloudproviderconfig.openshift.io/v1


i'm pretty sure these should be machine.openshift.io/v1 too

i was wrong, looking at aws example here https://docs.openshift.com/container-platform/4.9/machine_management/creating_machinesets/creating-machineset-aws.html

kwoodson · 2021-12-09T19:49:54Z

Working out a few issues from pulling down latest openshift/api. Going to move to go1.17 in #21 and then rebase this PR on top of that one.

kwoodson · 2021-12-10T00:46:57Z

/test vet

JoelSpeed · 2021-12-10T13:04:48Z

CI is running as 1.16 for this repo still, will need to update that for vet to pass

kwoodson · 2021-12-10T15:19:59Z

/test vet

kwoodson · 2021-12-10T22:29:30Z

Latest version installs:

NAME                                 STATUS   ROLES    AGE     VERSION
test-4627z-master-0                  Ready    master   13m     v1.22.1+6859754
test-4627z-master-1                  Ready    master   14m     v1.22.1+6859754
test-4627z-master-2                  Ready	master   14m     v1.22.1+6859754
test-4627z-worker-us-east-1a-74fvh   Ready    worker   2m10s   v1.22.1+6859754
test-4627z-worker-us-east-1b-rt76n   Ready    worker   2m2s    v1.22.1+6859754
test-4627z-worker-us-east-1b-wwxs8   Ready    worker   2m8s    v1.22.1+6859754
NAME                                 PHASE     TYPE            REGION      ZONE         AGE
test-4627z-master-0                  Running   ecs.g6.xlarge   us-east-1   us-east-1b   16m
test-4627z-master-1                  Running   ecs.g6.xlarge   us-east-1   us-east-1a   16m
test-4627z-master-2                  Running   ecs.g6.xlarge   us-east-1   us-east-1b   16m
test-4627z-worker-us-east-1a-74fvh   Running   ecs.g6.large    us-east-1   us-east-1a   10m
test-4627z-worker-us-east-1b-rt76n   Running   ecs.g6.large    us-east-1   us-east-1b   10m
test-4627z-worker-us-east-1b-wwxs8   Running   ecs.g6.large    us-east-1   us-east-1b   10m

kwoodson · 2021-12-10T22:30:24Z

@elmiko @JoelSpeed I think this is ready to go. PTAL

JoelSpeed · 2021-12-13T10:48:15Z

/approve

openshift-ci · 2021-12-13T10:49:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, kwoodson

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

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

kwoodson · 2021-12-13T16:47:45Z

@elmiko @JoelSpeed Is there any reason we run aws tests on this repository?

kwoodson · 2021-12-13T16:48:05Z

/retest

openshift-ci · 2021-12-13T18:33:01Z

@kwoodson: all tests passed!

Full PR test history. Your PR dashboard.

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.

elmiko · 2021-12-13T19:03:45Z

Is there any reason we run aws tests on this repository?

the aws test is like a "sanity check" for us, it allows us to ensure that we aren't breaking the primary payload with our changes. (that said, i know we see flakes there sometimes, but we need to have at least 1 e2e on a known GA platform)

elmiko

thanks Kenny!
/lgtm

kwoodson requested review from JoelSpeed and elmiko November 29, 2021 18:03

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

kwoodson commented Nov 29, 2021

View reviewed changes

go.mod Outdated Show resolved Hide resolved

kwoodson commented Nov 29, 2021

View reviewed changes

pkg/actuators/machine/instances.go Show resolved Hide resolved

kwoodson commented Nov 29, 2021

View reviewed changes

pkg/actuators/machine/instances.go Show resolved Hide resolved

openshift-ci bot requested review from Fedosin and lobziik November 29, 2021 18:05

kwoodson mentioned this pull request Nov 30, 2021

Add a new Tag to identify which partner created the resource #15

Merged

kwoodson changed the title ~~[WIP] Move to libraries to openshift/api~~ Move to libraries to openshift/api Nov 30, 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 30, 2021

JoelSpeed reviewed Nov 30, 2021

View reviewed changes

kwoodson force-pushed the move_to_openshiftapi branch from df2b2da to 767bb8f Compare November 30, 2021 17:01

kwoodson force-pushed the move_to_openshiftapi branch 4 times, most recently from 4d262ef to 0c27273 Compare December 6, 2021 20:43

elmiko reviewed Dec 6, 2021

View reviewed changes

kwoodson force-pushed the move_to_openshiftapi branch from 33b8701 to c5f45b1 Compare December 6, 2021 23:47

kwoodson mentioned this pull request Dec 7, 2021

Machine API: adding Alibaba cloud provider types. openshift/api#1045

Merged

kwoodson force-pushed the move_to_openshiftapi branch from c5f45b1 to f683467 Compare December 7, 2021 14:50

kwoodson force-pushed the move_to_openshiftapi branch from f683467 to c88700e Compare December 9, 2021 21:16

Kenny Woodson added 2 commits December 9, 2021 16:53

Vendor: updating vendor libraries to openshift/api

9fe43a7

Updating code and types to match new openshift/api libraries.

492d5f4

kwoodson force-pushed the move_to_openshiftapi branch from c88700e to 492d5f4 Compare December 9, 2021 21:53

kwoodson mentioned this pull request Dec 10, 2021

Termination handler #18

Closed

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

elmiko reviewed Dec 13, 2021

View reviewed changes

openshift-ci bot assigned elmiko Dec 13, 2021

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

openshift-merge-robot merged commit a748e09 into openshift:main Dec 13, 2021

Comments

Conversation

kwoodson commented Nov 29, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kwoodson commented Nov 30, 2021

Uh oh!

JoelSpeed left a comment

Choose a reason for hiding this comment

Uh oh!

kwoodson commented Nov 30, 2021

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

elmiko Dec 6, 2021

Choose a reason for hiding this comment

Uh oh!

elmiko Dec 6, 2021

Choose a reason for hiding this comment

Uh oh!

elmiko Dec 6, 2021

Choose a reason for hiding this comment

Uh oh!

kwoodson commented Dec 9, 2021

Uh oh!

kwoodson commented Dec 10, 2021

Uh oh!

JoelSpeed commented Dec 10, 2021

Uh oh!

kwoodson commented Dec 10, 2021

Uh oh!

kwoodson commented Dec 10, 2021

Uh oh!

kwoodson commented Dec 10, 2021

Uh oh!

JoelSpeed commented Dec 13, 2021

Uh oh!

openshift-ci bot commented Dec 13, 2021

Uh oh!

kwoodson commented Dec 13, 2021

Uh oh!

kwoodson commented Dec 13, 2021

Uh oh!

openshift-ci bot commented Dec 13, 2021

Uh oh!

elmiko commented Dec 13, 2021

Uh oh!

elmiko left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants