Skip to content

Update kubeadm to 1.15 #389

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 1 commit into from
Jul 13, 2019
Merged

Update kubeadm to 1.15 #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ This provider's versions are compatible with the following versions of Cluster A

This provider's versions are able to install and manage the following versions of Kubernetes:

||Kubernetes 1.13.5+|Kubernetes 1.14|
|-|-|-|
|OpenStack Provider v1alpha1 (ea309e7f)|✓|✓|
||Kubernetes 1.13.5+|Kubernetes 1.14|Kubernetes 1.15|
|-|-|-|-|
|OpenStack Provider v1alpha1 (ea309e7f)|✓|✓|✓|

Kubernetes control plane and Kubelet versions are defined in `spec.versions.controlPlane` and `spec.versions.kubelet` of `cmd/clusterctl/examples/openstack/machines.yaml.template` respectively.
You can generate `cmd/clusterctl/examples/openstack/out/machines.yaml` by running the `generate-yaml.sh` from the template and change the versions if you want.
Expand Down
2 changes: 1 addition & 1 deletion cmd/clusterctl/examples/openstack/machine-deployment.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ spec:
serverMetadata:
key: value
versions:
kubelet: 1.14.0
kubelet: 1.15.0
6 changes: 3 additions & 3 deletions cmd/clusterctl/examples/openstack/machines.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ items:
serverMetadata:
key: value
versions:
kubelet: 1.14.0
controlPlane: 1.14.0
kubelet: 1.15.0
controlPlane: 1.15.0
- apiVersion: "cluster.k8s.io/v1alpha1"
kind: Machine
metadata:
Expand Down Expand Up @@ -69,4 +69,4 @@ items:
serverMetadata:
key: value
versions:
kubelet: 1.14.0
kubelet: 1.15.0