Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

chore: get kubeadm yaml rather than json #110

Merged

Conversation

rudoi
Copy link

@rudoi rudoi commented Aug 10, 2019

What this PR does / why we need it:
Currently, the userdata has the kubeadm config structs as json, which kubeadm doesn't seem to like.

Sample from a provisioned host:

---
{"nodeRegistration":{"kubeletExtraArgs":{"cni-bin-dir":"/opt/cni/bin","cni-conf-dir":"/etc/cni/net.d","network-plugin":"cni","node-ip":"<redacted>"}},"localAPIEndpoint":{"advertiseAddress":"","bindPort":0}}

Special notes for your reviewer:

To avoid importing k/k I grabbed a utility function and copied it here, MarshalToYamlForCodecs.

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:


@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 10, 2019
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 10, 2019
@chuckha
Copy link
Contributor

chuckha commented Aug 12, 2019

the json should be fine🤔 do you have the error that you got handy? Is it related to the APIEndpoint change where https:// is removed?

regardless yaml will be easier to debug for humans so I'm totally fine with this change.

@detiber
Copy link
Contributor

detiber commented Aug 12, 2019

That should be able to be parsed as valid yaml, but like @chuckha I also think this change is warranted for readability.

@rudoi
Copy link
Author

rudoi commented Aug 12, 2019

@chuckha / @detiber wow uhhh y'all are right lol. I can't remember what error I hit but I can't seem to reproduce it. JSON works fine. Though I do agree the file looks nicer as YAML. Happy to change up anything if y'all want.

The https:// thing is a real issue though, I believe.

Copy link
Contributor

@chuckha chuckha left a comment

Choose a reason for hiding this comment

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

/approve

Thanks @rudoi

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chuckha, rudoi

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 Aug 12, 2019
@detiber
Copy link
Contributor

detiber commented Aug 12, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2019
@k8s-ci-robot k8s-ci-robot merged commit f1d5b73 into kubernetes-retired:master Aug 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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 Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants