Address PR comments

caraml-dev · Feb 21, 2023 · c2c34d8 · c2c34d8
1 parent 80436d0
commit c2c34d8
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 55 deletions.
diff --git a/api/cmd/api/setup.go b/api/cmd/api/setup.go
@@ -133,16 +133,16 @@ func initImageBuilder(cfg *config.Config) (webserviceBuilder imagebuilder.ImageB
 	}
 
 	webServiceConfig := imagebuilder.Config{
-		BaseImages:             cfg.ImageBuilderConfig.BaseImages,
-		BuildNamespace:         cfg.ImageBuilderConfig.BuildNamespace,
-		DockerRegistry:         cfg.ImageBuilderConfig.DockerRegistry,
-		ContextSubPath:         cfg.ImageBuilderConfig.ContextSubPath,
-		BuildTimeoutDuration:   timeout,
-		KanikoImage:            cfg.ImageBuilderConfig.KanikoImage,
-		ResourceRequestsLimits: cfg.ImageBuilderConfig.ResourceRequestsLimits,
-		Tolerations:            cfg.ImageBuilderConfig.Tolerations,
-		NodeSelectors:          cfg.ImageBuilderConfig.NodeSelectors,
-		MaximumRetry:           cfg.ImageBuilderConfig.MaximumRetry,
+		BaseImages:           cfg.ImageBuilderConfig.BaseImages,
+		BuildNamespace:       cfg.ImageBuilderConfig.BuildNamespace,
+		DockerRegistry:       cfg.ImageBuilderConfig.DockerRegistry,
+		ContextSubPath:       cfg.ImageBuilderConfig.ContextSubPath,
+		BuildTimeoutDuration: timeout,
+		KanikoImage:          cfg.ImageBuilderConfig.KanikoImage,
+		Resources:            cfg.ImageBuilderConfig.Resources,
+		Tolerations:          cfg.ImageBuilderConfig.Tolerations,
+		NodeSelectors:        cfg.ImageBuilderConfig.NodeSelectors,
+		MaximumRetry:         cfg.ImageBuilderConfig.MaximumRetry,
 
 		ClusterName: cfg.ImageBuilderConfig.ClusterName,
 		GcpProject:  cfg.ImageBuilderConfig.GcpProject,
@@ -152,16 +152,16 @@ func initImageBuilder(cfg *config.Config) (webserviceBuilder imagebuilder.ImageB
 	webserviceBuilder = imagebuilder.NewModelServiceImageBuilder(kubeClient, webServiceConfig)
 
 	predJobConfig := imagebuilder.Config{
-		BaseImages:             cfg.ImageBuilderConfig.PredictionJobBaseImages,
-		BuildNamespace:         cfg.ImageBuilderConfig.BuildNamespace,
-		DockerRegistry:         cfg.ImageBuilderConfig.DockerRegistry,
-		ContextSubPath:         cfg.ImageBuilderConfig.PredictionJobContextSubPath,
-		BuildTimeoutDuration:   timeout,
-		KanikoImage:            cfg.ImageBuilderConfig.KanikoImage,
-		ResourceRequestsLimits: cfg.ImageBuilderConfig.ResourceRequestsLimits,
-		Tolerations:            cfg.ImageBuilderConfig.Tolerations,
-		NodeSelectors:          cfg.ImageBuilderConfig.NodeSelectors,
-		MaximumRetry:           cfg.ImageBuilderConfig.MaximumRetry,
+		BaseImages:           cfg.ImageBuilderConfig.PredictionJobBaseImages,
+		BuildNamespace:       cfg.ImageBuilderConfig.BuildNamespace,
+		DockerRegistry:       cfg.ImageBuilderConfig.DockerRegistry,
+		ContextSubPath:       cfg.ImageBuilderConfig.PredictionJobContextSubPath,
+		BuildTimeoutDuration: timeout,
+		KanikoImage:          cfg.ImageBuilderConfig.KanikoImage,
+		Resources:            cfg.ImageBuilderConfig.Resources,
+		Tolerations:          cfg.ImageBuilderConfig.Tolerations,
+		NodeSelectors:        cfg.ImageBuilderConfig.NodeSelectors,
+		MaximumRetry:         cfg.ImageBuilderConfig.MaximumRetry,
 
 		ClusterName: cfg.ImageBuilderConfig.ClusterName,
 		GcpProject:  cfg.ImageBuilderConfig.GcpProject,

diff --git a/api/config/config.go b/api/config/config.go
@@ -162,7 +162,7 @@ type ImageBuilderConfig struct {
 	DockerRegistry               string                 `envconfig:"IMG_BUILDER_DOCKER_REGISTRY"`
 	BuildTimeout                 string                 `envconfig:"IMG_BUILDER_TIMEOUT" default:"10m"`
 	KanikoImage                  string                 `envconfig:"IMG_BUILDER_KANIKO_IMAGE" default:"gcr.io/kaniko-project/executor:v1.6.0"`
-	ResourceRequestsLimits       ResourceRequestsLimits `envconfig:"IMG_BUILDER_RESOURCE_REQUESTS_LIMITS"`
+	Resources                    ResourceRequestsLimits `envconfig:"IMG_BUILDER_RESOURCES"`
 	// How long to keep the image building job resource in the Kubernetes cluster. Default: 2 days (48 hours).
 	Retention     time.Duration        `envconfig:"IMG_BUILDER_RETENTION" default:"48h"`
 	Tolerations   Tolerations          `envconfig:"IMG_BUILDER_TOLERATIONS"`

diff --git a/api/pkg/imagebuilder/config.go b/api/pkg/imagebuilder/config.go
@@ -36,7 +36,7 @@ type Config struct {
 	// Kaniko docker image
 	KanikoImage string
 	// Kubernetes resource request and limits for kaniko
-	ResourceRequestsLimits cfg.ResourceRequestsLimits
+	Resources cfg.ResourceRequestsLimits
 	// Tolerations for Jobs Specification
 	Tolerations []v1.Toleration
 	// Node Selectors for Jobs Specification

diff --git a/api/pkg/imagebuilder/imagebuilder.go b/api/pkg/imagebuilder/imagebuilder.go
@@ -364,18 +364,18 @@ func (c *imageBuilder) createKanikoJobSpec(project mlp.Project, model *models.Mo
 	resourceRequirements := RequestLimitResources{
 		Request: Resource{
 			CPU: resource.MustParse(
-				c.config.ResourceRequestsLimits.Requests.CPU,
+				c.config.Resources.Requests.CPU,
 			),
 			Memory: resource.MustParse(
-				c.config.ResourceRequestsLimits.Requests.Memory,
+				c.config.Resources.Requests.Memory,
 			),
 		},
 		Limit: Resource{
 			CPU: resource.MustParse(
-				c.config.ResourceRequestsLimits.Limits.CPU,
+				c.config.Resources.Limits.CPU,
 			),
 			Memory: resource.MustParse(
-				c.config.ResourceRequestsLimits.Limits.Memory,
+				c.config.Resources.Limits.Memory,
 			),
 		},
 	}

diff --git a/api/pkg/imagebuilder/imagebuilder_test.go b/api/pkg/imagebuilder/imagebuilder_test.go
@@ -111,7 +111,7 @@ var (
 		GcpProject:           "test-project",
 		Environment:          "dev",
 		KanikoImage:          "gcr.io/kaniko-project/executor:v1.1.0",
-		ResourceRequestsLimits: cfg.ResourceRequestsLimits{
+		Resources: cfg.ResourceRequestsLimits{
 			Requests: cfg.Resource{
 				CPU:    "500m",
 				Memory: "1Gi",
@@ -381,13 +381,13 @@ func TestBuildImage(t *testing.T) {
 						DockerfilePath:  "./Dockerfile",
 					},
 				},
-				DockerRegistry:         dockerRegistry,
-				BuildTimeoutDuration:   timeout,
-				ClusterName:            "my-cluster",
-				GcpProject:             "test-project",
-				Environment:            "dev",
-				KanikoImage:            "gcr.io/kaniko-project/executor:v1.1.0",
-				ResourceRequestsLimits: config.ResourceRequestsLimits,
+				DockerRegistry:       dockerRegistry,
+				BuildTimeoutDuration: timeout,
+				ClusterName:          "my-cluster",
+				GcpProject:           "test-project",
+				Environment:          "dev",
+				KanikoImage:          "gcr.io/kaniko-project/executor:v1.1.0",
+				Resources:            config.Resources,
 				NodeSelectors: map[string]string{
 					"cloud.google.com/gke-nodepool": "image-building-job-node-pool",
 				},
@@ -514,13 +514,13 @@ func TestBuildImage(t *testing.T) {
 						DockerfilePath:  "./Dockerfile",
 					},
 				},
-				DockerRegistry:         dockerRegistry,
-				BuildTimeoutDuration:   timeout,
-				ClusterName:            "my-cluster",
-				GcpProject:             "test-project",
-				Environment:            "dev",
-				KanikoImage:            "gcr.io/kaniko-project/executor:v1.1.0",
-				ResourceRequestsLimits: config.ResourceRequestsLimits,
+				DockerRegistry:       dockerRegistry,
+				BuildTimeoutDuration: timeout,
+				ClusterName:          "my-cluster",
+				GcpProject:           "test-project",
+				Environment:          "dev",
+				KanikoImage:          "gcr.io/kaniko-project/executor:v1.1.0",
+				Resources:            config.Resources,
 				Tolerations: []v1.Toleration{
 					{
 						Key:      "image-build-job",
@@ -653,16 +653,16 @@ func TestBuildImage(t *testing.T) {
 						DockerfilePath:  "./Dockerfile",
 					},
 				},
-				DockerRegistry:         config.DockerRegistry,
-				BuildTimeoutDuration:   config.BuildTimeoutDuration,
-				ClusterName:            config.ClusterName,
-				GcpProject:             config.GcpProject,
-				Environment:            config.Environment,
-				KanikoImage:            config.KanikoImage,
-				ResourceRequestsLimits: config.ResourceRequestsLimits,
-				MaximumRetry:           config.MaximumRetry,
-				NodeSelectors:          config.NodeSelectors,
-				Tolerations:            config.Tolerations,
+				DockerRegistry:       config.DockerRegistry,
+				BuildTimeoutDuration: config.BuildTimeoutDuration,
+				ClusterName:          config.ClusterName,
+				GcpProject:           config.GcpProject,
+				Environment:          config.Environment,
+				KanikoImage:          config.KanikoImage,
+				Resources:            config.Resources,
+				MaximumRetry:         config.MaximumRetry,
+				NodeSelectors:        config.NodeSelectors,
+				Tolerations:          config.Tolerations,
 			},
 		},
 		{

diff --git a/charts/merlin/templates/merlin-deployment.yaml b/charts/merlin/templates/merlin-deployment.yaml
@@ -132,8 +132,8 @@ spec:
             value: "{{ .Values.merlin.imageBuilder.timeout }}"
           - name: IMG_BUILDER_KANIKO_IMAGE
             value: "{{ .Values.merlin.imageBuilder.kanikoImage }}"
-          - name: IMG_BUILDER_RESOURCE_REQUESTS_LIMITS
-            value: {{ .Values.merlin.imageBuilder.resourceRequestsLimits | toJson | quote }}
+          - name: IMG_BUILDER_RESOURCES
+            value: {{ .Values.merlin.imageBuilder.resources | toJson | quote }}
           - name: IMG_BUILDER_TOLERATIONS
             value: {{ .Values.merlin.imageBuilder.tolerations | toJson | quote }}
           - name: IMG_BUILDER_NODE_SELECTORS

diff --git a/charts/merlin/values-e2e.yaml b/charts/merlin/values-e2e.yaml
@@ -74,7 +74,7 @@ merlin:
         dockerfilePath: "docker/app.Dockerfile"
         buildContextURI: "git://github.com/gojek/merlin.git#refs/tags/v0.19.0"
         mainAppPath: /merlin-spark-app/main.py
-    resourceRequestsLimits:
+    resources:
       requests:
         cpu: 1
         memory: 512Mi

diff --git a/charts/merlin/values.yaml b/charts/merlin/values.yaml
@@ -64,7 +64,7 @@ merlin:
     contextSubPath: "python/pyfunc-server"
     predictionJobContextSubPath: "python/batch-predictor"
     kanikoImage: "gcr.io/kaniko-project/executor:v1.6.0"
-    resourceRequestsLimits:
+    resources:
       requests:
         cpu: 1
         memory: 256Mi