Clean up rebased files

api/turing/imagebuilder/ensembler.go

@@ -92,35 +92,3 @@ func getPartialVersionID(versionID string, numChar int) string {
 	}
 	return versionID
 }
-
-// NewEnsemblerServiceImageBuilder create ImageBuilder for building docker image of the ensembling service (real-time)
-func NewEnsemblerServiceImageBuilder(
-	clusterController cluster.Controller,
-	imageBuildingConfig config.ImageBuildingConfig,
-) (ImageBuilder, error) {
-	return newImageBuilder(
-		clusterController,
-		imageBuildingConfig,
-		&ensemblerServiceNameGenerator{registry: imageBuildingConfig.DestinationRegistry},
-	)
-}
-
-// ensemblerServiceNameGenerator is name generator that will be used for building docker image of the ensembling service
-type ensemblerServiceNameGenerator struct {
-	registry string
-}
-
-// generateBuilderServiceName generate pod name that will be used to build docker image of the ensembling service
-func (n *ensemblerServiceNameGenerator) generateBuilderName(
-	projectName string,
-	modelName string,
-	versionID models.ID,
-) string {
-	return fmt.Sprintf("batch-%s-%s-%d", projectName, modelName, versionID)
-}
-
-// generateServiceImageName generate the name of docker image of the ensembling service that will be created from given
-// model
-func (n *ensemblerServiceNameGenerator) generateDockerImageName(projectName string, modelName string) string {
-	return fmt.Sprintf("%s/%s-%s-service", n.registry, projectName, modelName)
-}

api/turing/models/ensembler.go

@@ -60,11 +60,6 @@ type EnsemblerPyfuncConfig struct {
 	Timeout string `json:"timeout" validate:"required"`
 }
 
-type EnsemblerContainerConfig struct {
-	// Resource requests for ensembler container deployed
-	ResourceRequest *ResourceRequest `json:"resource_request" validate:"required"`
-}
-
 type ExperimentMapping struct {
 	Experiment string `json:"experiment" validate:"required"` // Experiment name from the experiment engine
 	Treatment  string `json:"treatment" validate:"required"`  // Treatment name for the experiment