From 67cfe8200e92b53a94a86975c32630ddb0e38d25 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 2 Apr 2018 15:00:14 -0700 Subject: [PATCH] Use native k8s type for container.resources --- apis/project.cattle.io/v3/schema/schema.go | 1 - apis/project.cattle.io/v3/schema/types.go | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go index e7919043..04ada92c 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/apis/project.cattle.io/v3/schema/schema.go @@ -479,7 +479,6 @@ func podTypes(schemas *types.Schemas) *types.Schemas { MustImport(&Version, v1.Handler{}, handlerOverride{}). MustImport(&Version, v1.Probe{}, handlerOverride{}). MustImport(&Version, v1.Container{}, struct { - Resources *Resources Environment map[string]string EnvironmentFrom []EnvironmentFrom InitContainer bool diff --git a/apis/project.cattle.io/v3/schema/types.go b/apis/project.cattle.io/v3/schema/types.go index 29f1f2e9..f3e6333a 100644 --- a/apis/project.cattle.io/v3/schema/types.go +++ b/apis/project.cattle.io/v3/schema/types.go @@ -46,17 +46,6 @@ type EnvironmentFrom struct { TargetKey string } -type Resources struct { - CPU *ResourceRequest - Memory *ResourceRequest - NvidiaGPU *ResourceRequest -} - -type ResourceRequest struct { - Request string - Limit string -} - type Scheduling struct { Node *NodeScheduling Tolerate []v1.Toleration