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

📖 Fix references to spec.kubernetesVersion for the Machine object to spec.Version #3265

Merged
merged 3 commits into from
Jul 1, 2020
Merged

📖 Fix references to spec.kubernetesVersion for the Machine object to spec.Version #3265

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7f10ea
Fix references to spec.kubernetesVersion for the Machine object to sp…
saimanoj01 Jun 26, 2020
76f2b16
update to spec.version reference for the Machine object
saimanoj01 Jun 26, 2020
2ec862a
Fix references to spec.kubernetesVersion for the Machine object to sp…
saimanoj01 Jun 30, 2020
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: 2 additions & 2 deletions bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ spec:
type: string
kubernetesVersion:
description: 'KubernetesVersion is the target version of the control
plane. NB: This value defaults to the Machine object spec.kubernetesVersion'
plane. NB: This value defaults to the Machine object spec.Version'
type: string
networking:
description: 'Networking holds configuration for the networking
Expand Down Expand Up @@ -1088,7 +1088,7 @@ spec:
type: string
kubernetesVersion:
description: 'KubernetesVersion is the target version of the control
plane. NB: This value defaults to the Machine object spec.kubernetesVersion'
plane. NB: This value defaults to the Machine object spec.Version'
type: string
networking:
description: 'Networking holds configuration for the networking
Expand Down
4 changes: 2 additions & 2 deletions bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ spec:
kubernetesVersion:
description: 'KubernetesVersion is the target version
of the control plane. NB: This value defaults to the
Machine object spec.kubernetesVersion'
Machine object spec.Version'
type: string
networking:
description: 'Networking holds configuration for the networking
Expand Down Expand Up @@ -1141,7 +1141,7 @@ spec:
kubernetesVersion:
description: 'KubernetesVersion is the target version
of the control plane. NB: This value defaults to the
Machine object spec.kubernetesVersion'
Machine object spec.Version'
type: string
networking:
description: 'Networking holds configuration for the networking
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/types/v1beta1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type ClusterConfiguration struct {
Networking Networking `json:"networking,omitempty"`

// KubernetesVersion is the target version of the control plane.
// NB: This value defaults to the Machine object spec.kubernetesVersion
// NB: This value defaults to the Machine object spec.version
// +optional
KubernetesVersion string `json:"kubernetesVersion,omitempty"`

Expand Down