Skip to content

Commit e90a9dc

Browse files
m1kolafealebenpae
authored andcommitted
CLOUDP-302068: Fix MONGODB_ENTERPRISE_DATABASE_IMAGE read (#4142)
`sharedDatabaseContainerFunc` in non-static architecture currently reads unversioned `MONGODB_ENTERPRISE_DATABASE_IMAGE`. This commit makes the function to take `DATABASE_VERSION` into account.
1 parent c0949d7 commit e90a9dc

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

controllers/operator/construct/database_construction.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,8 @@ func sharedDatabaseContainerFunc(podSpecWrapper mdbv1.PodSpecWrapper, volumeMoun
556556
return env.ReadOrDefault(architectures.MdbAgentImageRepo, "quay.io/mongodb/mongodb-agent-ubi")
557557
}))
558558
} else {
559-
image = container.WithImage(env.ReadOrPanic(util.NonStaticDatabaseEnterpriseImage))
559+
databaseImageVersion := env.ReadOrDefault(DatabaseVersionEnv, "latest")
560+
image = container.WithImage(ContainerImage(util.NonStaticDatabaseEnterpriseImage, databaseImageVersion, nil))
560561
}
561562

562563
return container.Apply(

controllers/operator/construct/database_construction_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,6 @@ func createMongosSpec(sc *mdbv1.MongoDB) *mdbv1.ShardedClusterComponentSpec {
8989
}
9090

9191
func TestStatefulsetCreationPanicsIfEnvVariablesAreNotSet(t *testing.T) {
92-
// NonStaticDatabaseEnterpriseImage is filled in static container
93-
t.Run("Empty Agent Image", func(t *testing.T) {
94-
t.Setenv(util.NonStaticDatabaseEnterpriseImage, "")
95-
rs := mdbv1.NewReplicaSetBuilder().Build()
96-
assert.Panics(t, func() {
97-
DatabaseStatefulSet(*rs, ReplicaSetOptions(GetPodEnvOptions()), zap.S())
98-
})
99-
})
100-
10192
t.Run("Empty Image Pull Policy", func(t *testing.T) {
10293
t.Setenv(util.AutomationAgentImagePullPolicy, "")
10394
sc := mdbv1.NewClusterBuilder().Build()

0 commit comments

Comments
 (0)