Skip to content

Commit fe37293

Browse files
committed
Add warnings for removed process args
1 parent efe20ed commit fe37293

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

internal/controller/atlasdeployment/advanced_deployment.go

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,21 @@ func (r *AtlasDeploymentReconciler) ensureAdvancedOptions(ctx *workflow.Context,
220220
return r.transitionFromLegacy(ctx, deploymentService, deploymentInAKO.GetProjectID(), deploymentInAKO.GetCustomResource(), err)
221221
}
222222

223-
if deploymentInAKO.ProcessArgs != nil && !reflect.DeepEqual(deploymentInAKO.ProcessArgs, deploymentInAtlas.ProcessArgs) {
224-
err = deploymentService.UpdateProcessArgs(ctx.Context, deploymentInAKO)
225-
if err != nil {
226-
return r.transitionFromLegacy(ctx, deploymentService, deploymentInAKO.GetProjectID(), deploymentInAKO.GetCustomResource(), err)
223+
if deploymentInAKO.ProcessArgs != nil {
224+
if deploymentInAKO.ProcessArgs.DefaultReadConcern != "" {
225+
ctx.Log.Warn("Process Arg DefaultReadConcern is no longer available in Atlas. Setting this will have no effect.")
226+
}
227+
if deploymentInAKO.ProcessArgs.FailIndexKeyTooLong != nil {
228+
ctx.Log.Warn("Process Arg FailIndexKeyTooLong is no longer available in Atlas. Setting this will have no effect.")
227229
}
230+
if !reflect.DeepEqual(deploymentInAKO.ProcessArgs, deploymentInAtlas.ProcessArgs) {
231+
err = deploymentService.UpdateProcessArgs(ctx.Context, deploymentInAKO)
232+
if err != nil {
233+
return r.transitionFromLegacy(ctx, deploymentService, deploymentInAKO.GetProjectID(), deploymentInAKO.GetCustomResource(), err)
234+
}
228235

229-
return r.transitionFromLegacy(ctx, deploymentService, deploymentInAKO.GetProjectID(), deploymentInAKO.GetCustomResource(), nil)
236+
return r.transitionFromLegacy(ctx, deploymentService, deploymentInAKO.GetProjectID(), deploymentInAKO.GetCustomResource(), nil)
237+
}
230238
}
231239

232240
return nil

internal/translation/deployment/conversion.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ func (c *Cluster) Deprecated() (bool, string) {
116116
}
117117
}
118118
}
119+
if c.ProcessArgs != nil {
120+
if c.ProcessArgs.DefaultReadConcern != "" {
121+
return true, "Process Arg DefaultReadConcern is no longer available in Atlas. Setting this will have no effect."
122+
}
123+
if c.ProcessArgs.FailIndexKeyTooLong != nil {
124+
return true, "Process Arg FailIndexKeyTooLong is no longer available in Atlas. Setting this will have no effect."
125+
}
126+
}
119127
return false, ""
120128
}
121129

@@ -743,10 +751,8 @@ func processArgsFromAtlas(config *admin.ClusterDescriptionProcessArgs20240805) *
743751
}
744752

745753
args := akov2.ProcessArgs{
746-
DefaultReadConcern: config.GetDefaultReadConcern(),
747754
DefaultWriteConcern: config.GetDefaultWriteConcern(),
748755
MinimumEnabledTLSProtocol: config.GetMinimumEnabledTlsProtocol(),
749-
FailIndexKeyTooLong: config.FailIndexKeyTooLong,
750756
JavascriptEnabled: config.JavascriptEnabled,
751757
NoTableScan: pointer.MakePtr(pointer.GetOrDefault(config.NoTableScan, false)),
752758
OplogSizeMB: pointer.MakePtrOrNil(int64(pointer.GetOrDefault(config.OplogSizeMB, 0))),
@@ -923,10 +929,8 @@ func processArgsToAtlas(config *akov2.ProcessArgs) (*admin.ClusterDescriptionPro
923929
}
924930

925931
return &admin.ClusterDescriptionProcessArgs20240805{
926-
DefaultReadConcern: pointer.MakePtrOrNil(config.DefaultReadConcern),
927932
DefaultWriteConcern: pointer.MakePtrOrNil(config.DefaultWriteConcern),
928933
MinimumEnabledTlsProtocol: pointer.MakePtrOrNil(config.MinimumEnabledTLSProtocol),
929-
FailIndexKeyTooLong: config.FailIndexKeyTooLong,
930934
JavascriptEnabled: config.JavascriptEnabled,
931935
NoTableScan: config.NoTableScan,
932936
OplogSizeMB: pointer.MakePtrOrNil(int(pointer.GetOrDefault(config.OplogSizeMB, 0))),

0 commit comments

Comments
 (0)