Clean up simulator

modules/agent/pkg/register/register.go

@@ -189,7 +189,7 @@ func createClusterSecret(ctx context.Context, clusterID string, k8s corecontroll
 		systemNamespace := string(newSecret.Data[SystemNamespace])
 		deploymentNamespace := newSecret.Data[DeploymentNamespace]
 
-		if systemNamespace != secret.Namespace {
+		if !cfg.IgnoreAgentNamespaceCheck && systemNamespace != secret.Namespace {
 			return nil, fmt.Errorf("fleet-agent must be installed in the namespace %s", systemNamespace)
 		}
 

modules/agent/pkg/simulator/simulator.go

@@ -117,6 +117,10 @@ func setupNamespace(ctx context.Context, kubeConfig, namespace, simNamespace str
 	}
 
 	if conf != nil {
+		conf, err := injectConfig(conf)
+		if err != nil {
+			return "", err
+		}
 		_, err = k8s.CoreV1().ConfigMaps(simNamespace).Create(ctx, &corev1.ConfigMap{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:        conf.Name,
@@ -133,3 +137,16 @@ func setupNamespace(ctx context.Context, kubeConfig, namespace, simNamespace str
 
 	return clusterID, agent.Register(ctx, kubeConfig, simNamespace, clusterID)
 }
+
+func injectConfig(cm *corev1.ConfigMap) (*corev1.ConfigMap, error) {
+	cfg, err := config.ReadConfig(cm)
+	if err != nil {
+		return nil, err
+	}
+	cfg.IgnoreAgentNamespaceCheck = true
+	if cfg.Labels == nil {
+		cfg.Labels = map[string]string{}
+	}
+	cfg.Labels["fleet.cattle.io/non-managed-agent"] = "true"
+	return config.ToConfigMap(cm.Namespace, cm.Name, cfg)
+}

pkg/config/config.go

@@ -43,6 +43,7 @@ type Config struct {
 	GithubURLPrefix                 string            `json:"githubURLPrefix,omitempty"`
 	WebhookReceiverURL              string            `json:"webhookReceiverURL,omitempty"`
 	IgnoreClusterRegistrationLabels bool              `json:"ignoreClusterRegistrationLabels,omitempty"`
+	IgnoreAgentNamespaceCheck       bool              `json:"ignoreAgentNamespaceCheck,omitempty"`
 }
 
 type Bootstrap struct {

scripts/package

@@ -34,6 +34,5 @@ done
 
 build-image fleet
 build-image fleet-agent .agent
-build-image fleet-agent-simulator .simulator
 
 ./scripts/package-helm