Bugfix: do not ignore agentCheckinInterval

Signed-off-by: Silvio Moioli <[email protected]>
sebastienmusso · Nov 4, 2022 · 10a1d2f · 10a1d2f
1 parent 8d1ce20
commit 10a1d2f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go
@@ -75,7 +75,7 @@ func AgentWithConfig(ctx context.Context, agentNamespace, controllerNamespace, a
 	mo.AgentImage = cfg.AgentImage
 	mo.SystemDefaultRegistry = cfg.SystemDefaultRegistry
 	mo.AgentImagePullPolicy = cfg.AgentImagePullPolicy
-	mo.CheckinInterval = cfg.AgentCheckinInternal.Duration.String()
+	mo.CheckinInterval = cfg.AgentCheckinInterval.Duration.String()
 
 	objs = append(objs, Manifest(agentNamespace, agentScope, mo)...)
 

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -38,7 +38,7 @@ type Config struct {
 	AgentImage                      string            `json:"agentImage,omitempty"`
 	AgentImagePullPolicy            string            `json:"agentImagePullPolicy,omitempty"`
 	SystemDefaultRegistry           string            `json:"systemDefaultRegistry,omitempty"`
-	AgentCheckinInternal            metav1.Duration   `json:"agentCheckinInternal,omitempty"`
+	AgentCheckinInterval            metav1.Duration   `json:"agentCheckinInterval,omitempty"`
 	ManageAgent                     *bool             `json:"manageAgent,omitempty"`
 	Labels                          map[string]string `json:"labels,omitempty"`
 	ClientID                        string            `json:"clientID,omitempty"`

diff --git a/pkg/controllers/cluster/import.go b/pkg/controllers/cluster/import.go
@@ -264,7 +264,7 @@ func (i *importHandler) importCluster(cluster *fleet.Cluster, status fleet.Clust
 			},
 			ManifestOptions: agent.ManifestOptions{
 				AgentEnvVars:    cluster.Spec.AgentEnvVars,
-				CheckinInterval: cfg.AgentCheckinInternal.Duration.String(),
+				CheckinInterval: cfg.AgentCheckinInterval.Duration.String(),
 				Generation:      string(cluster.UID) + "-" + strconv.FormatInt(cluster.Generation, 10),
 				PrivateRepoURL:  cluster.Spec.PrivateRepoURL,
 			},

diff --git a/pkg/controllers/manageagent/manageagent.go b/pkg/controllers/manageagent/manageagent.go
@@ -181,7 +181,7 @@ func (h *handler) newAgentBundle(ns string, cluster *fleet.Cluster) (runtime.Obj
 			AgentEnvVars:          cluster.Spec.AgentEnvVars,
 			AgentImage:            cfg.AgentImage,
 			AgentImagePullPolicy:  cfg.AgentImagePullPolicy,
-			CheckinInterval:       cfg.AgentCheckinInternal.Duration.String(),
+			CheckinInterval:       cfg.AgentCheckinInterval.Duration.String(),
 			Generation:            "bundle",
 			PrivateRepoURL:        cluster.Spec.PrivateRepoURL,
 			SystemDefaultRegistry: cfg.SystemDefaultRegistry,