From af43de2c2ebc9d0a3e6795a9e165280d666531a4 Mon Sep 17 00:00:00 2001
From: Suraj Narwade <surajnarwade353@gmail.com>
Date: Wed, 5 Apr 2017 11:47:06 +0530
Subject: [PATCH] Moved cpu_shares and cpuset to unsupported keys

Resolves #272 and #267

As there is no direct mapping of `cpushares` and `cpuset` to kubernetes,
it should not be read and should be moved to unsupported keys.
---
 pkg/loader/compose/compose.go                 | 5 ++---
 pkg/transformer/kubernetes/k8sutils_test.go   | 6 ------
 pkg/transformer/kubernetes/kubernetes_test.go | 2 --
 pkg/transformer/openshift/openshift_test.go   | 2 --
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go
index 5e0c9522..2ab49a4e 100644
--- a/pkg/loader/compose/compose.go
+++ b/pkg/loader/compose/compose.go
@@ -54,6 +54,8 @@ func checkUnsupportedKey(composeProject *project.Project) []string {
 		"CapAdd":        false,
 		"CapDrop":       false,
 		"CgroupParent":  false,
+		"CPUSet":        false,
+		"CPUShares":     false,
 		"Devices":       false,
 		"DependsOn":     false,
 		"DNS":           false,
@@ -359,9 +361,6 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) {
 
 		// convert compose labels to annotations
 		serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels)
-
-		serviceConfig.CPUSet = composeServiceConfig.CPUSet
-		serviceConfig.CPUShares = int64(composeServiceConfig.CPUShares)
 		serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota)
 		serviceConfig.CapAdd = composeServiceConfig.CapAdd
 		serviceConfig.CapDrop = composeServiceConfig.CapDrop
diff --git a/pkg/transformer/kubernetes/k8sutils_test.go b/pkg/transformer/kubernetes/k8sutils_test.go
index 4c6c8087..290a8d84 100644
--- a/pkg/transformer/kubernetes/k8sutils_test.go
+++ b/pkg/transformer/kubernetes/k8sutils_test.go
@@ -49,8 +49,6 @@ func TestCreateService(t *testing.T) {
 		Network:       []string{"network1", "network2"}, // not supported
 		Labels:        nil,
 		Annotations:   map[string]string{"abc": "def"},
-		CPUSet:        "cpu_set",            // not supported
-		CPUShares:     1,                    // not supported
 		CPUQuota:      1,                    // not supported
 		CapAdd:        []string{"cap_add"},  // not supported
 		CapDrop:       []string{"cap_drop"}, // not supported
@@ -95,8 +93,6 @@ func TestCreateServiceWithMemLimit(t *testing.T) {
 		Network:       []string{"network1", "network2"}, // not supported
 		Labels:        nil,
 		Annotations:   map[string]string{"abc": "def"},
-		CPUSet:        "cpu_set",            // not supported
-		CPUShares:     1,                    // not supported
 		CPUQuota:      1,                    // not supported
 		CapAdd:        []string{"cap_add"},  // not supported
 		CapDrop:       []string{"cap_drop"}, // not supported
@@ -146,8 +142,6 @@ func TestCreateServiceWithServiceUser(t *testing.T) {
 		Network:       []string{"network1", "network2"}, // not supported
 		Labels:        nil,
 		Annotations:   map[string]string{"kompose.service.type": "nodeport"},
-		CPUSet:        "cpu_set",            // not supported
-		CPUShares:     1,                    // not supported
 		CPUQuota:      1,                    // not supported
 		CapAdd:        []string{"cap_add"},  // not supported
 		CapDrop:       []string{"cap_drop"}, // not supported
diff --git a/pkg/transformer/kubernetes/kubernetes_test.go b/pkg/transformer/kubernetes/kubernetes_test.go
index e779d314..01d1d212 100644
--- a/pkg/transformer/kubernetes/kubernetes_test.go
+++ b/pkg/transformer/kubernetes/kubernetes_test.go
@@ -45,8 +45,6 @@ func newServiceConfig() kobject.ServiceConfig {
 		Network:       []string{"network1", "network2"}, // not supported
 		Labels:        nil,
 		Annotations:   map[string]string{"abc": "def"},
-		CPUSet:        "cpu_set",            // not supported
-		CPUShares:     1,                    // not supported
 		CPUQuota:      1,                    // not supported
 		CapAdd:        []string{"cap_add"},  // not supported
 		CapDrop:       []string{"cap_drop"}, // not supported
diff --git a/pkg/transformer/openshift/openshift_test.go b/pkg/transformer/openshift/openshift_test.go
index 8dfe5307..9dc0c26e 100644
--- a/pkg/transformer/openshift/openshift_test.go
+++ b/pkg/transformer/openshift/openshift_test.go
@@ -45,8 +45,6 @@ func newServiceConfig() kobject.ServiceConfig {
 		Network:       []string{"network1", "network2"}, // not supported
 		Labels:        nil,
 		Annotations:   map[string]string{"abc": "def"},
-		CPUSet:        "cpu_set",            // not supported
-		CPUShares:     1,                    // not supported
 		CPUQuota:      1,                    // not supported
 		CapAdd:        []string{"cap_add"},  // not supported
 		CapDrop:       []string{"cap_drop"}, // not supported