Skip to content

Commit

Permalink
delete buildConfig based on label
Browse files Browse the repository at this point in the history
  • Loading branch information
Abhishek committed Apr 21, 2017
1 parent 87fc1b5 commit 77c51f7
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 138 deletions.
3 changes: 2 additions & 1 deletion pkg/transformer/openshift/openshift.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ func initBuildConfig(name string, service kobject.ServiceConfig, composeFileDir
APIVersion: "v1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: buildapi.BuildConfigSpec{
Triggers: []buildapi.BuildTriggerPolicy{
Expand Down
286 changes: 149 additions & 137 deletions script/test/fixtures/ngnix-node-redis/output-os.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,32 @@
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"ports": [
{
"name": "80",
"port": 80,
"targetPort": 80
}
],
"selector": {
"io.kompose.service": "nginx"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Service",
"apiVersion": "v1",
Expand Down Expand Up @@ -108,7 +134,7 @@
}
},
{
"kind": "Service",
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
Expand All @@ -118,19 +144,117 @@
}
},
"spec": {
"ports": [
"strategy": {
"resources": {}
},
"triggers": [
{
"name": "80",
"port": 80,
"targetPort": 80
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"nginx"
],
"from": {
"kind": "ImageStreamTag",
"name": "nginx:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "nginx"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"containers": [
{
"name": "nginx",
"image": " ",
"ports": [
{
"containerPort": 80
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {},
"status": {
"loadBalancer": {}
"dockerImageRepository": ""
}
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "git@github.com:procrypt/kompose.git",
"ref": "delete_buildconfig"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/nginx"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "nginx:latest"
}
},
"resources": {},
"postCommit": {},
"nodeSelector": null
},
"status": {
"lastVersion": 0
}
},
{
Expand Down Expand Up @@ -216,7 +340,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"triggers": [
Expand All @@ -231,8 +358,8 @@
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
"uri": "git@github.com:procrypt/kompose.git",
"ref": "delete_buildconfig"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
},
Expand Down Expand Up @@ -337,7 +464,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"triggers": [
Expand All @@ -352,8 +482,8 @@
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
"uri": "git@github.com:procrypt/kompose.git",
"ref": "delete_buildconfig"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
},
Expand Down Expand Up @@ -458,7 +588,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"triggers": [
Expand All @@ -473,8 +606,8 @@
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
"uri": "git@github.com:procrypt/kompose.git",
"ref": "delete_buildconfig"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
},
Expand Down Expand Up @@ -586,127 +719,6 @@
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"nginx"
],
"from": {
"kind": "ImageStreamTag",
"name": "nginx:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "nginx"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"containers": [
{
"name": "nginx",
"image": " ",
"ports": [
{
"containerPort": 80
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/nginx"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "nginx:latest"
}
},
"resources": {},
"postCommit": {},
"nodeSelector": null
},
"status": {
"lastVersion": 0
}
}
]
}
}

0 comments on commit 77c51f7

Please sign in to comment.