Skip to content

Commit edebae5

Browse files
authored
Merge pull request #1061 from yastij/v1a3-deprecation
deprecate API fields in v1alpha3 for future removal
2 parents 1dd0170 + f64c330 commit edebae5

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

api/v1alpha3/cloudprovider_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ limitations under the License.
2626
package v1alpha3
2727

2828
// CPIConfig is the vSphere cloud provider's configuration.
29+
// DEPRECATED: will be removed in v1alpha4
2930
type CPIConfig struct {
3031
// Global is the vSphere cloud provider's global configuration.
3132
// +optional

api/v1alpha3/haproxyloadbalancer_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ type HAProxyLoadBalancerStatus struct {
6666
// +kubebuilder:subresource:status
6767

6868
// HAProxyLoadBalancer is the Schema for the haproxyloadbalancers API
69+
// DEPRECATED: will be removed in v1alpha4
6970
type HAProxyLoadBalancer struct {
7071
metav1.TypeMeta `json:",inline"`
7172
metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha3/vspherecluster_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ type VSphereClusterSpec struct {
3636

3737
// Insecure is a flag that controls whether or not to validate the
3838
// vSphere server's certificate.
39+
// DEPRECATED: will be removed in v1alpha4
3940
// +optional
4041
Insecure *bool `json:"insecure,omitempty"`
4142

@@ -45,6 +46,7 @@ type VSphereClusterSpec struct {
4546
Thumbprint string `json:"thumbprint,omitempty"`
4647

4748
// CloudProviderConfiguration holds the cluster-wide configuration for the
49+
// DEPRECATED: will be removed in v1alpha4
4850
// vSphere cloud provider.
4951
CloudProviderConfiguration CPIConfig `json:"cloudProviderConfiguration,omitempty"`
5052

@@ -57,6 +59,7 @@ type VSphereClusterSpec struct {
5759
// When a LoadBalancerRef is provided, the VSphereCluster.Status.Ready field
5860
// will not be true until the referenced resource is Status.Ready and has a
5961
// non-empty Status.Address value.
62+
// DEPRECATED: will be removed in v1alpha4
6063
// +optional
6164
LoadBalancerRef *corev1.ObjectReference `json:"loadBalancerRef,omitempty"`
6265
}

config/crd/bases/infrastructure.cluster.x-k8s.io_haproxyloadbalancers.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ spec:
1919
- name: v1alpha3
2020
schema:
2121
openAPIV3Schema:
22-
description: HAProxyLoadBalancer is the Schema for the haproxyloadbalancers
23-
API
22+
description: 'HAProxyLoadBalancer is the Schema for the haproxyloadbalancers
23+
API DEPRECATED: will be removed in v1alpha4'
2424
properties:
2525
apiVersion:
2626
description: 'APIVersion defines the versioned schema of this representation

config/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ spec:
278278
description: VSphereClusterSpec defines the desired state of VSphereCluster
279279
properties:
280280
cloudProviderConfiguration:
281-
description: CloudProviderConfiguration holds the cluster-wide configuration
282-
for the vSphere cloud provider.
281+
description: 'CloudProviderConfiguration holds the cluster-wide configuration
282+
for the DEPRECATED: will be removed in v1alpha4 vSphere cloud provider.'
283283
properties:
284284
disk:
285285
description: Disk is the vSphere cloud provider's disk configuration.
@@ -481,15 +481,16 @@ spec:
481481
- port
482482
type: object
483483
insecure:
484-
description: Insecure is a flag that controls whether or not to validate
485-
the vSphere server's certificate.
484+
description: 'Insecure is a flag that controls whether or not to validate
485+
the vSphere server''s certificate. DEPRECATED: will be removed in
486+
v1alpha4'
486487
type: boolean
487488
loadBalancerRef:
488-
description: LoadBalancerRef may be used to enable a control plane
489+
description: 'LoadBalancerRef may be used to enable a control plane
489490
load balancer for this cluster. When a LoadBalancerRef is provided,
490491
the VSphereCluster.Status.Ready field will not be true until the
491492
referenced resource is Status.Ready and has a non-empty Status.Address
492-
value.
493+
value. DEPRECATED: will be removed in v1alpha4'
493494
properties:
494495
apiVersion:
495496
description: API version of the referent.

0 commit comments

Comments
 (0)