Commit b3f251c1 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Backend changes

parent f35f67b0

charts/meep-virt-chart-templates/values-template.yaml

+13 −1
Original line number Diff line number Diff line
@@ -42,13 +42,25 @@ deployment: 
    {{- end}}



  resources:

    requests: {}

    requests:

    {{- if .Deployment.CpuEnabled}}

      cpu: {{.Deployment.CpuMin}}

    {{- end}}

    {{- if .Deployment.MemoryEnabled}}

      memory: {{.Deployment.MemoryMin}}

    {{- end}}

    limits:

    {{- if .Deployment.GpuEnabled}}

    {{- if eq .Deployment.GpuType "NVIDIA" }}

      nvidia.com/gpu: {{.Deployment.GpuCount}}

    {{- end}}

    {{- end}}

    {{- if .Deployment.CpuEnabled}}

      cpu: {{.Deployment.CpuMax}}

    {{- end}}

    {{- if .Deployment.MemoryEnabled}}

      memory: {{.Deployment.MemoryMax}}

    {{- end}}



  nodeSelector: {}

  tolerations: []

go-apps/meep-virt-engine/server/chart-template.go

+22 −0
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ type DeploymentTemplate struct { 
	GpuType                  string

	GpuCount                 string

	PlacementId              string

	CpuEnabled               string

	CpuMin                   string

	CpuMax                   string

	MemoryEnabled            string

	MemoryMin                string

	MemoryMax                string

}



// ServiceTemplate - Service Template
@@ -284,6 +290,20 @@ func generateScenarioCharts(sandboxName string, model *mod.Model) (charts []helm 
				deploymentTemplate.GpuCount = strconv.Itoa(int(proc.GpuConfig.Count))

			}



			// Enable CPU template if present

			if proc.CpuConfig != nil {

				deploymentTemplate.CpuEnabled = trueStr

				deploymentTemplate.CpuMin = proc.CpuConfig.Min

				deploymentTemplate.CpuMax = proc.CpuConfig.Max

			}



			// Enable Memory template if present

			if proc.MemoryConfig != nil {

				deploymentTemplate.MemoryEnabled = trueStr

				deploymentTemplate.MemoryMin = proc.MemoryConfig.Min

				deploymentTemplate.MemoryMax = proc.MemoryConfig.Max

			}



			// Enable External template if set

			if proc.IsExternal {

				externalTemplate.Enabled = trueStr
@@ -457,6 +477,8 @@ func setDeploymentDefaults(deploymentTemplate *DeploymentTemplate) { 
	deploymentTemplate.ContainerEnvEnabled = falseStr

	deploymentTemplate.ContainerCommandEnabled = falseStr

	deploymentTemplate.GpuEnabled = falseStr

	deploymentTemplate.CpuEnabled = falseStr

	deploymentTemplate.MemoryEnabled = falseStr

}



func setServiceDefaults(serviceTemplate *ServiceTemplate) {