Skip to content

Backport changes from master to release-0.1 #447

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

Merged
k8s-ci-robot merged 2 commits into from
Aug 18, 2019
Merged

Backport changes from master to release-0.1 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a02a66c
Fix clouds.yaml link and add some notes (#440)
hidekazuna Aug 16, 2019
546152f
fixed quotes in coreos userdata (#441)
sbueringer Aug 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ policy may be made to more closely align with other providers in the Cluster API
```

`<clouds.yaml>` is a yaml file to record how to interact with openstack cloud, there's a sample
[clouds.yaml](pkg/cloud/openstack/clients/clouds.yaml), and [openclient configuration files](https://docs.openstack.org/python-openstackclient/latest/configuration/index.html#configuration-files) has additional information.
[clouds.yaml](pkg/cloud/openstack/services/clouds.yaml), and [OpenStackClient configuration files](https://docs.openstack.org/python-openstackclient/latest/configuration/index.html#configuration-files) has additional information.

`<openstack cloud>` is the cloud you are going to use, e.g. multiple cloud might be defined in `clouds.yaml`
and this will be cloud to be used for the new kubernetes to interact with.
Expand All @@ -116,6 +116,8 @@ policy may be made to more closely align with other providers in the Cluster API
region_name: RegionOne
```

In case your OpenStack cluster endpoint is using SSL and the cert is signed by an unknown CA, a specific cacert can be provided via cacert.

`<provider os>` specifies the operating system of the virtual machines Kubernetes will run on.
Supported Operating Systems:
- `centos`
Expand Down
4 changes: 2 additions & 2 deletions cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ storage:
- path: /etc/kubernetes/kubeadm_config.yaml
filesystem: root
contents:
inline: '{{ .KubeadmConfig | EscapeNewLines }}'
inline: "{{ .KubeadmConfig | EscapeNewLines }}"
user:
id: 0
group:
Expand All @@ -111,7 +111,7 @@ systemd:
- name: kubeadm.service
contents: |-
[Unit]
Description=Initialise bootkube master.
Description=Initialise Kubernetes control plane node.
After=kubelet.service
Requires=coreos-metadata.service

Expand Down
4 changes: 2 additions & 2 deletions cmd/clusterctl/examples/openstack/provider-component/user-data/coreos/templates/worker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ storage:
- path: /etc/kubernetes/kubeadm_config.yaml
filesystem: root
contents:
inline: '{{ .KubeadmConfig | EscapeNewLines }}'
inline: "{{ .KubeadmConfig | EscapeNewLines }}"
user:
id: 0
group:
Expand All @@ -14,7 +14,7 @@ systemd:
- name: kubeadm.service
contents: |-
[Unit]
Description=Initialise bootkube master.
Description=Initialise Kubernetes worker node.
After=kubelet.service
Requires=coreos-metadata.service

Expand Down