Skip to content

Commit 60f24ee

Browse files
author
Moritz Clasmeier
committed
wip
1 parent 433f30d commit 60f24ee

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

cmd/deploy.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,10 @@ Examples:
225225
val = float64(v)
226226
}
227227
pathElements := strings.Split(key, ".")
228+
if len(pathElements) > 0 && pathElements[0] == "spec" {
229+
// Special error reporting for this case, because it was supported previously.
230+
return errors.New("set expression begin with 'spec.' -- it must be prefixed with 'central.' or 'securedCluster.'")
231+
}
228232
u, err := helpers.StructToMap(settings)
229233
if err != nil {
230234
return err
@@ -384,12 +388,6 @@ func runDeploy(cmd *cobra.Command, args []string) error {
384388
return err
385389
}
386390

387-
if !deploySettings.Operator.SkipDeployment {
388-
if err := deploySettings.Operator.Configure(&deploySettings.Roxie); err != nil {
389-
return fmt.Errorf("configuring operator configuration: %w", err)
390-
}
391-
}
392-
393391
if deploySettings.Roxie.Version != "" {
394392
log.Dimf("Using main image tag %s", deploySettings.Roxie.Version)
395393
} else {
@@ -400,6 +398,12 @@ func runDeploy(cmd *cobra.Command, args []string) error {
400398
deploySettings.Roxie.Version = mainImageTag
401399
}
402400

401+
if !deploySettings.Operator.SkipDeployment {
402+
if err := deploySettings.Operator.Configure(&deploySettings.Roxie); err != nil {
403+
return fmt.Errorf("configuring operator configuration: %w", err)
404+
}
405+
}
406+
403407
if verbose {
404408
log.Dim("Deployment configuration:")
405409
helpers.LogMultilineYaml(log, deploySettings)

0 commit comments

Comments
 (0)