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

Merge pull request #578 from kadel/add-label

Browse Source 
Add io.kompose.service label to every object & use reaper to delete BuildConfig
This commit is contained in:
Tomas Kral 2017-05-17 12:40:51 +01:00 committed by GitHub
commit dbceb2d2a8
35 changed files with 765 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/transformer/kubernetes/kubernetes.go
View File

@ -130,7 +130,8 @@ func (k *Kubernetes) InitRC(name string, service kobject.ServiceConfig, replicas
APIVersion: "v1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: api.ReplicationControllerSpec{
Replicas: int32(replicas),
@ -171,7 +172,8 @@ func (k *Kubernetes) InitD(name string, service kobject.ServiceConfig, replicas
APIVersion: "extensions/v1beta1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: extensions.DeploymentSpec{
Replicas: int32(replicas),
@ -191,7 +193,8 @@ func (k *Kubernetes) InitDS(name string, service kobject.ServiceConfig) *extensi
APIVersion: "extensions/v1beta1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: extensions.DaemonSetSpec{
Template: api.PodTemplateSpec{
@ -513,7 +516,8 @@ func (k *Kubernetes) InitPod(name string, service kobject.ServiceConfig) *api.Po
APIVersion: "v1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: k.InitPodSpec(name, service.Image),
}

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

@ -311,7 +311,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, d.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, d.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, d.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if (int)(d.Spec.Replicas) != replicas {
@ -328,7 +328,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, ds.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, ds.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, ds.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if ds.Spec.Selector != nil && len(ds.Spec.Selector.MatchLabels) > 0 {
@ -342,7 +342,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, *rc.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, rc.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, rc.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if (int)(rc.Spec.Replicas) != replicas {
@ -360,7 +360,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, *dc.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, dc.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, dc.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if (int)(dc.Spec.Replicas) != replicas {

8
pkg/transformer/openshift/openshift.go
View File

@ -42,6 +42,7 @@ import (
"github.com/kubernetes-incubator/kompose/pkg/transformer"
buildapi "github.com/openshift/origin/pkg/build/api"
buildconfigreaper "github.com/openshift/origin/pkg/build/cmd"
deployapi "github.com/openshift/origin/pkg/deploy/api"
deploymentconfigreaper "github.com/openshift/origin/pkg/deploy/cmd"
imageapi "github.com/openshift/origin/pkg/image/api"
@ -216,8 +217,10 @@ func initBuildConfig(name string, service kobject.ServiceConfig, repo string, br
Kind: "BuildConfig",
APIVersion: "v1",
},
ObjectMeta: kapi.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: buildapi.BuildConfigSpec{
Triggers: []buildapi.BuildTriggerPolicy{
@ -591,7 +594,8 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
}
for _, l := range buildConfig.Items {
if reflect.DeepEqual(l.Labels, komposeLabel) {
err := oclient.BuildConfigs(namespace).Delete(t.Name)
bcreaper := buildconfigreaper.NewBuildConfigReaper(oclient)
err := bcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil)
if err != nil {
errorList = append(errorList, err)
break

10
script/test/fixtures/buildargs/output-os-template.json vendored
View File

@ -139,7 +139,10 @@
"apiVersion": "v1",
"metadata": {
"name": "foo1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {
"triggers": [
@ -270,7 +273,10 @@
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"triggers": [

10
script/test/fixtures/bundles/dab/output-k8s.json vendored
View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

21
script/test/fixtures/bundles/dsb/output-k8s.json vendored
View File

@ -146,6 +146,9 @@
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"com.example.description": "Postgres Database"
}
@ -184,7 +187,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -220,7 +226,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "result",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "result"
}
},
"spec": {
"replicas": 1,
@ -257,6 +266,9 @@
"metadata": {
"name": "vote",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "vote"
},
"annotations": {
"com.example.description": "Vote"
}
@ -295,7 +307,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "worker",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
}
},
"spec": {
"replicas": 1,

5
script/test/fixtures/entrypoint-command/output-k8s.json vendored
View File

@ -35,7 +35,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "base",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "base"
}
},
"spec": {
"replicas": 1,

65
script/test/fixtures/envvars-separators/output-k8s.json vendored
View File

@ -356,7 +356,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-api",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-api"
}
},
"spec": {
"replicas": 1,
@ -430,7 +433,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-bitbucket-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-bitbucket-scm-collector"
}
},
"spec": {
"replicas": 1,
@ -499,7 +505,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-chat-ops-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-chat-ops-collector"
}
},
"spec": {
"replicas": 1,
@ -568,7 +577,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-github-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-github-scm-collector"
}
},
"spec": {
"replicas": 1,
@ -637,7 +649,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jenkins-build-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-build-collector"
}
},
"spec": {
"replicas": 1,
@ -706,7 +721,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jenkins-cucumber-test-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-cucumber-test-collector"
}
},
"spec": {
"replicas": 1,
@ -775,7 +793,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jira-feature-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jira-feature-collector"
}
},
"spec": {
"replicas": 1,
@ -854,7 +875,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-sonar-codequality-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-sonar-codequality-collector"
}
},
"spec": {
"replicas": 1,
@ -923,7 +947,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-subversion-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-subversion-scm-collector"
}
},
"spec": {
"replicas": 1,
@ -992,7 +1019,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-udeploy-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-udeploy-collector"
}
},
"spec": {
"replicas": 1,
@ -1075,7 +1105,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-ui",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-ui"
}
},
"spec": {
"replicas": 1,
@ -1111,7 +1144,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-versionone-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-versionone-collector"
}
},
"spec": {
"replicas": 1,
@ -1180,7 +1216,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mongodb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mongodb"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/etherpad/output-k8s.json vendored
View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
}
},
"spec": {
"replicas": 1,
@ -118,7 +121,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,

8
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json vendored
View File

@ -68,7 +68,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -105,6 +108,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "batman.example.com"
}

8
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json vendored
View File

@ -63,7 +63,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -100,6 +103,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "batman.example.com"
}

8
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json vendored
View File

@ -68,7 +68,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -105,6 +108,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True"
}

8
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json vendored
View File

@ -63,7 +63,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -100,6 +103,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True"
}

15
script/test/fixtures/gitlab/output-k8s.json vendored
View File

@ -96,7 +96,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "gitlab",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "gitlab"
}
},
"spec": {
"replicas": 1,
@ -172,7 +175,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "postgresql",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "postgresql"
}
},
"spec": {
"replicas": 1,
@ -222,7 +228,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

15
script/test/fixtures/keyonly-envs/output-k8s.json vendored
View File

@ -86,7 +86,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "frontend",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
}
},
"spec": {
"replicas": 1,
@ -140,7 +143,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-master",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
}
},
"spec": {
"replicas": 1,
@ -176,7 +182,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
}
},
"spec": {
"replicas": 1,

5
script/test/fixtures/mem-limit/output-k8s.json vendored
View File

@ -40,7 +40,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

5
script/test/fixtures/mem-limit/output-mb-k8s.json vendored
View File

@ -40,7 +40,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/multiple-compose-files/output-k8s.json vendored
View File

@ -70,7 +70,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
}
},
"spec": {
"replicas": 1,
@ -131,7 +134,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,

25
script/test/fixtures/nginx-node-redis/output-k8s.json vendored
View File

@ -138,7 +138,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"replicas": 1,
@ -173,7 +176,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"replicas": 1,
@ -208,7 +214,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"replicas": 1,
@ -243,7 +252,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"replicas": 1,
@ -278,7 +290,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

22
script/test/fixtures/nginx-node-redis/output-os-template.json vendored
View File

@ -216,7 +216,10 @@
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"triggers": [
@ -337,7 +340,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"triggers": [
@ -458,7 +464,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"triggers": [
@ -579,7 +588,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"triggers": [
@ -709,4 +721,4 @@
}
}
]
}
}

10
script/test/fixtures/ports-with-ip/output-k8s.json vendored
View File

@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -106,7 +109,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/ports-with-proto/output-k8s.json vendored
View File

@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -106,7 +109,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/service-name-change/output-k8s.json vendored
View File

@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,
@ -149,7 +152,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"replicas": 1,

5
script/test/fixtures/stdin-true/output-k8s.json vendored
View File

@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"replicas": 1,

5
script/test/fixtures/tty-true/output-k8s.json vendored
View File

@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"replicas": 1,

5
script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json vendored
View File

@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "httpd",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/volume-mounts/volumes-from/output-k8s.json vendored
View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"replicas": 1,
@ -144,7 +147,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/yaml-and-yml/output-k8s.json vendored
View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

10
script/test/fixtures/yaml-and-yml/yml/output-k8s.json vendored
View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

2
vendor/github.com/openshift/origin/pkg/build/cmd/doc.go generated vendored Normal file
View File

@ -0,0 +1,2 @@
// Package cmd provides command helpers for builds
package cmd

150
vendor/github.com/openshift/origin/pkg/build/cmd/reaper.go generated vendored Normal file
View File

@ -0,0 +1,150 @@
package cmd
import (
"sort"
"strings"
"time"
"github.com/golang/glog"
kapi "k8s.io/kubernetes/pkg/api"
kerrors "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/kubectl"
ktypes "k8s.io/kubernetes/pkg/types"
kutilerrors "k8s.io/kubernetes/pkg/util/errors"
buildapi "github.com/openshift/origin/pkg/build/api"
buildutil "github.com/openshift/origin/pkg/build/util"
"github.com/openshift/origin/pkg/client"
"github.com/openshift/origin/pkg/util"
)
// NewBuildConfigReaper returns a new reaper for buildConfigs
func NewBuildConfigReaper(oc *client.Client) kubectl.Reaper {
return &BuildConfigReaper{oc: oc, pollInterval: kubectl.Interval, timeout: kubectl.Timeout}
}
// BuildConfigReaper implements the Reaper interface for buildConfigs
type BuildConfigReaper struct {
oc client.Interface
pollInterval, timeout time.Duration
}
// Stop deletes the build configuration and all of the associated builds.
func (reaper *BuildConfigReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *kapi.DeleteOptions) error {
_, err := reaper.oc.BuildConfigs(namespace).Get(name)
if err != nil {
return err
}
var bcPotentialBuilds []buildapi.Build
// Collect builds related to the config.
builds, err := reaper.oc.Builds(namespace).List(kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelector(name)})
if err != nil {
return err
}
bcPotentialBuilds = append(bcPotentialBuilds, builds.Items...)
// Collect deprecated builds related to the config.
// TODO: Delete this block after BuildConfigLabelDeprecated is removed.
builds, err = reaper.oc.Builds(namespace).List(kapi.ListOptions{LabelSelector: buildutil.BuildConfigSelectorDeprecated(name)})
if err != nil {
return err
}
bcPotentialBuilds = append(bcPotentialBuilds, builds.Items...)
// A map of builds associated with this build configuration
bcBuilds := make(map[ktypes.UID]buildapi.Build)
// Because of name length limits in the BuildConfigSelector, annotations are used to ensure
// reliable selection of associated builds.
for _, build := range bcPotentialBuilds {
if build.Annotations != nil {
if bcName, ok := build.Annotations[buildapi.BuildConfigAnnotation]; ok {
// The annotation, if present, has the full build config name.
if bcName != name {
// If the name does not match exactly, the build is not truly associated with the build configuration
continue
}
}
}
// Note that if there is no annotation, this is a deprecated build spec
// and we choose to include it in the deletion having matched only the BuildConfigSelectorDeprecated
// Use a map to union the lists returned by the contemporary & deprecated build queries
// (there will be overlap between the lists, and we only want to try to delete each build once)
bcBuilds[build.UID] = build
}
// If there are builds associated with this build configuration, pause it before attempting the deletion
if len(bcBuilds) > 0 {
// Add paused annotation to the build config pending the deletion
err = unversioned.RetryOnConflict(unversioned.DefaultRetry, func() error {
bc, err := reaper.oc.BuildConfigs(namespace).Get(name)
if err != nil {
return err
}
// Ignore if the annotation already exists
if strings.ToLower(bc.Annotations[buildapi.BuildConfigPausedAnnotation]) == "true" {
return nil
}
// Set the annotation and update
if err := util.AddObjectAnnotations(bc, map[string]string{buildapi.BuildConfigPausedAnnotation: "true"}); err != nil {
return err
}
_, err = reaper.oc.BuildConfigs(namespace).Update(bc)
return err
})
if err != nil {
return err
}
}
// Warn the user if the BuildConfig won't get deleted after this point.
bcDeleted := false
defer func() {
if !bcDeleted {
glog.Warningf("BuildConfig %s/%s will not be deleted because not all associated builds could be deleted. You can try re-running the command or removing them manually", namespace, name)
}
}()
// For the benefit of test cases, sort the UIDs so that the deletion order is deterministic
buildUIDs := make([]string, 0, len(bcBuilds))
for buildUID := range bcBuilds {
buildUIDs = append(buildUIDs, string(buildUID))
}
sort.Strings(buildUIDs)
errList := []error{}
for _, buildUID := range buildUIDs {
build := bcBuilds[ktypes.UID(buildUID)]
if err := reaper.oc.Builds(namespace).Delete(build.Name); err != nil {
glog.Warningf("Cannot delete Build %s/%s: %v", build.Namespace, build.Name, err)
if !kerrors.IsNotFound(err) {
errList = append(errList, err)
}
}
}
// Aggregate all errors
if len(errList) > 0 {
return kutilerrors.NewAggregate(errList)
}
if err := reaper.oc.BuildConfigs(namespace).Delete(name); err != nil {
return err
}
bcDeleted = true
return nil
}

4
vendor/github.com/openshift/origin/pkg/util/doc.go generated vendored Normal file
View File

@ -0,0 +1,4 @@
// Package util implements various utility functions used in both testing and
// implementation of OpenShift. Package util may not depend on any other
// package in the OpenShift package tree.
package util

21
vendor/github.com/openshift/origin/pkg/util/etcd.go generated vendored Normal file
View File

@ -0,0 +1,21 @@
package util
import (
"path"
kapi "k8s.io/kubernetes/pkg/api"
kerrors "k8s.io/kubernetes/pkg/api/errors"
)
// NoNamespaceKeyFunc is the default function for constructing etcd paths to a resource relative to prefix enforcing
// If a namespace is on context, it errors.
func NoNamespaceKeyFunc(ctx kapi.Context, prefix string, name string) (string, error) {
ns, ok := kapi.NamespaceFrom(ctx)
if ok && len(ns) > 0 {
return "", kerrors.NewBadRequest("Namespace parameter is not allowed.")
}
if len(name) == 0 {
return "", kerrors.NewBadRequest("Name parameter required.")
}
return path.Join(prefix, name), nil
}

286
vendor/github.com/openshift/origin/pkg/util/labels.go generated vendored Normal file
View File

@ -0,0 +1,286 @@
package util
import (
"fmt"
"reflect"
kmeta "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
deployapi "github.com/openshift/origin/pkg/deploy/api"
)
// MergeInto flags
const (
OverwriteExistingDstKey = 1 << iota
ErrorOnExistingDstKey
ErrorOnDifferentDstKeyValue
)
// AddObjectLabelsWithFlags will set labels on the target object. Label overwrite behavior
// is controlled by the flags argument.
func AddObjectLabelsWithFlags(obj runtime.Object, labels labels.Set, flags int) error {
if labels == nil {
return nil
}
accessor, err := kmeta.Accessor(obj)
if err != nil {
if _, ok := obj.(*runtime.Unstructured); !ok {
// error out if it's not possible to get an accessor and it's also not an unstructured object
return err
}
} else {
metaLabels := accessor.GetLabels()
if metaLabels == nil {
metaLabels = make(map[string]string)
}
switch objType := obj.(type) {
case *deployapi.DeploymentConfig:
if err := addDeploymentConfigNestedLabels(objType, labels, flags); err != nil {
return fmt.Errorf("unable to add nested labels to %s/%s: %v", obj.GetObjectKind().GroupVersionKind(), accessor.GetName(), err)
}
}
if err := MergeInto(metaLabels, labels, flags); err != nil {
return fmt.Errorf("unable to add labels to %s/%s: %v", obj.GetObjectKind().GroupVersionKind(), accessor.GetName(), err)
}
accessor.SetLabels(metaLabels)
return nil
}
// handle unstructured object
// TODO: allow meta.Accessor to handle runtime.Unstructured
if unstruct, ok := obj.(*runtime.Unstructured); ok && unstruct.Object != nil {
// the presence of "metadata" is sufficient for us to apply the rules for Kube-like
// objects.
// TODO: add swagger detection to allow this to happen more effectively
if obj, ok := unstruct.Object["metadata"]; ok {
if m, ok := obj.(map[string]interface{}); ok {
existing := make(map[string]string)
if l, ok := m["labels"]; ok {
if found, ok := interfaceToStringMap(l); ok {
existing = found
}
}
if err := MergeInto(existing, labels, flags); err != nil {
return err
}
m["labels"] = mapToGeneric(existing)
}
return nil
}
// only attempt to set root labels if a root object called labels exists
// TODO: add swagger detection to allow this to happen more effectively
if obj, ok := unstruct.Object["labels"]; ok {
existing := make(map[string]string)
if found, ok := interfaceToStringMap(obj); ok {
existing = found
}
if err := MergeInto(existing, labels, flags); err != nil {
return err
}
unstruct.Object["labels"] = mapToGeneric(existing)
return nil
}
}
return nil
}
// AddObjectLabels adds new label(s) to a single runtime.Object, overwriting
// existing labels that have the same key.
func AddObjectLabels(obj runtime.Object, labels labels.Set) error {
return AddObjectLabelsWithFlags(obj, labels, OverwriteExistingDstKey)
}
// AddObjectAnnotations adds new annotation(s) to a single runtime.Object
func AddObjectAnnotations(obj runtime.Object, annotations map[string]string) error {
if len(annotations) == 0 {
return nil
}
accessor, err := kmeta.Accessor(obj)
if err != nil {
if _, ok := obj.(*runtime.Unstructured); !ok {
// error out if it's not possible to get an accessor and it's also not an unstructured object
return err
}
} else {
metaAnnotations := accessor.GetAnnotations()
if metaAnnotations == nil {
metaAnnotations = make(map[string]string)
}
switch objType := obj.(type) {
case *deployapi.DeploymentConfig:
if err := addDeploymentConfigNestedAnnotations(objType, annotations); err != nil {
return fmt.Errorf("unable to add nested annotations to %s/%s: %v", obj.GetObjectKind().GroupVersionKind(), accessor.GetName(), err)
}
}
MergeInto(metaAnnotations, annotations, OverwriteExistingDstKey)
accessor.SetAnnotations(metaAnnotations)
return nil
}
// handle unstructured object
// TODO: allow meta.Accessor to handle runtime.Unstructured
if unstruct, ok := obj.(*runtime.Unstructured); ok && unstruct.Object != nil {
// the presence of "metadata" is sufficient for us to apply the rules for Kube-like
// objects.
// TODO: add swagger detection to allow this to happen more effectively
if obj, ok := unstruct.Object["metadata"]; ok {
if m, ok := obj.(map[string]interface{}); ok {
existing := make(map[string]string)
if l, ok := m["annotations"]; ok {
if found, ok := interfaceToStringMap(l); ok {
existing = found
}
}
if err := MergeInto(existing, annotations, OverwriteExistingDstKey); err != nil {
return err
}
m["annotations"] = mapToGeneric(existing)
}
return nil
}
// only attempt to set root annotations if a root object called annotations exists
// TODO: add swagger detection to allow this to happen more effectively
if obj, ok := unstruct.Object["annotations"]; ok {
existing := make(map[string]string)
if found, ok := interfaceToStringMap(obj); ok {
existing = found
}
if err := MergeInto(existing, annotations, OverwriteExistingDstKey); err != nil {
return err
}
unstruct.Object["annotations"] = mapToGeneric(existing)
return nil
}
}
return nil
}
// addDeploymentConfigNestedLabels adds new label(s) to a nested labels of a single DeploymentConfig object
func addDeploymentConfigNestedLabels(obj *deployapi.DeploymentConfig, labels labels.Set, flags int) error {
if obj.Spec.Template.Labels == nil {
obj.Spec.Template.Labels = make(map[string]string)
}
if err := MergeInto(obj.Spec.Template.Labels, labels, flags); err != nil {
return fmt.Errorf("unable to add labels to Template.DeploymentConfig.Template.ControllerTemplate.Template: %v", err)
}
return nil
}
func addDeploymentConfigNestedAnnotations(obj *deployapi.DeploymentConfig, annotations map[string]string) error {
if obj.Spec.Template == nil {
return nil
}
if obj.Spec.Template.Annotations == nil {
obj.Spec.Template.Annotations = make(map[string]string)
}
if err := MergeInto(obj.Spec.Template.Annotations, annotations, OverwriteExistingDstKey); err != nil {
return fmt.Errorf("unable to add annotations to Template.DeploymentConfig.Template.ControllerTemplate.Template: %v", err)
}
return nil
}
// interfaceToStringMap extracts a map[string]string from a map[string]interface{}
func interfaceToStringMap(obj interface{}) (map[string]string, bool) {
if obj == nil {
return nil, false
}
lm, ok := obj.(map[string]interface{})
if !ok {
return nil, false
}
existing := make(map[string]string)
for k, v := range lm {
switch t := v.(type) {
case string:
existing[k] = t
}
}
return existing, true
}
// mapToGeneric converts a map[string]string into a map[string]interface{}
func mapToGeneric(obj map[string]string) map[string]interface{} {
if obj == nil {
return nil
}
res := make(map[string]interface{})
for k, v := range obj {
res[k] = v
}
return res
}
// MergeInto merges items from a src map into a dst map.
// Returns an error when the maps are not of the same type.
// Flags:
// - ErrorOnExistingDstKey
// When set: Return an error if any of the dst keys is already set.
// - ErrorOnDifferentDstKeyValue
// When set: Return an error if any of the dst keys is already set
// to a different value than src key.
// - OverwriteDstKey
// When set: Overwrite existing dst key value with src key value.
func MergeInto(dst, src interface{}, flags int) error {
dstVal := reflect.ValueOf(dst)
srcVal := reflect.ValueOf(src)
if dstVal.Kind() != reflect.Map {
return fmt.Errorf("dst is not a valid map: %v", dstVal.Kind())
}
if srcVal.Kind() != reflect.Map {
return fmt.Errorf("src is not a valid map: %v", srcVal.Kind())
}
if dstTyp, srcTyp := dstVal.Type(), srcVal.Type(); !dstTyp.AssignableTo(srcTyp) {
return fmt.Errorf("type mismatch, can't assign '%v' to '%v'", srcTyp, dstTyp)
}
if dstVal.IsNil() {
return fmt.Errorf("dst value is nil")
}
if srcVal.IsNil() {
// Nothing to merge
return nil
}
for _, k := range srcVal.MapKeys() {
if dstVal.MapIndex(k).IsValid() {
if flags&ErrorOnExistingDstKey != 0 {
return fmt.Errorf("dst key already set (ErrorOnExistingDstKey=1), '%v'='%v'", k, dstVal.MapIndex(k))
}
if dstVal.MapIndex(k).String() != srcVal.MapIndex(k).String() {
if flags&ErrorOnDifferentDstKeyValue != 0 {
return fmt.Errorf("dst key already set to a different value (ErrorOnDifferentDstKeyValue=1), '%v'='%v'", k, dstVal.MapIndex(k))
}
if flags&OverwriteExistingDstKey != 0 {
dstVal.SetMapIndex(k, srcVal.MapIndex(k))
}
}
} else {
dstVal.SetMapIndex(k, srcVal.MapIndex(k))
}
}
return nil
}

21
vendor/github.com/openshift/origin/pkg/util/strings.go generated vendored Normal file
View File

@ -0,0 +1,21 @@
package util
import "sort"
// UniqueStrings returns a sorted, uniquified slice of the specified strings
func UniqueStrings(strings []string) []string {
m := make(map[string]bool, len(strings))
for _, s := range strings {
m[s] = true
}
i := 0
strings = make([]string, len(m), len(m))
for s := range m {
strings[i] = s
i++
}
sort.Strings(strings)
return strings
}