Refactor simulator chart

charts/fleet-simulator/templates/configmap.yaml

@@ -5,6 +5,8 @@ metadata:
 data:
   config: |-
     {
-      "labels":{{toJson .Values.labels}}
+      {{ if .Values.labels }}
+      "labels":{{toJson .Values.labels}},
+      {{ end }}
       "clientID":"{{.Values.clientID}}"
     }

charts/fleet-simulator/templates/deployment.yaml

@@ -17,8 +17,9 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: '{{ template "system_default_registry" . }}{{.Values.image.repository}}:{{.Values.image.tag}}'
-        arguments:
+        image: '{{.Values.image.repository}}:{{.Values.image.tag}}'
+        args:
+        - "fleetagent"
         - "--simulators={{.Values.simulators}}"
         name: fleet-agent-simulator
       serviceAccountName: fleet-agent

charts/fleet-simulator/templates/rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: fleet-agent-system-fleet-agent-role
+  name: fleet-agent-simulator-fleet-agent-role
 rules:
 - apiGroups:
   - '*'
@@ -14,11 +14,11 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: fleet-agent-system-fleet-agent-role-binding
+  name: fleet-agent-simulator-fleet-agent-role-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: fleet-agent-system-fleet-agent-role
+  name: fleet-agent-simulator-fleet-agent-role
 subjects:
 - kind: ServiceAccount
   name: fleet-agent

charts/fleet-simulator/values.yaml

@@ -2,34 +2,11 @@ image:
   repository: rancher/fleet-agent
   tag: dev
 
-# The public URL of the Kubernetes API server running the Fleet Manager must be set here
-# Example: https://example.com:6443
-apiServerURL: ""
-
-# The the pem encoded value of the CA of the Kubernetes API server running the Fleet Manager.
-# If left empty it is assumed this Kubernetes API TLS is signed by a well known CA.
-apiServerCA: ""
-
-# The cluster registration value
-token: ""
-
 # Labels to add to the cluster upon registration only. They are not added after the fact.
 #labels:
 #  foo: bar
 # The client ID of the cluster to associate with
 clientID: ""
 
-# The namespace of the cluster we are register with
-clusterNamespace: ""
-
 # Number of simulator to run
 simulators: 1
-
-# The namespace containing the clusters registration secrets
-systemRegistrationNamespace: fleet-clusters-system
-
-# Please do not change the below setting unless you really know what you are doing
-internal:
-  systemNamespace: fleet-system
-  managedReleaseName: fleet-agent
-