[breaking] remove deprecated fields (CloudinitMetadataSupport for LinodeMachines, SecretType and SecretDataFormat for LOBJKeys)

api/v1alpha2/linodemachine_types.go

@@ -527,13 +527,6 @@ type LinodeMachineStatus struct {
 	// +listMapKey=address
 	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
 
-	// cloudinitMetadataSupport determines whether to use cloud-init or not.
-	// Deprecated: Stackscript no longer in use, so this field is not used.
-	// +kubebuilder:deprecatedversion:warning="CloudinitMetadataSupport is deprecated"
-	// +optional
-	// +kubebuilder:default=true
-	CloudinitMetadataSupport bool `json:"cloudinitMetadataSupport,omitempty"`
-
 	// instanceState is the state of the Linode instance for this machine.
 	// +optional
 	InstanceState *linodego.InstanceStatus `json:"instanceState,omitempty"`

api/v1alpha2/linodeobjectstoragekey_types.go

@@ -89,19 +89,6 @@ type LinodeObjectStorageKeySpec struct {
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Value is immutable"
 	// +required
 	GeneratedSecret `json:"generatedSecret"`
-
-	// secretType instructs the controller what type of secret to generate containing access key details.
-	// Deprecated: Use generatedSecret.type.
-	// +kubebuilder:validation:Enum=Opaque;addons.cluster.x-k8s.io/resource-set
-	// +kubebuilder:deprecatedversion:warning="secretType deprecated by generatedSecret.type"
-	// +optional
-	SecretType corev1.SecretType `json:"secretType,omitempty"`
-
-	// secretDataFormat instructs the controller how to format the data stored in the secret containing access key details.
-	// Deprecated: Use generatedSecret.format.
-	// +kubebuilder:deprecatedversion:warning="secretDataFormat deprecated by generatedSecret.format"
-	// +optional
-	SecretDataFormat map[string]string `json:"secretDataFormat,omitempty"`
 }
 
 // LinodeObjectStorageKeyStatus defines the observed state of LinodeObjectStorageKey

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

@@ -937,12 +937,6 @@ spec:
                 x-kubernetes-list-map-keys:
                 - address
                 x-kubernetes-list-type: map
-              cloudinitMetadataSupport:
-                default: true
-                description: |-
-                  cloudinitMetadataSupport determines whether to use cloud-init or not.
-                  Deprecated: Stackscript no longer in use, so this field is not used.
-                type: boolean
               conditions:
                 description: conditions define the current service state of the LinodeMachine.
                 items:

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

@@ -140,21 +140,6 @@ spec:
                 description: keyGeneration may be modified to trigger a rotation of
                   the access key.
                 type: integer
-              secretDataFormat:
-                additionalProperties:
-                  type: string
-                description: |-
-                  secretDataFormat instructs the controller how to format the data stored in the secret containing access key details.
-                  Deprecated: Use generatedSecret.format.
-                type: object
-              secretType:
-                description: |-
-                  secretType instructs the controller what type of secret to generate containing access key details.
-                  Deprecated: Use generatedSecret.type.
-                enum:
-                - Opaque
-                - addons.cluster.x-k8s.io/resource-set
-                type: string
             required:
             - bucketAccess
             - generatedSecret

docs/src/reference/out.md

@@ -723,7 +723,6 @@ _Appears in:_
 | `conditions` _[Condition](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#condition-v1-meta) array_ | conditions define the current service state of the LinodeMachine. |  |  |
 | `ready` _boolean_ | ready is true when the provider resource is ready. | false |  |
 | `addresses` _MachineAddress array_ | addresses contains the Linode instance associated addresses. |  |  |
-| `cloudinitMetadataSupport` _boolean_ | cloudinitMetadataSupport determines whether to use cloud-init or not.<br />Deprecated: Stackscript no longer in use, so this field is not used. | true |  |
 | `instanceState` _[InstanceStatus](#instancestatus)_ | instanceState is the state of the Linode instance for this machine. |  |  |
 | `failureReason` _string_ | failureReason will be set in the event that there is a terminal problem<br />reconciling the Machine and will contain a succinct value suitable<br />for machine interpretation.<br />This field should not be set for transitive errors that a controller<br />faces that are expected to be fixed automatically over<br />time (like service outages), but instead indicate that something is<br />fundamentally wrong with the Machine's spec or the configuration of<br />the controller, and that manual intervention is required. Examples<br />of terminal errors would be invalid combinations of settings in the<br />spec, values that are unsupported by the controller, or the<br />responsible controller itself being critically misconfigured.<br />Any transient errors that occur during the reconciliation of Machines<br />can be added as events to the Machine object and/or logged in the<br />controller's output. |  |  |
 | `failureMessage` _string_ | failureMessage will be set in the event that there is a terminal problem<br />reconciling the Machine and will contain a more verbose string suitable<br />for logging and human consumption.<br />This field should not be set for transitive errors that a controller<br />faces that are expected to be fixed automatically over<br />time (like service outages), but instead indicate that something is<br />fundamentally wrong with the Machine's spec or the configuration of<br />the controller, and that manual intervention is required. Examples<br />of terminal errors would be invalid combinations of settings in the<br />spec, values that are unsupported by the controller, or the<br />responsible controller itself being critically misconfigured.<br />Any transient errors that occur during the reconciliation of Machines<br />can be added as events to the Machine object and/or logged in the<br />controller's output. |  |  |
@@ -982,8 +981,6 @@ _Appears in:_
 | `credentialsRef` _[SecretReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#secretreference-v1-core)_ | credentialsRef is a reference to a Secret that contains the credentials to use for generating access keys.<br />If not supplied, then the credentials of the controller will be used. |  |  |
 | `keyGeneration` _integer_ | keyGeneration may be modified to trigger a rotation of the access key. | 0 |  |
 | `generatedSecret` _[GeneratedSecret](#generatedsecret)_ | generatedSecret configures the Secret to generate containing access key details. |  |  |
-| `secretType` _[SecretType](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#secrettype-v1-core)_ | secretType instructs the controller what type of secret to generate containing access key details.<br />Deprecated: Use generatedSecret.type. |  | Enum: [Opaque addons.cluster.x-k8s.io/resource-set] <br /> |
-| `secretDataFormat` _object (keys:string, values:string)_ | secretDataFormat instructs the controller how to format the data stored in the secret containing access key details.<br />Deprecated: Use generatedSecret.format. |  |  |
 
 
 #### LinodeObjectStorageKeyStatus

internal/controller/linodeobjectstoragekey_controller_test.go

@@ -255,9 +255,9 @@ var _ = Describe("lifecycle", Ordered, Label("key", "key-lifecycle"), func() {
 				}),
 			),
 		),
-		Once("secret type set to cluster resource set fails", func(ctx context.Context, _ Mock) {
+		Once("secret type set to cluster resource set succeeds", func(ctx context.Context, _ Mock) {
 			key.Spec.Type = clusteraddonsv1.ClusterResourceSetSecretType
-			Expect(k8sClient.Update(ctx, &key)).NotTo(Succeed())
+			Expect(k8sClient.Update(ctx, &key)).To(Succeed())
 		}),
 		Once("resource is deleted", func(ctx context.Context, _ Mock) {
 			// nb: client.Delete does not set DeletionTimestamp on the object, so re-fetch from the apiserver.

internal/webhook/v1alpha2/linodeobjectstoragekey_webhook.go

@@ -149,13 +149,5 @@ func (d *LinodeObjectStorageKeyDefaulter) Default(ctx context.Context, obj runti
 		key.Spec.Namespace = key.Namespace
 	}
 
-	// Support deprecated fields when specified and updated fields are empty.
-	if key.Spec.SecretType != "" && key.Spec.Type == "" {
-		key.Spec.Type = key.Spec.SecretType
-	}
-	if len(key.Spec.SecretDataFormat) > 0 && len(key.Spec.Format) == 0 {
-		key.Spec.Format = key.Spec.SecretDataFormat
-	}
-
 	return nil
 }