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

ruromero · Oct 28, 2022 · 280ebdb · 280ebdb
1 parent eff3ca3
commit 280ebdb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -98,13 +98,19 @@ ifeq ($(ENABLE_WEBHOOKS),true)
 ## 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:allowDangerousTypes=true webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+<<<<<<< HEAD
 	find config -type f -exec sed -i -e '/creationTimestamp/d' {} \;
+=======
+>>>>>>> e7f6e3df ([#348] Revert redelivery factor fields to *float32)
 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:allowDangerousTypes=true paths="./..." output:crd:artifacts:config=config/crd/bases
+<<<<<<< HEAD
 	find config -type f -exec sed -i -e '/creationTimestamp/d' {} \;
+=======
+>>>>>>> e7f6e3df ([#348] Revert redelivery factor fields to *float32)
 endif
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.