Merge pull request #3265 from saimanoj01/saib/fix_spec

📖 Fix references to spec.kubernetesVersion for the Machine object to spec.Version
kubernetes-sigs · Jul 1, 2020 · 34f0443 · 34f0443
2 parents faa6e09 + 2ec862a
commit 34f0443
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -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
@@ -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

diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -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
@@ -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

diff --git a/bootstrap/kubeadm/types/v1beta1/types.go b/bootstrap/kubeadm/types/v1beta1/types.go
@@ -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"`
 

diff --git a/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/...rolplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
@@ -358,7 +358,7 @@ spec:
                       kubernetesVersion:
                         description: 'KubernetesVersion is the target version of the
                           control plane. NB: This value defaults to the Machine object
-                          spec.kubernetesVersion'
+                          spec.version'
                         type: string
                       networking:
                         description: 'Networking holds configuration for the networking