Skip to content

Commit

Permalink
Merge pull request #21 from gerald1248/v0.1.8
Browse files Browse the repository at this point in the history 
support standalone config objects
  • Loading branch information
@gerald1248
gerald1248 authored Jan 26, 2017
2 parents 90770fe + aa22392 commit 537be57
Show file tree
Hide file tree
Showing 12 changed files with 369 additions and 10 deletions.
14 changes: 7 additions & 7 deletions bindata.go
View file

Large diffs are not rendered by default.

145 changes: 145 additions & 0 deletions data/sample-dc-only.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "ruby-hello-world",
"namespace": "samples",
"generation": 2,
"creationTimestamp": null,
"labels": {
"env": "env-samples",
"app": "ruby-hello-world"
},
"annotations": {
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {
"strategy": {
"type": "Rolling",
"rollingParams": {
"updatePeriodSeconds": 1,
"intervalSeconds": 1,
"timeoutSeconds": 600,
"maxUnavailable": "25%",
"maxSurge": "25%"
},
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"ruby-hello-world"
],
"from": {
"kind": "ImageStreamTag",
"namespace": "myproject",
"name": "ruby-hello-world:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"app": "ruby-hello-world",
"deploymentconfig": "ruby-hello-world"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"app": "ruby-hello-world",
"deploymentconfig": "ruby-hello-world"
},
"annotations": {
"openshift.io/container.ruby-hello-world.image.entrypoint": "[\"container-entrypoint\",\"/bin/sh\",\"-c\",\"$STI_SCRIPTS_PATH/usage\"]",
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {
"containers": [
{
"namespace": "samples",
"name": "ruby-hello-world",
"image": "172.30.116.85:5000/myproject/ruby-hello-world@sha256:a076dd12488e03a1d4ba2c69df78b9cb91a2dc940df4edbe9b1769fa4a84e86e",
"ports": [
{
"containerPort": 8080,
"protocol": "TCP"
}
],
"resources": {},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent",
"securityContext": {
"privileged": false
},
"env": [
{
"name": "SOME_ENV_VAR",
"value": "some value"
},
{
"name": "ANOTHER_ENV_VAR",
"value": "another value"
}
],
"livenessProbe": {
"successThreshold": 1,
"httpGet": {
"path": "/health",
"host": "localhost",
"scheme": "HTTP",
"port": 8000
},
"failureThreshold": 3,
"timeoutSeconds": 1,
"periodSeconds": 10
},
"readinessProbe": {
"successThreshold": 1,
"httpGet": {
"path": "/health",
"host": "localhost",
"scheme": "HTTP",
"port": 8000
},
"failureThreshold": 3,
"timeoutSeconds": 1,
"periodSeconds": 10
},
"resources": {
"requests": {
"cpu": "200m",
"memory": "1000Mi"
},
"limits": {
"cpu": "4",
"memory": "8000Mi"
}
}
}
],
"restartPolicy": "Always",
"terminationGracePeriodSeconds": 30,
"dnsPolicy": "ClusterFirst",
"securityContext": {
"privileged": false
}
}
}
},
"status": {
"observedGeneration": 2,
"replicas": 1,
"updatedReplicas": 1,
"availableReplicas": 1
}
}
2 changes: 2 additions & 0 deletions data/sample-dc-only.min.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

{"kind":"DeploymentConfig","apiVersion":"v1","metadata":{"name":"ruby-hello-world","namespace":"samples","generation":2,"creationTimestamp":null,"labels":{"env":"env-samples","app":"ruby-hello-world"},"annotations":{"openshift.io/generated-by":"OpenShiftNewApp"}},"spec":{"strategy":{"type":"Rolling","rollingParams":{"updatePeriodSeconds":1,"intervalSeconds":1,"timeoutSeconds":600,"maxUnavailable":"25%","maxSurge":"25%"},"resources":{}},"triggers":[{"type":"ConfigChange"},{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-hello-world"],"from":{"kind":"ImageStreamTag","namespace":"myproject","name":"ruby-hello-world:latest"}}}],"replicas":1,"test":false,"selector":{"app":"ruby-hello-world","deploymentconfig":"ruby-hello-world"},"template":{"metadata":{"creationTimestamp":null,"labels":{"app":"ruby-hello-world","deploymentconfig":"ruby-hello-world"},"annotations":{"openshift.io/container.ruby-hello-world.image.entrypoint":"[\"container-entrypoint\",\"/bin/sh\",\"-c\",\"$STI_SCRIPTS_PATH/usage\"]","openshift.io/generated-by":"OpenShiftNewApp"}},"spec":{"containers":[{"namespace":"samples","name":"ruby-hello-world","image":"172.30.116.85:5000/myproject/ruby-hello-world@sha256:a076dd12488e03a1d4ba2c69df78b9cb91a2dc940df4edbe9b1769fa4a84e86e","ports":[{"containerPort":8080,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent","securityContext":{"privileged":false},"env":[{"name":"SOME_ENV_VAR","value":"some value"},{"name":"ANOTHER_ENV_VAR","value":"another value"}],"livenessProbe":{"successThreshold":1,"httpGet":{"path":"/health","host":"localhost","scheme":"HTTP","port":8000},"failureThreshold":3,"timeoutSeconds":1,"periodSeconds":10},"readinessProbe":{"successThreshold":1,"httpGet":{"path":"/health","host":"localhost","scheme":"HTTP","port":8000},"failureThreshold":3,"timeoutSeconds":1,"periodSeconds":10},"resources":{"requests":{"cpu":"200m","memory":"1000Mi"},"limits":{"cpu":"4","memory":"8000Mi"}}}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","securityContext":{"privileged":false}}}},"status":{"observedGeneration":2,"replicas":1,"updatedReplicas":1,"availableReplicas":1}}
152 changes: 152 additions & 0 deletions data/sample-full.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "ruby-hello-world",
"namespace": "samples",
"generation": 2,
"creationTimestamp": null,
"labels": {
"env": "env-samples",
"app": "ruby-hello-world"
},
"annotations": {
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {
"strategy": {
"type": "Rolling",
"rollingParams": {
"updatePeriodSeconds": 1,
"intervalSeconds": 1,
"timeoutSeconds": 600,
"maxUnavailable": "25%",
"maxSurge": "25%"
},
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"ruby-hello-world"
],
"from": {
"kind": "ImageStreamTag",
"namespace": "myproject",
"name": "ruby-hello-world:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"app": "ruby-hello-world",
"deploymentconfig": "ruby-hello-world"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"app": "ruby-hello-world",
"deploymentconfig": "ruby-hello-world"
},
"annotations": {
"openshift.io/container.ruby-hello-world.image.entrypoint": "[\"container-entrypoint\",\"/bin/sh\",\"-c\",\"$STI_SCRIPTS_PATH/usage\"]",
"openshift.io/generated-by": "OpenShiftNewApp"
}
},
"spec": {
"containers": [
{
"namespace": "samples",
"name": "ruby-hello-world",
"image": "172.30.116.85:5000/myproject/ruby-hello-world@sha256:a076dd12488e03a1d4ba2c69df78b9cb91a2dc940df4edbe9b1769fa4a84e86e",
"ports": [
{
"containerPort": 8080,
"protocol": "TCP"
}
],
"resources": {},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent",
"securityContext": {
"privileged": false
},
"env": [
{
"name": "SOME_ENV_VAR",
"value": "some value"
},
{
"name": "ANOTHER_ENV_VAR",
"value": "another value"
}
],
"livenessProbe": {
"successThreshold": 1,
"httpGet": {
"path": "/health",
"host": "localhost",
"scheme": "HTTP",
"port": 8000
},
"failureThreshold": 3,
"timeoutSeconds": 1,
"periodSeconds": 10
},
"readinessProbe": {
"successThreshold": 1,
"httpGet": {
"path": "/health",
"host": "localhost",
"scheme": "HTTP",
"port": 8000
},
"failureThreshold": 3,
"timeoutSeconds": 1,
"periodSeconds": 10
},
"resources": {
"requests": {
"cpu": "200m",
"memory": "1000Mi"
},
"limits": {
"cpu": "4",
"memory": "8000Mi"
}
}
}
],
"restartPolicy": "Always",
"terminationGracePeriodSeconds": 30,
"dnsPolicy": "ClusterFirst",
"securityContext": {
"privileged": false
}
}
}
},
"status": {
"observedGeneration": 2,
"replicas": 1,
"updatedReplicas": 1,
"availableReplicas": 1
}
}
]
}
2 changes: 2 additions & 0 deletions data/sample-full.min.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

{"kind":"List","apiVersion":"v1","metadata":{},"items":[{"kind":"DeploymentConfig","apiVersion":"v1","metadata":{"name":"ruby-hello-world","namespace":"samples","generation":2,"creationTimestamp":null,"labels":{"env":"env-samples","app":"ruby-hello-world"},"annotations":{"openshift.io/generated-by":"OpenShiftNewApp"}},"spec":{"strategy":{"type":"Rolling","rollingParams":{"updatePeriodSeconds":1,"intervalSeconds":1,"timeoutSeconds":600,"maxUnavailable":"25%","maxSurge":"25%"},"resources":{}},"triggers":[{"type":"ConfigChange"},{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-hello-world"],"from":{"kind":"ImageStreamTag","namespace":"myproject","name":"ruby-hello-world:latest"}}}],"replicas":1,"test":false,"selector":{"app":"ruby-hello-world","deploymentconfig":"ruby-hello-world"},"template":{"metadata":{"creationTimestamp":null,"labels":{"app":"ruby-hello-world","deploymentconfig":"ruby-hello-world"},"annotations":{"openshift.io/container.ruby-hello-world.image.entrypoint":"[\"container-entrypoint\",\"/bin/sh\",\"-c\",\"$STI_SCRIPTS_PATH/usage\"]","openshift.io/generated-by":"OpenShiftNewApp"}},"spec":{"containers":[{"namespace":"samples","name":"ruby-hello-world","image":"172.30.116.85:5000/myproject/ruby-hello-world@sha256:a076dd12488e03a1d4ba2c69df78b9cb91a2dc940df4edbe9b1769fa4a84e86e","ports":[{"containerPort":8080,"protocol":"TCP"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"IfNotPresent","securityContext":{"privileged":false},"env":[{"name":"SOME_ENV_VAR","value":"some value"},{"name":"ANOTHER_ENV_VAR","value":"another value"}],"livenessProbe":{"successThreshold":1,"httpGet":{"path":"/health","host":"localhost","scheme":"HTTP","port":8000},"failureThreshold":3,"timeoutSeconds":1,"periodSeconds":10},"readinessProbe":{"successThreshold":1,"httpGet":{"path":"/health","host":"localhost","scheme":"HTTP","port":8000},"failureThreshold":3,"timeoutSeconds":1,"periodSeconds":10},"resources":{"requests":{"cpu":"200m","memory":"1000Mi"},"limits":{"cpu":"4","memory":"8000Mi"}}}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","securityContext":{"privileged":false}}}},"status":{"observedGeneration":2,"replicas":1,"updatedReplicas":1,"availableReplicas":1}}]}
Loading

0 comments on commit 537be57

Please sign in to comment.