Skip to content

🐛 fixup Makefile, should fix image build on master#516

Merged
k8s-ci-robot merged 6 commits intokubernetes-sigs:masterfrom
sbueringer:pr-fixup-makefile
Mar 13, 2020
Merged

🐛 fixup Makefile, should fix image build on master#516
k8s-ci-robot merged 6 commits intokubernetes-sigs:masterfrom
sbueringer:pr-fixup-makefile

Conversation

@sbueringer
Copy link
Member

@sbueringer sbueringer commented Mar 11, 2020 •
edited
Loading

What this PR does / why we need it:

Syncs the Makefile with CAPA and should fix our build on master

Also:
As we're not really (imho) supporting migrations from v1alpha2 to v1alpha3 and the v1alpha2 package was unused in our implementation I would suggest removing it. I'm happy when we have v1alpha3 finalized I don't think we have the bandwidth to support migrations explicitly right now

See also: #499

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 11, 2020
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Mar 11, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 11, 2020
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 11, 2020
@sbueringer
Copy link
Member Author

sbueringer commented Mar 11, 2020

/assign @hidekazuna
/assign @jichenjc

@sbueringer
Copy link
Member Author

sbueringer commented Mar 11, 2020

/assign @prankul88

@sbueringer sbueringer changed the title fixup Makefile, should fix image build on master 🐛 fixup Makefile, should fix image build on master Mar 11, 2020
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 12, 2020
hidekazuna
hidekazuna reviewed Mar 12, 2020
View reviewed changes
Copy link
Contributor

@hidekazuna hidekazuna left a comment

Choose a reason for hiding this comment

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

Some nits, thanks.

@sbueringer
Copy link
Member Author

sbueringer commented Mar 12, 2020

@hidekazuna all done. Thx for the review

@hidekazuna hidekazuna mentioned this pull request Mar 12, 2020
Closed
@hidekazuna
Copy link
Contributor

hidekazuna commented Mar 12, 2020

@sbueringer Thanks, confirmed.

@prankul88
Copy link
Contributor

prankul88 commented Mar 12, 2020

@sbueringer Will review this tomorrow asap.

@jichenjc
Copy link
Contributor

jichenjc commented Mar 13, 2020

looks good, just need other folks to take a quick look

@prankul88
Copy link
Contributor

prankul88 commented Mar 13, 2020 •
edited
Loading

@sbueringer Can you update the version of kubebuilder

cluster-api-provider-openstack/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Line 7 in b406c51

controller-gen.kubebuilder.io/version: v0.2.6-0.20200226180227-d6efdcdd90e2
to v0.2.6 in all the yaml. Thanks

@prankul88
Copy link
Contributor

prankul88 commented Mar 13, 2020

Otherwise LGTM

prankul88
prankul88 reviewed Mar 13, 2020
View reviewed changes
Makefile
release-manifests: $(RELEASE_DIR) ## Builds the manifests to publish with a release
kustomize build config > $(RELEASE_DIR)/infrastructure-components.yaml

.PHONY: release-binary
Copy link
Contributor

@prankul88 prankul88 Mar 13, 2020

Choose a reason for hiding this comment

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

@sbueringer Was curious to know why do we not need release-binary in release

Copy link
Member Author

@sbueringer sbueringer Mar 13, 2020

Choose a reason for hiding this comment

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

Not sure why it was added. release-binary is used in CAPA to build clusterawsadm. But we don't have a binary like this for now, so we don't need the target.

Copy link
Contributor

@prankul88 prankul88 Mar 13, 2020

Choose a reason for hiding this comment

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

Perfect. Thanks

@sbueringer
Copy link
Member Author

sbueringer commented Mar 13, 2020 •
edited
Loading

@sbueringer Can you update the version of kubebuilder

cluster-api-provider-openstack/config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml

Line 7 in b406c51

controller-gen.kubebuilder.io/version: v0.2.6-0.20200226180227-d6efdcdd90e2

to v0.2.6 in all the yaml. Thanks

I would like to keep it as is. The acutal version is defined in hack/tools/go.mod and is sync with CAPA (controller-tools). Not sure what consequences it have to use something else so I would just like to keep it sync for now

EDIT: Sorry you're right. had an old version of CAPA locally. They changed it like you said. I'll push a fix commit

@sbueringer
Copy link
Member Author

sbueringer commented Mar 13, 2020

@hidekazuna @jichenjc @prankul88
PTAL :)

@prankul88
Copy link
Contributor

prankul88 commented Mar 13, 2020

LGTM. Others can confirm. :)

@jichenjc
Copy link
Contributor

jichenjc commented Mar 13, 2020

looks good, let's try use it then submit further PRs :)

@sbueringer
Copy link
Member Author

sbueringer commented Mar 13, 2020

looks good, let's try use it then submit further PRs :)

Perfect :). Good news is I have time today to finalize the template PR. After that one we should have an almost final v1alpha3 version

@hidekazuna
Copy link
Contributor

hidekazuna commented Mar 13, 2020

Cluster was created successfully in my env.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 13, 2020
@k8s-ci-robot k8s-ci-robot merged commit e99ddcf into kubernetes-sigs:master Mar 13, 2020
@sbueringer sbueringer deleted the pr-fixup-makefile branch March 13, 2020 13:36
@EmilienM EmilienM mentioned this pull request Jan 31, 2023
Closed
pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024
@sbueringer @pierreprinetti
🐛 fixup Makefile, should fix image build on master (kubernetes-sigs#516)
7a0366d 
* fixup Makefile, should fix image build on master

* remove unused v1alpha2 package, update doc, remove other references to v1alpha2

* Fixup cloudbuild.yaml

* review fixes

* update deps

* re-gen
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iamemilio iamemilio Awaiting requested review from iamemilio

@vincepri vincepri Awaiting requested review from vincepri

2 more reviewers

@hidekazuna hidekazuna hidekazuna left review comments

@prankul88 prankul88 prankul88 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@hidekazuna hidekazuna

@jichenjc jichenjc

@prankul88 prankul88

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sbueringer @k8s-ci-robot @hidekazuna @prankul88 @jichenjc