Skip to content

Commit 48e7c50

Browse files
committed
feat: skip image builder if images are provided
1 parent e2a2e67 commit 48e7c50

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

deploy/cloud/operator/internal/controller/dynamocomponent_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ func getDynamoComponentImagePrefix(DynamoComponent *nvidiacomv1alpha1.DynamoComp
630630
return ""
631631
}
632632

633-
func getDynamoComponentImageName(dynamoComponent *nvidiacomv1alpha1.DynamoComponent, dockerRegistry schemas.DockerRegistrySchema, dynamoComponentRepositoryName, dynamoComponentVersion string) string {
633+
func getDynamoComponentImageName(dynamoComponent *nvidiacomv1alpha1.DynamoComponent, dockerRegistry schemas.DockerRegistrySchema, dynamoComponentVersion string) string {
634634
if dynamoComponent != nil && dynamoComponent.Spec.Image != "" {
635635
return dynamoComponent.Spec.Image
636636
}
@@ -694,11 +694,11 @@ type GetImageInfoOption struct {
694694

695695
//nolint:nakedret
696696
func (r *DynamoComponentReconciler) getImageInfo(opt GetImageInfoOption) ImageInfo {
697-
dynamoComponentRepositoryName, _, dynamoComponentVersion := xstrings.Partition(opt.DynamoComponent.Spec.DynamoComponent, ":")
697+
_, _, dynamoComponentVersion := xstrings.Partition(opt.DynamoComponent.Spec.DynamoComponent, ":")
698698
dockerRegistry := r.getDockerRegistry(opt.DynamoComponent)
699699
imageInfo := ImageInfo{
700700
DockerRegistry: *dockerRegistry,
701-
ImageName: getDynamoComponentImageName(opt.DynamoComponent, *dockerRegistry, dynamoComponentRepositoryName, dynamoComponentVersion),
701+
ImageName: getDynamoComponentImageName(opt.DynamoComponent, *dockerRegistry, dynamoComponentVersion),
702702
DockerConfigJSONSecretName: dockerRegistry.SecretName,
703703
DockerRegistryInsecure: opt.DynamoComponent.Annotations[commonconsts.KubeAnnotationDynamoDockerRegistryInsecure] == "true",
704704
}

deploy/cloud/operator/internal/dynamo/graph.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ func SetLwsAnnotations(serviceArgs *ServiceArgs, deployment *v1alpha1.DynamoComp
283283
return nil
284284
}
285285

286+
// nolint:gocyclo
286287
// GenerateDynamoComponentsDeployments generates a map of DynamoComponentDeployments from a DynamoGraphConfig
287288
func GenerateDynamoComponentsDeployments(ctx context.Context, parentDynamoGraphDeployment *v1alpha1.DynamoGraphDeployment, config *DynamoGraphConfig, ingressSpec *v1alpha1.IngressSpec) (map[string]*v1alpha1.DynamoComponentDeployment, map[string]*v1alpha1.DynamoComponent, error) {
288289
dynamoServices := make(map[string]string)

0 commit comments

Comments
 (0)