Skip to content

Commit daba6f8

Browse files
committed
use status option
1 parent 1f498dc commit daba6f8

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

api/v1/search/mongodbsearch_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ func (s *MongoDBSearch) UpdateStatus(phase status.Phase, statusOptions ...status
143143
if option, exists := status.GetOption(statusOptions, status.WarningsOption{}); exists {
144144
s.Status.Warnings = append(s.Status.Warnings, option.(status.WarningsOption).Warnings...)
145145
}
146+
if option, exists := status.GetOption(statusOptions, MongoDBSearchVersionOption{}); exists {
147+
s.Status.Version = option.(MongoDBSearchVersionOption).Version
148+
}
146149
}
147150

148151
func (s *MongoDBSearch) NamespacedName() types.NamespacedName {

api/v1/search/status_options.go

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package search
2+
3+
import "github.com/mongodb/mongodb-kubernetes/api/v1/status"
4+
5+
// MongoDBSearchVersionOption captures the reconciled mongot version for status updates.
6+
type MongoDBSearchVersionOption struct {
7+
Version string
8+
}
9+
10+
var _ status.Option = MongoDBSearchVersionOption{}
11+
12+
// NewMongoDBSearchVersionOption constructs an option that updates MongoDBSearch status version.
13+
func NewMongoDBSearchVersionOption(version string) MongoDBSearchVersionOption {
14+
return MongoDBSearchVersionOption{Version: version}
15+
}
16+
17+
// Value implements the status.Option interface.
18+
func (o MongoDBSearchVersionOption) Value() interface{} {
19+
return o.Version
20+
}

controllers/searchcontroller/mongodbsearch_reconcile_helper.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ func (r *MongoDBSearchReconcileHelper) reconcile(ctx context.Context, log *zap.S
139139
return statefulSetStatus
140140
}
141141

142-
r.mdbSearch.Status.Version = version
143-
144-
return workflow.OK()
142+
return workflow.OK().WithAdditionalOptions(searchv1.NewMongoDBSearchVersionOption(version))
145143
}
146144

147145
func (r *MongoDBSearchReconcileHelper) ensureSourceKeyfile(ctx context.Context, log *zap.SugaredLogger) (statefulset.Modification, error) {

0 commit comments

Comments
 (0)