CR: updated nodesToReplicasRation to int32

octarinesec · May 29, 2023 · e7f45ad · e7f45ad
1 parent 7cc197c
commit e7f45ad
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/api/v1/runtime_types.go b/api/v1/runtime_types.go
@@ -29,7 +29,7 @@ type CBContainersRuntimeResolverSpec struct {
 	// +kubebuilder:default:="info"
 	LogLevel string `json:"logLevel,omitempty"`
 	// +kubebuilder:default:=5
-	NodesToReplicasRatio *int32 `json:"nodesToReplicasRatio,omitempty"`
+	NodesToReplicasRatio int32 `json:"nodesToReplicasRatio,omitempty"`
 }
 
 type CBContainersRuntimeSensorSpec struct {

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/cbcontainers/state/components/runtime_resolver_deployment.go b/cbcontainers/state/components/runtime_resolver_deployment.go
@@ -233,7 +233,7 @@ func (obj *ResolverDeploymentK8sObject) mutateVolumesMounts(container *coreV1.Co
 	commonState.MutateVolumeMountToIncludeRootCAsVolumeMount(container)
 }
 
-func (obj *ResolverDeploymentK8sObject) getDynamicReplicasCount(nodesToReplicasRatio *int32) (*int32, error) {
+func (obj *ResolverDeploymentK8sObject) getDynamicReplicasCount(nodesToReplicasRatio int32) (*int32, error) {
 	// Get the in-cluster config
 	config, err := rest.InClusterConfig()
 	if err != nil {
@@ -252,7 +252,7 @@ func (obj *ResolverDeploymentK8sObject) getDynamicReplicasCount(nodesToReplicasR
 		return nil, fmt.Errorf("error getting list of nodes: %v", err)
 	}
 
-	nodesCount := int32(math.Ceil(float64(len(nodes.Items)) / float64(*nodesToReplicasRatio)))
+	nodesCount := int32(math.Ceil(float64(len(nodes.Items)) / float64(nodesToReplicasRatio)))
 
 	return &nodesCount, nil
 }
diff --git a/config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml b/config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml
@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.9.0
   creationTimestamp: null
   name: cbcontainersagents.operator.containers.carbonblack.io
 spec:
@@ -6022,9 +6021,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/controllers/runtime_components_defaults.go b/controllers/runtime_components_defaults.go
@@ -45,9 +45,8 @@ func (r *CBContainersAgentController) setRuntimeResolverDefaults(runtimeResolver
 		runtimeResolver.Env = make(map[string]string)
 	}
 
-	if runtimeResolver.NodesToReplicasRatio == nil {
-		defaultNodesToReplicasRatio := int32(5)
-		runtimeResolver.NodesToReplicasRatio = &defaultNodesToReplicasRatio
+	if runtimeResolver.NodesToReplicasRatio == 0 {
+		runtimeResolver.NodesToReplicasRatio = 5
 	}
 
 	setDefaultPrometheus(&runtimeResolver.Prometheus)