Fix unnecessary reconcile caused by envoy pdb struct

Author: baluchicken

api/v1beta1/kafkacluster_types.go

@@ -251,7 +251,7 @@ type EnvoyConfig struct {
 	// Envoy admin port
 	AdminPort *int32 `json:"adminPort,omitempty"`
 	// DisruptionBudget is the pod disruption budget attached to Envoy Deployment(s)
-	DisruptionBudget DisruptionBudgetWithStrategy `json:"disruptionBudget,omitempty"`
+	DisruptionBudget *DisruptionBudgetWithStrategy `json:"disruptionBudget,omitempty"`
 }
 
 // IstioIngressConfig defines the config for the Istio Ingress Controller
@@ -585,6 +585,14 @@ func (eConfig *EnvoyConfig) GetAnnotations() map[string]string {
 	return util.CloneMap(eConfig.Annotations)
 }
 
+//GetDistruptionBudget returns DisruptionBudget to use for Envoy generated Pods
+func (eConfig *EnvoyConfig) GetDistruptionBudget() DisruptionBudgetWithStrategy {
+	if eConfig.DisruptionBudget != nil {
+		return *eConfig.DisruptionBudget
+	}
+	return DisruptionBudgetWithStrategy{}
+}
+
 // GetReplicas returns replicas used by the Envoy deployment
 func (eConfig *EnvoyConfig) GetReplicas() int32 {
 	if eConfig.Replicas == 0 {

api/v1beta1/zz_generated.deepcopy.go

@@ -68,7 +68,7 @@ func (r *Reconciler) Reconcile(log logr.Logger) error {
 					r.deployment,
 				)
 
-				if r.KafkaCluster.Spec.EnvoyConfig.DisruptionBudget.DisruptionBudget.Create {
+				if r.KafkaCluster.Spec.EnvoyConfig.GetDistruptionBudget().DisruptionBudget.Create {
 					externalListernerResources = append(externalListernerResources, r.podDisruptionBudget)
 				}
 				for name, ingressConfig := range ingressConfigs {

pkg/resources/envoy/envoy.go

@@ -41,7 +41,7 @@ func (r *Reconciler) podDisruptionBudget(log logr.Logger, extListener v1beta1.Ex
 	var deploymentName string = util.GenerateEnvoyResourceName(envoyutils.EnvoyDeploymentName, envoyutils.EnvoyDeploymentNameWithScope,
 		extListener, ingressConfig, ingressConfigName, r.KafkaCluster.GetName())
 
-	pdbConfig := r.KafkaCluster.Spec.EnvoyConfig.DisruptionBudget
+	pdbConfig := r.KafkaCluster.Spec.EnvoyConfig.GetDistruptionBudget()
 
 	// We use intstr.Parse so that the proper structure is used when passing to PDB spec validator, otherwise
 	// an improper regex will be used to verify the value