Skip to content

Commit d1ca212

Browse files
committed
trimming the edition string before setting edition status
1 parent c93be49 commit d1ca212

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

controllers/database/singleinstancedatabase_controller.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,7 @@ func (r *SingleInstanceDatabaseReconciler) Reconcile(ctx context.Context, req ct
131131
/* Initialize Status */
132132
if singleInstanceDatabase.Status.Status == "" {
133133
singleInstanceDatabase.Status.Status = dbcommons.StatusPending
134-
if singleInstanceDatabase.Spec.Edition != "" {
135-
singleInstanceDatabase.Status.Edition = cases.Title(language.English).String(singleInstanceDatabase.Spec.Edition)
136-
} else {
137-
singleInstanceDatabase.Status.Edition = dbcommons.ValueUnavailable
138-
}
134+
singleInstanceDatabase.Status.Edition = dbcommons.ValueUnavailable
139135
singleInstanceDatabase.Status.Role = dbcommons.ValueUnavailable
140136
singleInstanceDatabase.Status.ConnectString = dbcommons.ValueUnavailable
141137
singleInstanceDatabase.Status.PdbConnectString = dbcommons.ValueUnavailable
@@ -1508,7 +1504,7 @@ func (r *SingleInstanceDatabaseReconciler) createOrReplaceSVC(ctx context.Contex
15081504
r.Log.Info("Pdb for the database is " + pdb)
15091505
r.Log.Info("edition for the database is " + edition)
15101506
r.Log.Info("editon for the dataase is " + cases.Title(language.English).String(edition))
1511-
m.Status.Edition = cases.Title(language.English).String(edition)
1507+
m.Status.Edition = strings.TrimSpace(cases.Title(language.English).String(edition))
15121508
}
15131509

15141510
r.Log.Info("Setting connect string statues")

0 commit comments

Comments
 (0)