From e7f10ea4654bcda41cc6f029c1b8009497ff0bf3 Mon Sep 17 00:00:00 2001 From: Sai Manoj Date: Fri, 26 Jun 2020 12:04:10 -0700 Subject: [PATCH 1/3] Fix references to spec.kubernetesVersion for the Machine object to spec.Version --- .../crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml | 4 ++-- .../bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml | 4 ++-- bootstrap/kubeadm/types/v1beta1/types.go | 2 +- 3 files changed, 5 insertions(+), 5 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 index 4b3edee2d585..8f3efbe58dd3 100644 --- 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 index 85bcd4a74a5d..3343254897a6 100644 --- 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 index 5ff37940e701..9a28f2ff1077 100644 --- 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"` From 76f2b16d872a291548cdcc3fc0b41865d98ec492 Mon Sep 17 00:00:00 2001 From: Sai Bandi Date: Fri, 26 Jun 2020 13:01:14 -0700 Subject: [PATCH 2/3] update to spec.version reference for the Machine object Co-authored-by: Andy Goldstein --- bootstrap/kubeadm/types/v1beta1/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/kubeadm/types/v1beta1/types.go b/bootstrap/kubeadm/types/v1beta1/types.go index 9a28f2ff1077..897f3866957f 100644 --- 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.Version + // NB: This value defaults to the Machine object spec.version // +optional KubernetesVersion string `json:"kubernetesVersion,omitempty"` From 2ec862a7ebc018dd87580e5a9e2dd681ca7ad8f7 Mon Sep 17 00:00:00 2001 From: Sai Manoj Bandi Date: Tue, 30 Jun 2020 08:46:51 -0700 Subject: [PATCH 3/3] Fix references to spec.kubernetesVersion for the Machine object to spec.Version --- .../crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml | 4 ++-- .../bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml | 4 ++-- .../controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml | 2 +- 3 files changed, 5 insertions(+), 5 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 index 8f3efbe58dd3..e4c353d5a99c 100644 --- 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.Version' + 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.Version' + 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 index 3343254897a6..cda86e295cdb 100644 --- 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.Version' + 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.Version' + Machine object spec.version' type: string networking: description: 'Networking holds configuration for the networking diff --git a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml index a01b7541f44a..6bd128ba3887 100644 --- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml +++ b/controlplane/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