Skip to content

Commit ab6fc41

Browse files
author
Moritz Clasmeier
committed
Less noisy warnings
1 parent 94e9f6a commit ab6fc41

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

cmd/deploy.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,9 @@ func configureConfig(log *logger.Logger, components component.Component, deployS
398398
deploySettings.Roxie.ClusterType = clusterType
399399
}
400400
clusterType := deploySettings.Roxie.ClusterType
401+
centralDeployLocally := components.IncludesCentral() && clusterType.IsLocal()
402+
sensorDeployLocally := components.IncludesSensor() && clusterType.IsLocal()
403+
401404
defaults, err := clusterdefaults.ApplyClusterDefaults(deploySettings)
402405
if err != nil {
403406
return err
@@ -412,15 +415,18 @@ func configureConfig(log *logger.Logger, components component.Component, deployS
412415
profile := clusterdefaults.ResolveAutoResourceProfile(clusterType)
413416
log.Dimf("Selecting resource profile %v for Central", profile)
414417
deploySettings.Central.ResourceProfile = profile
415-
} else if components.IncludesCentral() && deploySettings.Roxie.ClusterType.IsLocal() {
416-
log.Warning("You are deploying Central to a local cluster, it is recommended to use --resources=auto.")
417418
}
419+
if centralDeployLocally && deploySettings.Central.ResourceProfile == types.ResourceProfileAcsDefaults {
420+
log.Warning("You are deploying Central to a local cluster, it is recommended to specify a resource profile (or --resources=auto)")
421+
}
422+
418423
if deploySettings.SecuredCluster.ResourceProfile == types.ResourceProfileAuto {
419424
profile := clusterdefaults.ResolveAutoResourceProfile(clusterType)
420425
log.Dimf("Selecting resource profile %v for SecuredCluster", profile)
421426
deploySettings.SecuredCluster.ResourceProfile = profile
422-
} else if components.IncludesSensor() && deploySettings.Roxie.ClusterType.IsLocal() {
423-
log.Warning("You are deploying SecuredCluster to a local cluster, it is recommended to use --resources=auto.")
427+
}
428+
if sensorDeployLocally && deploySettings.SecuredCluster.ResourceProfile == types.ResourceProfileAcsDefaults {
429+
log.Warning("You are deploying SecuredCluster to a local cluster, it is recommended to specify a resource profile (or --resources=auto)")
424430
}
425431

426432
// We need to do this regardless of whether the operator is deployed or not, because

0 commit comments

Comments
 (0)