Skip to content

Conversation

@JoelSpeed
Copy link
Contributor

@JoelSpeed JoelSpeed commented Jul 27, 2022

This PR bumps the openshift library go dependency to include openshift/library-go#1383.

This will mean that OpenStack is always set to external and will force the migration from in-tree to out-of-tree for OpenStack.

@openshift-ci 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 Jul 27, 2022
@openshift-ci openshift-ci bot requested review from jkyros and sinnykumari July 27, 2022 13:35
@JoelSpeed JoelSpeed force-pushed the openstack-external branch from c51c0bc to 263ea1c Compare July 27, 2022 13:59
@JoelSpeed JoelSpeed changed the title [WIP] Update library-go to set OpenStack provider to external Update library-go to set OpenStack provider to external Jul 27, 2022
@openshift-ci 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 Jul 27, 2022
@yuqi-zhang
Copy link
Contributor

/retest

generally looks fine, seems to be some container failures in the test suite, presumably not related?

@yuqi-zhang
Copy link
Contributor

er, no

Building github.com/openshift/machine-config-operator/cmd/machine-config-daemon (machine-config-daemon-4.6.0-202006240615.p0-1565-gaa2411be-dirty, aa2411be8b779c280e7cf2e27956b7a7b43fbdb1) for linux/amd64
# k8s.io/client-go/applyconfigurations/meta/v1
vendor/k8s.io/client-go/applyconfigurations/meta/v1/unstructured.go:64:38: cannot use doc (variable of type *"github.com/googleapis/gnostic/openapiv2".Document) as type *"github.com/google/gnostic/openapiv2".Document in argument to proto.NewOpenAPIData
make: *** [Makefile:39: _build-machine-config-daemon] Error 2
error: build error: error building at STEP "RUN make install DESTDIR=./instroot && tar -C instroot -cf instroot.tar .": error while running runtime: exit status 2

@JoelSpeed
Copy link
Contributor Author

er, no

Building github.com/openshift/machine-config-operator/cmd/machine-config-daemon (machine-config-daemon-4.6.0-202006240615.p0-1565-gaa2411be-dirty, aa2411be8b779c280e7cf2e27956b7a7b43fbdb1) for linux/amd64
# k8s.io/client-go/applyconfigurations/meta/v1
vendor/k8s.io/client-go/applyconfigurations/meta/v1/unstructured.go:64:38: cannot use doc (variable of type *"github.com/googleapis/gnostic/openapiv2".Document) as type *"github.com/google/gnostic/openapiv2".Document in argument to proto.NewOpenAPIData
make: *** [Makefile:39: _build-machine-config-daemon] Error 2
error: build error: error building at STEP "RUN make install DESTDIR=./instroot && tar -C instroot -cf instroot.tar .": error while running runtime: exit status 2

Oops, I'll take a look at this now

@cgwalters
Copy link
Member

This overlaps with #3252
which has some prep work already split out in #3251

@JoelSpeed
Copy link
Contributor Author

This overlaps with #3252 which has some prep work already split out in #3251

Thanks for pointing that out, I've just spent a few minutes getting things to build. I think we are getting a similar result looking at the resulting go mods.

I've had to migrate the resource lock that you are using to a ConfigMapsLeases resource lock which migrates users from configmaps over to leases as part of a deprecation cycle. Kept that as a separate commit for review.

I'll review your changes and double check what's left to do

@JoelSpeed JoelSpeed force-pushed the openstack-external branch from 756bfd7 to e7baa2a Compare July 27, 2022 14:52
@yuqi-zhang
Copy link
Contributor

Latest failure shows

hack/../pkg is out of date. Please run make update
  • some test failures

Are we good to merge #3251 first? It should be a subset now (on a slightly older version for some packages)

@JoelSpeed
Copy link
Contributor Author

Yep, something came up so I didn't get to finish this today. If you merge the other PR first I can rebase and fix the rest in the morning

@yuqi-zhang
Copy link
Contributor

Ok thanks, let me review the other PR and try to get it in

@JoelSpeed JoelSpeed force-pushed the openstack-external branch from e7baa2a to 4f6c283 Compare July 28, 2022 08:02
@MaysaMacedo
Copy link
Contributor

@JoelSpeed It seems it's just missing a make update now?

@JoelSpeed
Copy link
Contributor Author

All the tests seem to be good now, lets see how the E2E goes

@yuqi-zhang
Copy link
Contributor

/retest

1 similar comment
@MaysaMacedo
Copy link
Contributor

/retest

@MaysaMacedo
Copy link
Contributor

I see the following in the machine config controller logs:

2022-07-28T18:21:57.275897107Z E0728 18:21:57.275869       1 leaderelection.go:334] error initially creating leader election record: leases.coordination.k8s.io is forbidden: User "system:serviceaccount:openshift-machine-config-operator:machine-config-controller" cannot create resource "leases" in API group "coordination.k8s.io" in the namespace "openshift-machine-config-operator"
2022-07-28T18:22:33.666472558Z E0728 18:22:33.666145       1 leaderelection.go:330] error retrieving resource lock openshift-machine-config-operator/machine-config-controller: leases.coordination.k8s.io "machine-config-controller" is forbidden: User "system:serviceaccount:openshift-machine-config-operator:machine-config-controller" cannot get resource "leases" in API group "coordination.k8s.io" in the namespace "openshift-machine-config-operator"

Seems some permissions are missing?

@JoelSpeed
Copy link
Contributor Author

Seems some permissions are missing?

Yep, I think I've got that sorted in the latest commit

@JoelSpeed JoelSpeed force-pushed the openstack-external branch from c3bd1b8 to c9ceacf Compare August 1, 2022 10:37
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 1, 2022

@JoelSpeed: 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.

@MaysaMacedo
Copy link
Contributor

/cc @cgwalters @sinnykumari Can you take another look at this PR? It's green now. Thanks!

Copy link
Contributor

@sinnykumari sinnykumari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2022
@MaysaMacedo
Copy link
Contributor

MaysaMacedo commented Aug 2, 2022

It LGTM. The installation and e2e test with OpenStack, finalized fine.

@sinnykumari
Copy link
Contributor

Thanks Maysa for testing!
/lgtm

@MaysaMacedo
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 2, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, MaysaMacedo, sinnykumari

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:

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

1 similar comment
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 2, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed, MaysaMacedo, sinnykumari

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:

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

@openshift-merge-robot openshift-merge-robot merged commit b928774 into openshift:master Aug 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants