Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pr finalize v1alpha2 #462

Merged
merged 4 commits into from
Sep 9, 2019
Merged

Pr finalize v1alpha2 #462

merged 4 commits into from
Sep 9, 2019

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Sep 7, 2019 •
edited
Loading

Final fixes for v1alpha2. This has been tested with:

  • multi-node cluster with LBaaS
  • single-nocde cluster without LBaaS

@sbueringer
Re-sync controller implementation with CAPA, Fix cloud config indent …
0429938 
…bug, also copy addons to examples output folder, Re-sync makefile
@sbueringer
update
1ee2e63
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 7, 2019
@sbueringer sbueringer changed the title Pr finalize v1alpha2 [WIP] Pr finalize v1alpha2 Sep 7, 2019
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 7, 2019
@k8s-ci-robot
Copy link
Contributor

[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

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 7, 2019
@sbueringer sbueringer changed the title [WIP] Pr finalize v1alpha2 Pr finalize v1alpha2 Sep 7, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 7, 2019
@sbueringer
Copy link
Member Author

sbueringer commented Sep 7, 2019 •
edited
Loading

/assign @jichenjc
/assign @hidekazuna

After this only the staging release job (#460) and docs should be left for v1alpha2

jichenjc
jichenjc reviewed Sep 9, 2019
View reviewed changes
Copy link
Contributor

@jichenjc jichenjc left a comment

Choose a reason for hiding this comment

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

mostly good

examples/generate.sh
export OPENSTACK_CLOUD_PROVIDER_CONF6
OPENSTACK_CLOUD_PROVIDER_CONF6=$(echo "${OPENSTACK_CLOUD_PROVIDER_CONF}" | sed -e 's/^/ /')
export OPENSTACK_CLOUD_PROVIDER_CONF10
OPENSTACK_CLOUD_PROVIDER_CONF10=$(echo "${OPENSTACK_CLOUD_PROVIDER_CONF}" | sed -e 's/^/ /')
Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't get this CONF6/CONF10 ... what's the meaning of this?

Copy link
Member Author

Choose a reason for hiding this comment

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

The problem is that I sometimes need the config with indent 6 (KubeadmConfig) and sometimes with indent 10 (KubeadmConfigTemplate). Seems to be the easiest way to just have to vars for envsubst.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, got it thanks

examples/generate.sh Outdated

# Generate Cluster API provider components file.
kustomize build "github.com/kubernetes-sigs/cluster-api//config/default/?ref=master" --reorder=none > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
kustomize build "github.com/kubernetes-sigs/cluster-api//config/default/?ref=master" > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: use / instead //

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

@sbueringer
Copy link
Member Author

@jichenjc ptal :)

@jichenjc
Copy link
Contributor

jichenjc commented Sep 9, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 9, 2019
@k8s-ci-robot k8s-ci-robot merged commit e5b060a into kubernetes-sigs:master Sep 9, 2019
@texascloud
Copy link

@sbueringer could you share your YAML for creating MM cluster with LBaaS, as well as single node cluster without LBaaS? It would be greatly appreciated!!

@sbueringer
Copy link
Member Author

@sbueringer could you share your YAML for creating MM cluster with LBaaS, as well as single node cluster without LBaaS? It would be greatly appreciated!!

That's the one for single node control plane:
https://gist.github.com/sbueringer/35e21417670a6a0c4983bad2911ea538

But please just use the documentation (and examples/generate.sh), which should be up-to-date with this PR: #474

There's also an issue to generate separate single-node and multi-node control plane examples: #473

I also have my dev-env published here: https://github.com/sbueringer/capi-dev/tree/master/cluster

Which first generates examples with the scripts from the repo and then kustomizes them to my env. If you have further questions you can always ask :)

@sbueringer sbueringer deleted the pr-finalize-v1alpha2 branch October 6, 2019 12:08
@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
Pr finalize v1alpha2 (kubernetes-sigs#462)
501d86c 
* Re-sync controller implementation with CAPA, Fix cloud config indent bug, also copy addons to examples output folder, Re-sync makefile

* update

* fix image name, more sync

* Update generate.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jichenjc jichenjc jichenjc left review comments

@flaper87 flaper87 Awaiting requested review from flaper87

@Lion-Wei Lion-Wei Awaiting requested review from Lion-Wei

Assignees

@hidekazuna hidekazuna

@jichenjc jichenjc

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/L Denotes a PR that changes 100-499 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 @jichenjc @texascloud @hidekazuna