Unverified Commit 24fbf460 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #149 from nikhildoifode/na-953

Added changes for allowing CPU and Memory limitation
parents ec58b6a2 a8df1452
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: 1.5.5
version: 1.5.6
repo:
  name: AdvantEDGE

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

  resources:
    requests: {}
    requests:
    {{- if and (.Deployment.CpuEnabled) (ne .Deployment.CpuMin "")}}
      cpu: {{.Deployment.CpuMin}}
    {{- end}}
    {{- if and (.Deployment.MemoryEnabled) (ne .Deployment.MemoryMin "")}}
      memory: {{.Deployment.MemoryMin}}
    {{- end}}
    limits:
    {{- if .Deployment.GpuEnabled}}
    {{- if eq .Deployment.GpuType "NVIDIA" }}
      nvidia.com/gpu: {{.Deployment.GpuCount}}
    {{- end}}
    {{- end}}
    {{- if and (.Deployment.CpuEnabled) (ne .Deployment.CpuMax "")}}
      cpu: {{.Deployment.CpuMax}}
    {{- end}}
    {{- if and (.Deployment.MemoryEnabled) (ne .Deployment.MemoryMax "")}}
      memory: {{.Deployment.MemoryMax}}
    {{- end}}

  nodeSelector: {}
  tolerations: []
+20 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ deployment:
                                            isExternal: null
                                            environment: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -119,6 +121,8 @@ deployment:
                                            commandArguments: null
                                            commandExe: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -304,6 +308,8 @@ deployment:
                                            isExternal: null
                                            environment: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -342,6 +348,8 @@ deployment:
                                            commandArguments: null
                                            commandExe: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -429,6 +437,8 @@ deployment:
                                            isExternal: null
                                            environment: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -467,6 +477,8 @@ deployment:
                                            commandArguments: null
                                            commandExe: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -524,6 +536,8 @@ deployment:
                                            environment: null
                                            serviceConfig: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -603,6 +617,8 @@ deployment:
                                            commandExe: null
                                            serviceConfig: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            status: null
                                            userChartLocation: null
                                            userChartAlternateValues: null
@@ -739,6 +755,8 @@ deployment:
                                            isExternal: null
                                            environment: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
@@ -777,6 +795,8 @@ deployment:
                                            commandArguments: null
                                            commandExe: null
                                            gpuConfig: null
                                            cpuConfig: null
                                            memoryConfig: null
                                            externalConfig: null
                                            status: null
                                            userChartLocation: null
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)

- API version: 0.0.1
- Build date: 2020-10-13T15:30:28.824-04:00
- Build date: 2020-11-02T16:24:59.205-05:00


### Running the server
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ To see how to make this your own, look here:
[README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md)

- API version: 0.0.1
- Build date: 2020-10-13T15:30:30.201-04:00
- Build date: 2020-11-02T16:25:01.358-05:00


### Running the server
Loading