[artemiscloud#348] Revert redelivery factor fields to *float32

ruromero · Oct 20, 2022 · e7f6e3d · e7f6e3d
1 parent e4ee7c6
commit e7f6e3d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -95,12 +95,14 @@ help: ## Display this help.
 manifests: controller-gen kustomize
 ifeq ($(ENABLE_WEBHOOKS),true)
 ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
+## v2alpha3, v2alpha4 and v2alpha3 requires allowDangerousTypes=true because they use float32 type
 	cd config/manager && $(KUSTOMIZE) edit add resource webhook_secret.yaml 
-	$(CONTROLLER_GEN) rbac:roleName=$(OPERATOR_CLUSTER_ROLE_NAME) crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=$(OPERATOR_CLUSTER_ROLE_NAME) crd:allowDangerousTypes=true webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 else
 ## Generate ClusterRole and CustomResourceDefinition objects.
+## v2alpha3, v2alpha4 and v2alpha3 requires allowDangerousTypes=true because they use float32 type
 	cd config/manager && $(KUSTOMIZE) edit remove resource webhook_secret.yaml 
-	$(CONTROLLER_GEN) rbac:roleName=$(OPERATOR_CLUSTER_ROLE_NAME) crd paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=$(OPERATOR_CLUSTER_ROLE_NAME) crd:allowDangerousTypes=true paths="./..." output:crd:artifacts:config=config/crd/bases
 endif
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

diff --git a/api/v2alpha3/activemqartemis_types.go b/api/v2alpha3/activemqartemis_types.go
@@ -60,9 +60,9 @@ type AddressSettingType struct {
 	MaxExpiryDelay                *int32  `json:"maxExpiryDelay,omitempty"`
 	RedeliveryDelay               *int32  `json:"redeliveryDelay,omitempty"`
 	RedeliveryDelayMultiplier     *int32  `json:"redeliveryDelayMultiplier,omitempty"`
-	// controller-gen currently doesn't support float types
-	// RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-	RedeliveryCollisionAvoidanceFactor *string `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
+	//
+	RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"` // controller-gen requires crd:allowDangerousTypes=true to allow support float types
+	//
 	MaxRedeliveryDelay                 *int32  `json:"maxRedeliveryDelay,omitempty"`
 	MaxDeliveryAttempts                *int32  `json:"maxDeliveryAttempts,omitempty"`
 	MaxSizeBytes                       *string `json:"maxSizeBytes,omitempty"`

diff --git a/api/v2alpha4/activemqartemis_types.go b/api/v2alpha4/activemqartemis_types.go
@@ -60,9 +60,9 @@ type AddressSettingType struct {
 	MaxExpiryDelay                *int32  `json:"maxExpiryDelay,omitempty"`
 	RedeliveryDelay               *int32  `json:"redeliveryDelay,omitempty"`
 	RedeliveryDelayMultiplier     *int32  `json:"redeliveryDelayMultiplier,omitempty"`
-	// currentl controller-gen doesn't support float type
-	// RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-	RedeliveryCollisionAvoidanceFactor *string `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
+	//
+	RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"` // controller-gen requires crd:allowDangerousTypes=true to allow support float types
+	//
 	MaxRedeliveryDelay                 *int32  `json:"maxRedeliveryDelay,omitempty"`
 	MaxDeliveryAttempts                *int32  `json:"maxDeliveryAttempts,omitempty"`
 	MaxSizeBytes                       *string `json:"maxSizeBytes,omitempty"`

diff --git a/api/v2alpha5/activemqartemis_types.go b/api/v2alpha5/activemqartemis_types.go
@@ -59,11 +59,10 @@ type AddressSettingType struct {
 	MinExpiryDelay                *int32  `json:"minExpiryDelay,omitempty"`
 	MaxExpiryDelay                *int32  `json:"maxExpiryDelay,omitempty"`
 	RedeliveryDelay               *int32  `json:"redeliveryDelay,omitempty"`
-	// controller-gen currently doesn't support float types
-	// RedeliveryDelayMultiplier            *float32 `json:"redeliveryDelayMultiplier,omitempty"`
-	// RedeliveryCollisionAvoidanceFactor   *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-	RedeliveryDelayMultiplier            *string `json:"redeliveryDelayMultiplier,omitempty"`
-	RedeliveryCollisionAvoidanceFactor   *string `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
+	//
+	RedeliveryDelayMultiplier          *float32 `json:"redeliveryDelayMultiplier,omitempty"`          // controller-gen requires crd:allowDangerousTypes=true to allow support float types
+	RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"` // controller-gen requires crd:allowDangerousTypes=true to allow support float types
+	//
 	MaxRedeliveryDelay                   *int32  `json:"maxRedeliveryDelay,omitempty"`
 	MaxDeliveryAttempts                  *int32  `json:"maxDeliveryAttempts,omitempty"`
 	MaxSizeBytes                         *string `json:"maxSizeBytes,omitempty"`

diff --git a/config/crd/bases/broker.amq.io_activemqartemises.yaml b/config/crd/bases/broker.amq.io_activemqartemises.yaml
@@ -2790,9 +2790,7 @@ spec:
                         pageSizeBytes:
                           type: string
                         redeliveryCollisionAvoidanceFactor:
-                          description: controller-gen currently doesn't support float
-                            types RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-                          type: string
+                          type: number
                         redeliveryDelay:
                           format: int32
                           type: integer
@@ -3157,9 +3155,7 @@ spec:
                         pageSizeBytes:
                           type: string
                         redeliveryCollisionAvoidanceFactor:
-                          description: currentl controller-gen doesn't support float
-                            type RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-                          type: string
+                          type: number
                         redeliveryDelay:
                           format: int32
                           type: integer
@@ -3539,15 +3535,12 @@ spec:
                         pageSizeBytes:
                           type: string
                         redeliveryCollisionAvoidanceFactor:
-                          type: string
+                          type: number
                         redeliveryDelay:
                           format: int32
                           type: integer
                         redeliveryDelayMultiplier:
-                          description: controller-gen currently doesn't support float
-                            types RedeliveryDelayMultiplier            *float32 `json:"redeliveryDelayMultiplier,omitempty"`
-                            RedeliveryCollisionAvoidanceFactor   *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-                          type: string
+                          type: number
                         redistributionDelay:
                           format: int32
                           type: integer

diff --git a/deploy/crds/broker_activemqartemis_crd.yaml b/deploy/crds/broker_activemqartemis_crd.yaml
@@ -1988,8 +1988,7 @@ spec:
                         pageSizeBytes:
                           type: string
                         redeliveryCollisionAvoidanceFactor:
-                          description: controller-gen currently doesn't support float types RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-                          type: string
+                          type: number
                         redeliveryDelay:
                           format: int32
                           type: integer
@@ -2344,8 +2343,7 @@ spec:
                         pageSizeBytes:
                           type: string
                         redeliveryCollisionAvoidanceFactor:
-                          description: currentl controller-gen doesn't support float type RedeliveryCollisionAvoidanceFactor *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-                          type: string
+                          type: number
                         redeliveryDelay:
                           format: int32
                           type: integer
@@ -2715,13 +2713,12 @@ spec:
                         pageSizeBytes:
                           type: string
                         redeliveryCollisionAvoidanceFactor:
-                          type: string
+                          type: number
                         redeliveryDelay:
                           format: int32
                           type: integer
                         redeliveryDelayMultiplier:
-                          description: controller-gen currently doesn't support float types RedeliveryDelayMultiplier            *float32 `json:"redeliveryDelayMultiplier,omitempty"` RedeliveryCollisionAvoidanceFactor   *float32 `json:"redeliveryCollisionAvoidanceFactor,omitempty"`
-                          type: string
+                          type: number
                         redistributionDelay:
                           format: int32
                           type: integer