Skip to content

Commit d40b68a

Browse files
authored
Merge pull request #12479 from sbueringer/pr-follow-up-v1beta1-rename
🌱 Remove old godoc comment, remove unnecessary cast in KCP
2 parents 5256214 + 5f7f929 commit d40b68a

13 files changed

+10
-27
lines changed

api/controlplane/kubeadm/v1beta2/kubeadm_control_plane_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ type KubeadmControlPlaneMachineTemplate struct {
495495
// This field can be used e.g. to instruct the machine controller to include in the computation for Machine's ready
496496
// computation a condition, managed by an external controllers, reporting the status of special software/hardware installed on the Machine.
497497
//
498-
// NOTE: This field is considered only for computing v1beta2 conditions.
499498
// +optional
500499
// +listType=map
501500
// +listMapKey=conditionType

api/core/v1beta2/cluster_types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@ type ControlPlaneTopology struct {
639639
//
640640
// If this field is not defined, readinessGates from the corresponding ControlPlaneClass will be used, if any.
641641
//
642-
// NOTE: This field is considered only for computing v1beta2 conditions.
643642
// NOTE: Specific control plane provider implementations might automatically extend the list of readinessGates;
644643
// e.g. the kubeadm control provider adds ReadinessGates for the APIServerPodHealthy, SchedulerPodHealthy conditions, etc.
645644
// +optional
@@ -749,7 +748,6 @@ type MachineDeploymentTopology struct {
749748
//
750749
// If this field is not defined, readinessGates from the corresponding MachineDeploymentClass will be used, if any.
751750
//
752-
// NOTE: This field is considered only for computing v1beta2 conditions.
753751
// +optional
754752
// +listType=map
755753
// +listMapKey=conditionType

api/core/v1beta2/clusterclass_types.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ type ControlPlaneClass struct {
204204
// This field can be used e.g. to instruct the machine controller to include in the computation for Machine's ready
205205
// computation a condition, managed by an external controllers, reporting the status of special software/hardware installed on the Machine.
206206
//
207-
// NOTE: This field is considered only for computing v1beta2 conditions.
208207
// NOTE: If a Cluster defines a custom list of readinessGates for the control plane,
209208
// such list overrides readinessGates defined in this field.
210209
// NOTE: Specific control plane provider implementations might automatically extend the list of readinessGates;
@@ -335,7 +334,6 @@ type MachineDeploymentClass struct {
335334
// This field can be used e.g. to instruct the machine controller to include in the computation for Machine's ready
336335
// computation a condition, managed by an external controllers, reporting the status of special software/hardware installed on the Machine.
337336
//
338-
// NOTE: This field is considered only for computing v1beta2 conditions.
339337
// NOTE: If a Cluster defines a custom list of readinessGates for a MachineDeployment using this MachineDeploymentClass,
340338
// such list overrides readinessGates defined in this field.
341339
// +optional

api/core/v1beta2/machine_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ type MachineSpec struct {
439439
// Another example are external controllers, e.g. responsible to install special software/hardware on the Machines;
440440
// they can include the status of those components with a new condition and add this condition to ReadinessGates.
441441
//
442-
// NOTE: This field is considered only for computing v1beta2 conditions.
443442
// NOTE: In case readinessGates conditions start with the APIServer, ControllerManager, Scheduler prefix, and all those
444443
// readiness gates condition are reporting the same message, when computing the Machine's Ready condition those
445444
// readinessGates will be replaced by a single entry reporting "Control plane components: " + message.

api/core/v1beta2/zz_generated.openapi.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_clusters.yaml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_machinepools.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/cluster.x-k8s.io_machines.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)