Refactor plus address comments

Author: komer3

api/v1alpha2/linodevpc_types.go

@@ -43,7 +43,8 @@ type LinodeVPCSpec struct {
 	// If set to true, the controller will not delete the VPC resource in Linode.
 	// Defaults to false.
 	// +optional
-	Retain *bool `json:"retain,omitempty"`
+	// +kubebuilder:default=false
+	Retain bool `json:"retain,omitempty"`
 
 	// CredentialsRef is a reference to a Secret that contains the credentials to use for provisioning this VPC. If not
 	// supplied then the credentials of the controller will be used.
@@ -63,10 +64,10 @@ type VPCSubnetCreateOptions struct {
 	// +optional
 	SubnetID int `json:"subnetID,omitempty"`
 	// Retain allows you to keep the Subnet after the LinodeVPC object is deleted.
-	// This is only applicable when the parent VPC has RetainVPC set to true and the
-	// --enable-subnet-deletion flag is enabled on the controller.
+	// This is only applicable when the parent VPC has RetainVPC set to true.
 	// +optional
-	Retain *bool `json:"retain,omitempty"`
+	// +kubebuilder:default=false
+	Retain bool `json:"retain,omitempty"`
 }
 
 // LinodeVPCStatus defines the observed state of LinodeVPC

api/v1alpha2/zz_generated.deepcopy.go

@@ -88,7 +88,6 @@ type flagVars struct {
 	linodeVPCConcurrency                 int
 	linodePlacementGroupConcurrency      int
 	linodeFirewallConcurrency            int
-	enableSubnetDeletion                 bool
 }
 
 func init() {
@@ -153,7 +152,6 @@ func parseFlags() (flags flagVars, opts zap.Options) {
 	flag.IntVar(&flags.linodeVPCConcurrency, "linodevpc-concurrency", concurrencyDefault, "Number of LinodeVPCs to process simultaneously")
 	flag.IntVar(&flags.linodePlacementGroupConcurrency, "linodeplacementgroup-concurrency", concurrencyDefault, "Number of Linode Placement Groups to process simultaneously")
 	flag.IntVar(&flags.linodeFirewallConcurrency, "linodefirewall-concurrency", concurrencyDefault, "Number of Linode Firewall to process simultaneously")
-	flag.BoolVar(&flags.enableSubnetDeletion, "enable-subnet-deletion", false, "Enable the deletion of subnets in a retained VPC.")
 
 	opts = zap.Options{Development: true}
 	opts.BindFlags(flag.CommandLine)
@@ -295,11 +293,10 @@ func setupControllers(mgr manager.Manager, flags flagVars, linodeClientConfig, d
 
 	// LinodeVPC Controller
 	if err := (&controller.LinodeVPCReconciler{
-		Client:               mgr.GetClient(),
-		Recorder:             mgr.GetEventRecorderFor("LinodeVPCReconciler"),
-		WatchFilterValue:     flags.clusterWatchFilter,
-		LinodeClientConfig:   linodeClientConfig,
-		EnableSubnetDeletion: flags.enableSubnetDeletion,
+		Client:             mgr.GetClient(),
+		Recorder:           mgr.GetEventRecorderFor("linodevpc-controller"),
+		LinodeClientConfig: linodeClientConfig,
+		WatchFilterValue:   flags.clusterWatchFilter,
 	}).SetupWithManager(mgr, crcontroller.Options{MaxConcurrentReconciles: flags.linodeVPCConcurrency}); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "LinodeVPC")
 		os.Exit(1)

cmd/main.go

@@ -73,6 +73,7 @@ spec:
                 - message: Value is immutable
                   rule: self == oldSelf
               retain:
+                default: false
                 description: |-
                   Retain allows you to keep the VPC after the LinodeVPC object is deleted.
                   This is useful if you want to use an existing VPC that was not created by this controller.
@@ -90,10 +91,10 @@ spec:
                       minLength: 3
                       type: string
                     retain:
+                      default: false
                       description: |-
                         Retain allows you to keep the Subnet after the LinodeVPC object is deleted.
-                        This is only applicable when the parent VPC has RetainVPC set to true and the
-                        --enable-subnet-deletion flag is enabled on the controller.
+                        This is only applicable when the parent VPC has RetainVPC set to true.
                       type: boolean
                     subnetID:
                       description: SubnetID is subnet id for the subnet

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

@@ -1059,7 +1059,7 @@ _Appears in:_
 | `description` _string_ |  |  |  |
 | `region` _string_ |  |  |  |
 | `subnets` _[VPCSubnetCreateOptions](#vpcsubnetcreateoptions) array_ |  |  |  |
-| `retain` _boolean_ | Retain allows you to keep the VPC after the LinodeVPC object is deleted.<br />This is useful if you want to use an existing VPC that was not created by this controller.<br />If set to true, the controller will not delete the VPC resource in Linode.<br />Defaults to false. |  |  |
+| `retain` _boolean_ | Retain allows you to keep the VPC after the LinodeVPC object is deleted.<br />This is useful if you want to use an existing VPC that was not created by this controller.<br />If set to true, the controller will not delete the VPC resource in Linode.<br />Defaults to false. | false |  |
 | `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 provisioning this VPC. If not<br />supplied then the credentials of the controller will be used. |  |  |
 
 
@@ -1218,6 +1218,6 @@ _Appears in:_
 | `label` _string_ |  |  | MaxLength: 63 <br />MinLength: 3 <br /> |
 | `ipv4` _string_ |  |  |  |
 | `subnetID` _integer_ | SubnetID is subnet id for the subnet |  |  |
-| `retain` _boolean_ | Retain allows you to keep the Subnet after the LinodeVPC object is deleted.<br />This is only applicable when the parent VPC has RetainVPC set to true and the<br />--enable-subnet-deletion flag is enabled on the controller. |  |  |
+| `retain` _boolean_ | Retain allows you to keep the Subnet after the LinodeVPC object is deleted.<br />This is only applicable when the parent VPC has RetainVPC set to true. | false |  |