Add more checks around dataplaneKeySecretName

Author: bjee19

internal/controller/provisioner/eventloop.go

@@ -40,7 +40,10 @@ func newEventLoop(
 	secretsToWatch := make([]string, 0, len(dockerSecrets)+5)
 	secretsToWatch = append(secretsToWatch, agentTLSSecret)
 	secretsToWatch = append(secretsToWatch, dockerSecrets...)
-	secretsToWatch = append(secretsToWatch, dataplaneKeySecret)
+
+	if dataplaneKeySecret != "" {
+		secretsToWatch = append(secretsToWatch, dataplaneKeySecret)
+	}
 
 	if usageConfig != nil {
 		if usageConfig.SecretName != "" {

internal/controller/provisioner/handler.go

@@ -124,12 +124,10 @@ func (h *eventHandler) HandleEventBatch(ctx context.Context, logger logr.Logger,
 				}
 			case *corev1.Secret:
 				if h.provisioner.isUserSecret(e.NamespacedName.Name) {
-					fmt.Println("This should be a user secret")
 					if err := h.deprovisionSecretsForAllGateways(ctx, e.NamespacedName.Name); err != nil {
 						logger.Error(err, "error removing secrets")
 					}
 				} else {
-					fmt.Println("aparently we are reprovisioning")
 					if err := h.reprovisionResources(ctx, e); err != nil {
 						logger.Error(err, "error re-provisioning nginx resources")
 					}

internal/controller/provisioner/provisioner.go

@@ -106,13 +106,18 @@ func NewNginxProvisioner(
 		clientSSLSecretName = cfg.PlusUsageConfig.ClientSSLSecretName
 	}
 
+	var dataplaneKeySecretName string
+	if cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName != "" {
+		dataplaneKeySecretName = cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName
+	}
+
 	store := newStore(
 		cfg.NginxDockerSecretNames,
 		cfg.AgentTLSSecretName,
 		jwtSecretName,
 		caSecretName,
 		clientSSLSecretName,
-		cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName,
+		dataplaneKeySecretName,
 	)
 
 	selector := metav1.LabelSelector{
@@ -133,7 +138,7 @@ func NewNginxProvisioner(
 	agentLabelCollector := labelCollectorFactory(mgr, cfg)
 	agentLabels, err := agentLabelCollector.Collect(ctx)
 	if err != nil {
-		return nil, nil, fmt.Errorf("failed to collect agent labels: %w", err)
+		cfg.Logger.Error(err, "failed to collect agent labels")
 	}
 	cfg.AgentLabels = agentLabels
 
@@ -160,7 +165,7 @@ func NewNginxProvisioner(
 		cfg.GatewayPodConfig.Namespace,
 		cfg.NginxDockerSecretNames,
 		cfg.AgentTLSSecretName,
-		cfg.NginxOneConsoleTelemetryConfig.DataplaneKeySecretName,
+		dataplaneKeySecretName,
 		cfg.PlusUsageConfig,
 		isOpenshift,
 	)