MGMT-14838: Use CAPI Agent new v1beta1 APIs #86

CrystalChun · 2023-09-19T16:25:38Z

https://issues.redhat.com/browse/MGMT-14838

https://issues.redhat.com//browse/MGMT-14838

openshift-ci-robot · 2023-09-19T16:25:41Z

@CrystalChun: This pull request references MGMT-14838 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 task to target the "4.15.0" version, but no target version was set.

In response to this:

https://issues.redhat.com/browse/MGMT-14838

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.

CrystalChun · 2023-09-19T16:25:51Z

/test ?

openshift-ci · 2023-09-19T16:27:43Z

@CrystalChun: The following commands are available to trigger required jobs:

/test build
/test e2e-ai-operator-ztp-capi
/test images
/test mce-images
/test unit-test

Use /test all to run all jobs.

In response to this:

/test ?

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 · 2023-09-19T16:28:02Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CrystalChun

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

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

https://issues.redhat.com/browse/MGMT-14838 v1beta1 upgrade introduced upgraded dependencies.

CrystalChun · 2023-09-19T17:25:36Z

/test unit-test

CrystalChun · 2023-09-20T21:26:41Z

Makefile

@@ -165,7 +165,7 @@ mockgen: ## Download mockgen locally if necessary.

 GOLINT = $(shell pwd)/bin/golangci-lint
 golint: ## Download golangci-lint locally if necessary.
-	$(call go-get-tool,$(GOLINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2)
+	$(call go-get-tool,$(GOLINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.0)


Later version of linter is needed for updated dependencies

CrystalChun · 2023-09-23T23:02:23Z

/uncc @avishayt @carbonin

CrystalChun · 2023-09-23T23:02:29Z

/cc @eranco74 @filanov

Dockerfile

CrystalChun · 2023-09-25T16:25:11Z

/retest

CrystalChun · 2023-09-26T03:19:23Z

Jobs are failing because CI uses golang 1.17 and the new dependencies require a higher golang version

PR in release repo to upgrade to golang 1.20 openshift/release#43518

CrystalChun · 2023-09-26T14:26:18Z

/retest

https://issues.redhat.com/browse/MGMT-14838 These code changes are needed after upgrading some dependencies in the previous commit.

CrystalChun · 2023-09-29T19:59:14Z

controllers/agentcluster_controller_test.go

@@ -147,7 +147,8 @@ var _ = Describe("agentcluster reconcile", func() {
 	)

 	BeforeEach(func() {
-		c = fakeclient.NewClientBuilder().WithScheme(scheme.Scheme).Build()
+		agentCluster := &capiproviderv1.AgentCluster{}
+		c = fakeclient.NewClientBuilder().WithScheme(scheme.Scheme).WithStatusSubresource(agentCluster).Build()


For history, had to add WithStatusSubresource to this because of kubernetes-sigs/controller-runtime#2362 which prevents the status of a resource from being updated during unit tests, causing them to fail.
Change ref: evryfs/github-actions-runner-operator@165da33

CrystalChun · 2023-09-29T20:15:37Z

controllers/agentmachine_controller_test.go

@@ -209,7 +209,8 @@ var _ = Describe("agentmachine reconcile", func() {
 	)

 	BeforeEach(func() {
-		c = fakeclient.NewClientBuilder().WithScheme(scheme.Scheme).Build()
+		agentMachine := &capiproviderv1.AgentMachine{}
+		c = fakeclient.NewClientBuilder().WithScheme(scheme.Scheme).WithStatusSubresource(agentMachine).Build()


For history, had to add WithStatusSubresource to this because of kubernetes-sigs/controller-runtime#2362 which prevents the status of a resource from being updated during unit tests, causing them to fail.
Change ref: evryfs/github-actions-runner-operator@165da33

CrystalChun · 2023-09-29T23:16:59Z

Note: ci/prow/e2e-ai-operator-ztp-capi is still failing because this test relies on hypershift in ocp 4.14 where the APIs haven't been upgraded to v1beta1.

PR to do that is opened here openshift/hypershift#3059

filanov · 2023-10-02T06:03:54Z

/assign @avishayt
/assign @eranco74

CrystalChun · 2023-10-10T04:03:18Z

/retest-required

openshift-ci · 2023-10-10T06:27:03Z

@CrystalChun: all tests passed!

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.

avishayt · 2023-10-11T07:43:15Z

/lgtm

CrystalChun · 2023-10-16T16:52:48Z

/cherry-pick release-ocm-2.9

openshift-cherrypick-robot · 2023-10-16T16:53:34Z

@CrystalChun: new pull request created: #87

In response to this:

/cherry-pick release-ocm-2.9

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.

MGMT-14838: Use new v1beta1 APIs

c28ee53

https://issues.redhat.com//browse/MGMT-14838

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

openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Sep 19, 2023

openshift-ci bot requested review from avishayt and carbonin September 19, 2023 16:27

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

MGMT-14838: Update go.mod and vendor for new API

e2eb88d

https://issues.redhat.com/browse/MGMT-14838 v1beta1 upgrade introduced upgraded dependencies.

CrystalChun force-pushed the upgrade-apis branch from 0c71128 to 14fcc20 Compare September 19, 2023 17:21

CrystalChun marked this pull request as draft September 19, 2023 17:21

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 Sep 19, 2023

CrystalChun force-pushed the upgrade-apis branch from 14fcc20 to c26044d Compare September 20, 2023 20:56

CrystalChun commented Sep 20, 2023

View reviewed changes

CrystalChun force-pushed the upgrade-apis branch from c26044d to a25e0b5 Compare September 23, 2023 23:00

CrystalChun marked this pull request as ready for review September 23, 2023 23:02

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 Sep 23, 2023

openshift-ci bot removed request for avishayt and carbonin September 23, 2023 23:02

openshift-ci bot requested review from eranco74, filanov and osherdp September 23, 2023 23:02

CrystalChun force-pushed the upgrade-apis branch from a25e0b5 to 1d65362 Compare September 23, 2023 23:03

CrystalChun commented Sep 23, 2023

View reviewed changes

Dockerfile Show resolved Hide resolved

CrystalChun force-pushed the upgrade-apis branch from 1d65362 to a3edbbd Compare September 25, 2023 16:36

CrystalChun force-pushed the upgrade-apis branch 2 times, most recently from 924dbd8 to 5be087f Compare September 29, 2023 17:20

MGMT-14838: Required code changes for upgraded dependencies

63e1fdc

https://issues.redhat.com/browse/MGMT-14838 These code changes are needed after upgrading some dependencies in the previous commit.

CrystalChun force-pushed the upgrade-apis branch from 5be087f to 63e1fdc Compare September 29, 2023 17:43

CrystalChun commented Sep 29, 2023

View reviewed changes

openshift-ci bot assigned avishayt and eranco74 Oct 2, 2023

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

openshift-ci bot merged commit a55a6c0 into openshift:master Oct 11, 2023
6 checks passed

openshift-cherrypick-robot mentioned this pull request Oct 16, 2023

[release-ocm-2.9] MGMT-14838: Use CAPI Agent new v1beta1 APIs #87

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MGMT-14838: Use CAPI Agent new v1beta1 APIs #86

MGMT-14838: Use CAPI Agent new v1beta1 APIs #86

CrystalChun commented Sep 19, 2023

openshift-ci-robot commented Sep 19, 2023 •

edited by openshift-ci bot

Loading

CrystalChun commented Sep 19, 2023

openshift-ci bot commented Sep 19, 2023

openshift-ci bot commented Sep 19, 2023

CrystalChun commented Sep 19, 2023

CrystalChun Sep 20, 2023

CrystalChun commented Sep 23, 2023

CrystalChun commented Sep 23, 2023

CrystalChun commented Sep 25, 2023

CrystalChun commented Sep 26, 2023

CrystalChun commented Sep 26, 2023

CrystalChun Sep 29, 2023 •

edited

Loading

CrystalChun Sep 29, 2023

CrystalChun commented Sep 29, 2023

filanov commented Oct 2, 2023

CrystalChun commented Oct 10, 2023

openshift-ci bot commented Oct 10, 2023

avishayt commented Oct 11, 2023

CrystalChun commented Oct 16, 2023

openshift-cherrypick-robot commented Oct 16, 2023

MGMT-14838: Use CAPI Agent new v1beta1 APIs #86

MGMT-14838: Use CAPI Agent new v1beta1 APIs #86

Conversation

CrystalChun commented Sep 19, 2023

openshift-ci-robot commented Sep 19, 2023 • edited by openshift-ci bot Loading

CrystalChun commented Sep 19, 2023

openshift-ci bot commented Sep 19, 2023

openshift-ci bot commented Sep 19, 2023

CrystalChun commented Sep 19, 2023

CrystalChun Sep 20, 2023

Choose a reason for hiding this comment

CrystalChun commented Sep 23, 2023

CrystalChun commented Sep 23, 2023

CrystalChun commented Sep 25, 2023

CrystalChun commented Sep 26, 2023

CrystalChun commented Sep 26, 2023

CrystalChun Sep 29, 2023 • edited Loading

Choose a reason for hiding this comment

CrystalChun Sep 29, 2023

Choose a reason for hiding this comment

CrystalChun commented Sep 29, 2023

filanov commented Oct 2, 2023

CrystalChun commented Oct 10, 2023

openshift-ci bot commented Oct 10, 2023

avishayt commented Oct 11, 2023

CrystalChun commented Oct 16, 2023

openshift-cherrypick-robot commented Oct 16, 2023

openshift-ci-robot commented Sep 19, 2023 •

edited by openshift-ci bot

Loading

CrystalChun Sep 29, 2023 •

edited

Loading