Skip to content
This repository was archived by the owner on Jul 19, 2023. It is now read-only.

Commit c78903c

Browse files
authored
Fix "Containers" parameter in Model operator (#161)
1 parent e09db14 commit c78903c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

controllers/model/model_controller.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333

3434
modelv1 "github.com/aws/amazon-sagemaker-operator-for-k8s/api/v1/model"
3535
. "github.com/aws/amazon-sagemaker-operator-for-k8s/controllers"
36+
"github.com/aws/amazon-sagemaker-operator-for-k8s/controllers/controllertest"
3637
"github.com/aws/amazon-sagemaker-operator-for-k8s/controllers/sdkutil"
3738
"github.com/aws/amazon-sagemaker-operator-for-k8s/controllers/sdkutil/clientwrapper"
3839
)
@@ -210,12 +211,12 @@ func (r *ModelReconciler) initializeContext(ctx *reconcileRequestContext) error
210211
ctx.SageMakerClient = clientwrapper.NewSageMakerClientWrapper(r.createSageMakerClient(awsConfig))
211212
ctx.Log.Info("Loaded AWS config")
212213

213-
if ctx.Model.Spec.PrimaryContainer.Mode == nil {
214-
ctx.Model.Spec.PrimaryContainer.Mode = aws.String(DefaultContainerDefinitionMode)
214+
if ctx.Model.Spec.PrimaryContainer != nil && ctx.Model.Spec.PrimaryContainer.Mode == nil {
215+
ctx.Model.Spec.PrimaryContainer.Mode = controllertest.ToStringPtr(DefaultContainerDefinitionMode)
215216
}
216217
for _, container := range ctx.Model.Spec.Containers {
217218
if container.Mode == nil {
218-
container.Mode = aws.String(DefaultContainerDefinitionMode)
219+
container.Mode = controllertest.ToStringPtr(DefaultContainerDefinitionMode)
219220
}
220221
}
221222

controllers/sdkutil/spec_sdk_converters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ func CreateModelSpecFromDescription(description *sagemaker.DescribeModelOutput)
410410

411411
if description.Containers != nil {
412412
for i, _ := range description.Containers {
413-
if _, err := obj.SetP(transformedContainersEnvironment[i], "Containers/"+strconv.Itoa(i)+"/.Environment"); err != nil {
413+
if _, err := obj.SetP(transformedContainersEnvironment[i], "Containers."+strconv.Itoa(i)+".Environment"); err != nil {
414414
return nil, err
415415
}
416416
}

0 commit comments

Comments
 (0)