deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #543 from surajnarwade/minor_fix

Browse Source 
Moved cpu_shares and cpuset to unsupported keys
This commit is contained in:
Charlie Drage 2017-04-06 12:51:47 -04:00 committed by GitHub
commit 533df01ad5
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/loader/compose/compose.go
View File

@ -54,6 +54,8 @@ func checkUnsupportedKey(composeProject *project.Project) []string {
"CapAdd": false, "CapAdd": false,
"CapDrop": false, "CapDrop": false,
"CgroupParent": false, "CgroupParent": false,
"CPUSet": false,
"CPUShares": false,
"Devices": false, "Devices": false,
"DependsOn": false, "DependsOn": false,
"DNS": false, "DNS": false,
@ -359,9 +361,6 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) {
// convert compose labels to annotations // convert compose labels to annotations
serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels) serviceConfig.Annotations = map[string]string(composeServiceConfig.Labels)
serviceConfig.CPUSet = composeServiceConfig.CPUSet
serviceConfig.CPUShares = int64(composeServiceConfig.CPUShares)
serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota) serviceConfig.CPUQuota = int64(composeServiceConfig.CPUQuota)
serviceConfig.CapAdd = composeServiceConfig.CapAdd serviceConfig.CapAdd = composeServiceConfig.CapAdd
serviceConfig.CapDrop = composeServiceConfig.CapDrop serviceConfig.CapDrop = composeServiceConfig.CapDrop

6
pkg/transformer/kubernetes/k8sutils_test.go
View File

@ -49,8 +49,6 @@ func TestCreateService(t *testing.T) {
Network: []string{"network1", "network2"}, // not supported Network: []string{"network1", "network2"}, // not supported
Labels: nil, Labels: nil,
Annotations: map[string]string{"abc": "def"}, Annotations: map[string]string{"abc": "def"},
CPUSet: "cpu_set", // not supported
CPUShares: 1, // not supported
CPUQuota: 1, // not supported CPUQuota: 1, // not supported
CapAdd: []string{"cap_add"}, // not supported CapAdd: []string{"cap_add"}, // not supported
CapDrop: []string{"cap_drop"}, // not supported CapDrop: []string{"cap_drop"}, // not supported
@ -95,8 +93,6 @@ func TestCreateServiceWithMemLimit(t *testing.T) {
Network: []string{"network1", "network2"}, // not supported Network: []string{"network1", "network2"}, // not supported
Labels: nil, Labels: nil,
Annotations: map[string]string{"abc": "def"}, Annotations: map[string]string{"abc": "def"},
CPUSet: "cpu_set", // not supported
CPUShares: 1, // not supported
CPUQuota: 1, // not supported CPUQuota: 1, // not supported
CapAdd: []string{"cap_add"}, // not supported CapAdd: []string{"cap_add"}, // not supported
CapDrop: []string{"cap_drop"}, // not supported CapDrop: []string{"cap_drop"}, // not supported
@ -146,8 +142,6 @@ func TestCreateServiceWithServiceUser(t *testing.T) {
Network: []string{"network1", "network2"}, // not supported Network: []string{"network1", "network2"}, // not supported
Labels: nil, Labels: nil,
Annotations: map[string]string{"kompose.service.type": "nodeport"}, Annotations: map[string]string{"kompose.service.type": "nodeport"},
CPUSet: "cpu_set", // not supported
CPUShares: 1, // not supported
CPUQuota: 1, // not supported CPUQuota: 1, // not supported
CapAdd: []string{"cap_add"}, // not supported CapAdd: []string{"cap_add"}, // not supported
CapDrop: []string{"cap_drop"}, // not supported CapDrop: []string{"cap_drop"}, // not supported

2
pkg/transformer/kubernetes/kubernetes_test.go
View File

@ -45,8 +45,6 @@ func newServiceConfig() kobject.ServiceConfig {
Network: []string{"network1", "network2"}, // not supported Network: []string{"network1", "network2"}, // not supported
Labels: nil, Labels: nil,
Annotations: map[string]string{"abc": "def"}, Annotations: map[string]string{"abc": "def"},
CPUSet: "cpu_set", // not supported
CPUShares: 1, // not supported
CPUQuota: 1, // not supported CPUQuota: 1, // not supported
CapAdd: []string{"cap_add"}, // not supported CapAdd: []string{"cap_add"}, // not supported
CapDrop: []string{"cap_drop"}, // not supported CapDrop: []string{"cap_drop"}, // not supported

2
pkg/transformer/openshift/openshift_test.go
View File

@ -45,8 +45,6 @@ func newServiceConfig() kobject.ServiceConfig {
Network: []string{"network1", "network2"}, // not supported Network: []string{"network1", "network2"}, // not supported
Labels: nil, Labels: nil,
Annotations: map[string]string{"abc": "def"}, Annotations: map[string]string{"abc": "def"},
CPUSet: "cpu_set", // not supported
CPUShares: 1, // not supported
CPUQuota: 1, // not supported CPUQuota: 1, // not supported
CapAdd: []string{"cap_add"}, // not supported CapAdd: []string{"cap_add"}, // not supported
CapDrop: []string{"cap_drop"}, // not supported CapDrop: []string{"cap_drop"}, // not supported