diff --git a/script/test/fixtures/entrypoint-command/output-os.json b/script/test/fixtures/entrypoint-command/output-os.json index df1122a1..a4f66049 100644 --- a/script/test/fixtures/entrypoint-command/output-os.json +++ b/script/test/fixtures/entrypoint-command/output-os.json @@ -17,7 +17,24 @@ "strategy": { "resources": {} }, - "triggers": null, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "base" + ], + "from": { + "kind": "ImageStreamTag", + "name": "base:latest" + } + } + } + ], "replicas": 1, "test": false, "selector": { @@ -34,7 +51,7 @@ "containers": [ { "name": "base", - "image": "busybox", + "image": " ", "command": [ "echo" ], @@ -49,6 +66,31 @@ } }, "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "base", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "busybox" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } } ] } diff --git a/script/test/fixtures/etherpad/output-os.json b/script/test/fixtures/etherpad/output-os.json index d6193f44..fcc86174 100644 --- a/script/test/fixtures/etherpad/output-os.json +++ b/script/test/fixtures/etherpad/output-os.json @@ -4,73 +4,31 @@ "metadata": {}, "items": [ { - "kind": "DeploymentConfig", + "kind": "Service", "apiVersion": "v1", "metadata": { - "name": "etherpad", + "name": "mariadb", "creationTimestamp": null, "labels": { - "service": "etherpad" + "service": "mariadb" } }, "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "etherpad" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "etherpad" - } - }, - "spec": { - "containers": [ - { - "name": "etherpad", - "image": "centos/etherpad", - "ports": [ - { - "containerPort": 9001, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "DB_USER", - "value": "etherpad" - }, - { - "name": "DB_DBID", - "value": "etherpad" - }, - { - "name": "DB_HOST", - "value": "mariadb" - }, - { - "name": "DB_PASS", - "value": "etherpad" - }, - { - "name": "DB_PORT", - "value": "3306" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" + "ports": [ + { + "name": "3306", + "protocol": "TCP", + "port": 3306, + "targetPort": 3306 } + ], + "selector": { + "service": "mariadb" } }, - "status": {} + "status": { + "loadBalancer": {} + } }, { "kind": "Service", @@ -113,7 +71,24 @@ "strategy": { "resources": {} }, - "triggers": null, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "mariadb" + ], + "from": { + "kind": "ImageStreamTag", + "name": "mariadb:latest" + } + } + } + ], "replicas": 1, "test": false, "selector": { @@ -130,7 +105,7 @@ "containers": [ { "name": "mariadb", - "image": "centos/mariadb", + "image": " ", "ports": [ { "containerPort": 3306, @@ -165,30 +140,139 @@ "status": {} }, { - "kind": "Service", + "kind": "ImageStream", "apiVersion": "v1", "metadata": { "name": "mariadb", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "centos/mariadb" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "etherpad", "creationTimestamp": null, "labels": { - "service": "mariadb" + "service": "etherpad" } }, "spec": { - "ports": [ + "strategy": { + "resources": {} + }, + "triggers": [ { - "name": "3306", - "protocol": "TCP", - "port": 3306, - "targetPort": 3306 + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "etherpad" + ], + "from": { + "kind": "ImageStreamTag", + "name": "etherpad:latest" + } + } } ], + "replicas": 1, + "test": false, "selector": { - "service": "mariadb" + "service": "etherpad" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "etherpad" + } + }, + "spec": { + "containers": [ + { + "name": "etherpad", + "image": " ", + "ports": [ + { + "containerPort": 9001, + "protocol": "TCP" + } + ], + "env": [ + { + "name": "DB_USER", + "value": "etherpad" + }, + { + "name": "DB_DBID", + "value": "etherpad" + }, + { + "name": "DB_HOST", + "value": "mariadb" + }, + { + "name": "DB_PASS", + "value": "etherpad" + }, + { + "name": "DB_PORT", + "value": "3306" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } } }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "etherpad", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "centos/etherpad" + }, + "generation": null, + "importPolicy": {} + } + ] + }, "status": { - "loadBalancer": {} + "dockerImageRepository": "" } } ] diff --git a/script/test/fixtures/gitlab/output-os.json b/script/test/fixtures/gitlab/output-os.json index b170897e..99464ab2 100644 --- a/script/test/fixtures/gitlab/output-os.json +++ b/script/test/fixtures/gitlab/output-os.json @@ -3,95 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "gitlab", - "creationTimestamp": null, - "labels": { - "service": "gitlab" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "gitlab" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "gitlab" - } - }, - "spec": { - "containers": [ - { - "name": "gitlab", - "image": "swordphilic/gitlab", - "ports": [ - { - "containerPort": 80, - "protocol": "TCP" - }, - { - "containerPort": 443, - "protocol": "TCP" - }, - { - "containerPort": 22, - "protocol": "TCP" - } - ], - "env": [ - { - "name": "DB_HOST", - "value": "postgresql" - }, - { - "name": "DB_NAME", - "value": "gitlab" - }, - { - "name": "DB_PASS", - "value": "gitlab" - }, - { - "name": "DB_PORT", - "value": "5432" - }, - { - "name": "DB_TYPE", - "value": "postgres" - }, - { - "name": "DB_USER", - "value": "gitlab" - }, - { - "name": "REDIS_HOST", - "value": "redis" - }, - { - "name": "REDIS_PORT", - "value": "6379" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", @@ -131,6 +42,191 @@ "loadBalancer": {} } }, + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "postgresql", + "creationTimestamp": null, + "labels": { + "service": "postgresql" + } + }, + "spec": { + "ports": [ + { + "name": "5432", + "protocol": "TCP", + "port": 5432, + "targetPort": 5432 + } + ], + "selector": { + "service": "postgresql" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "Service", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "service": "redis" + } + }, + "spec": { + "ports": [ + { + "name": "6379", + "protocol": "TCP", + "port": 6379, + "targetPort": 6379 + } + ], + "selector": { + "service": "redis" + } + }, + "status": { + "loadBalancer": {} + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "gitlab", + "creationTimestamp": null, + "labels": { + "service": "gitlab" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "gitlab" + ], + "from": { + "kind": "ImageStreamTag", + "name": "gitlab:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "gitlab" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "gitlab" + } + }, + "spec": { + "containers": [ + { + "name": "gitlab", + "image": " ", + "ports": [ + { + "containerPort": 80, + "protocol": "TCP" + }, + { + "containerPort": 443, + "protocol": "TCP" + }, + { + "containerPort": 22, + "protocol": "TCP" + } + ], + "env": [ + { + "name": "DB_NAME", + "value": "gitlab" + }, + { + "name": "DB_PASS", + "value": "gitlab" + }, + { + "name": "DB_PORT", + "value": "5432" + }, + { + "name": "DB_TYPE", + "value": "postgres" + }, + { + "name": "DB_USER", + "value": "gitlab" + }, + { + "name": "REDIS_HOST", + "value": "redis" + }, + { + "name": "REDIS_PORT", + "value": "6379" + }, + { + "name": "DB_HOST", + "value": "postgresql" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "gitlab", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "swordphilic/gitlab" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, { "kind": "DeploymentConfig", "apiVersion": "v1", @@ -145,7 +241,24 @@ "strategy": { "resources": {} }, - "triggers": null, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "postgresql" + ], + "from": { + "kind": "ImageStreamTag", + "name": "postgresql:latest" + } + } + } + ], "replicas": 1, "test": false, "selector": { @@ -162,7 +275,7 @@ "containers": [ { "name": "postgresql", - "image": "swordphilic/postgresql", + "image": " ", "ports": [ { "containerPort": 5432, @@ -193,30 +306,28 @@ "status": {} }, { - "kind": "Service", + "kind": "ImageStream", "apiVersion": "v1", "metadata": { "name": "postgresql", - "creationTimestamp": null, - "labels": { - "service": "postgresql" - } + "creationTimestamp": null }, "spec": { - "ports": [ + "tags": [ { - "name": "5432", - "protocol": "TCP", - "port": 5432, - "targetPort": 5432 + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "swordphilic/postgresql" + }, + "generation": null, + "importPolicy": {} } - ], - "selector": { - "service": "postgresql" - } + ] }, "status": { - "loadBalancer": {} + "dockerImageRepository": "" } }, { @@ -233,7 +344,24 @@ "strategy": { "resources": {} }, - "triggers": null, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "redis" + ], + "from": { + "kind": "ImageStreamTag", + "name": "redis:latest" + } + } + } + ], "replicas": 1, "test": false, "selector": { @@ -250,7 +378,7 @@ "containers": [ { "name": "redis", - "image": "swordphilic/redis", + "image": " ", "ports": [ { "containerPort": 6379, @@ -267,30 +395,28 @@ "status": {} }, { - "kind": "Service", + "kind": "ImageStream", "apiVersion": "v1", "metadata": { "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } + "creationTimestamp": null }, "spec": { - "ports": [ + "tags": [ { - "name": "6379", - "protocol": "TCP", - "port": 6379, - "targetPort": 6379 + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "swordphilic/redis" + }, + "generation": null, + "importPolicy": {} } - ], - "selector": { - "service": "redis" - } + ] }, "status": { - "loadBalancer": {} + "dockerImageRepository": "" } } ] diff --git a/script/test/fixtures/ngnix-node-redis/output-os.json b/script/test/fixtures/ngnix-node-redis/output-os.json index 9b892c58..0e93b3a6 100644 --- a/script/test/fixtures/ngnix-node-redis/output-os.json +++ b/script/test/fixtures/ngnix-node-redis/output-os.json @@ -3,52 +3,6 @@ "apiVersion": "v1", "metadata": {}, "items": [ - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "node2", - "creationTimestamp": null, - "labels": { - "service": "node2" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "node2" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "node2" - } - }, - "spec": { - "containers": [ - { - "name": "node2", - "ports": [ - { - "containerPort": 8080, - "protocol": "TCP" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", @@ -76,52 +30,6 @@ "loadBalancer": {} } }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "node3", - "creationTimestamp": null, - "labels": { - "service": "node3" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "node3" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "node3" - } - }, - "spec": { - "containers": [ - { - "name": "node3", - "ports": [ - { - "containerPort": 8080, - "protocol": "TCP" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", @@ -149,53 +57,6 @@ "loadBalancer": {} } }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "redis", - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "redis" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "redis" - } - }, - "spec": { - "containers": [ - { - "name": "redis", - "image": "redis", - "ports": [ - { - "containerPort": 6379, - "protocol": "TCP" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", @@ -223,52 +84,6 @@ "loadBalancer": {} } }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "nginx", - "creationTimestamp": null, - "labels": { - "service": "nginx" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "nginx" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "nginx" - } - }, - "spec": { - "containers": [ - { - "name": "nginx", - "ports": [ - { - "containerPort": 80, - "protocol": "TCP" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", @@ -296,52 +111,6 @@ "loadBalancer": {} } }, - { - "kind": "DeploymentConfig", - "apiVersion": "v1", - "metadata": { - "name": "node1", - "creationTimestamp": null, - "labels": { - "service": "node1" - } - }, - "spec": { - "strategy": { - "resources": {} - }, - "triggers": null, - "replicas": 1, - "test": false, - "selector": { - "service": "node1" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "service": "node1" - } - }, - "spec": { - "containers": [ - { - "name": "node1", - "ports": [ - { - "containerPort": 8080, - "protocol": "TCP" - } - ], - "resources": {} - } - ], - "restartPolicy": "Always" - } - } - }, - "status": {} - }, { "kind": "Service", "apiVersion": "v1", @@ -368,6 +137,447 @@ "status": { "loadBalancer": {} } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "node2", + "creationTimestamp": null, + "labels": { + "service": "node2" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "node2" + ], + "from": { + "kind": "ImageStreamTag", + "name": "node2:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "node2" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "node2" + } + }, + "spec": { + "containers": [ + { + "name": "node2", + "image": " ", + "ports": [ + { + "containerPort": 8080, + "protocol": "TCP" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "node2", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "node3", + "creationTimestamp": null, + "labels": { + "service": "node3" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "node3" + ], + "from": { + "kind": "ImageStreamTag", + "name": "node3:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "node3" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "node3" + } + }, + "spec": { + "containers": [ + { + "name": "node3", + "image": " ", + "ports": [ + { + "containerPort": 8080, + "protocol": "TCP" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "node3", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null, + "labels": { + "service": "redis" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "redis" + ], + "from": { + "kind": "ImageStreamTag", + "name": "redis:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "redis" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "redis" + } + }, + "spec": { + "containers": [ + { + "name": "redis", + "image": " ", + "ports": [ + { + "containerPort": 6379, + "protocol": "TCP" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "redis" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "nginx", + "creationTimestamp": null, + "labels": { + "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": { + "service": "nginx" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "nginx" + } + }, + "spec": { + "containers": [ + { + "name": "nginx", + "image": " ", + "ports": [ + { + "containerPort": 80, + "protocol": "TCP" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "nginx", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, + { + "kind": "DeploymentConfig", + "apiVersion": "v1", + "metadata": { + "name": "node1", + "creationTimestamp": null, + "labels": { + "service": "node1" + } + }, + "spec": { + "strategy": { + "resources": {} + }, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "node1" + ], + "from": { + "kind": "ImageStreamTag", + "name": "node1:latest" + } + } + } + ], + "replicas": 1, + "test": false, + "selector": { + "service": "node1" + }, + "template": { + "metadata": { + "creationTimestamp": null, + "labels": { + "service": "node1" + } + }, + "spec": { + "containers": [ + { + "name": "node1", + "image": " ", + "ports": [ + { + "containerPort": 8080, + "protocol": "TCP" + } + ], + "resources": {} + } + ], + "restartPolicy": "Always" + } + } + }, + "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "node1", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } } ] } diff --git a/script/test/fixtures/ports-with-proto/output-os.json b/script/test/fixtures/ports-with-proto/output-os.json index a5d78d3b..37b14fda 100644 --- a/script/test/fixtures/ports-with-proto/output-os.json +++ b/script/test/fixtures/ports-with-proto/output-os.json @@ -77,7 +77,24 @@ "strategy": { "resources": {} }, - "triggers": null, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "redis" + ], + "from": { + "kind": "ImageStreamTag", + "name": "redis:3.0" + } + } + } + ], "replicas": 1, "test": false, "selector": { @@ -94,7 +111,7 @@ "containers": [ { "name": "redis", - "image": "redis:3.0", + "image": " ", "ports": [ { "containerPort": 6379, @@ -114,6 +131,31 @@ }, "status": {} }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "redis", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "3.0", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "redis:3.0" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } + }, { "kind": "DeploymentConfig", "apiVersion": "v1", @@ -128,7 +170,24 @@ "strategy": { "resources": {} }, - "triggers": null, + "triggers": [ + { + "type": "ConfigChange" + }, + { + "type": "ImageChange", + "imageChangeParams": { + "automatic": true, + "containerNames": [ + "web" + ], + "from": { + "kind": "ImageStreamTag", + "name": "web:latest" + } + } + } + ], "replicas": 1, "test": false, "selector": { @@ -145,7 +204,7 @@ "containers": [ { "name": "web", - "image": "tuna/docker-counter23", + "image": " ", "ports": [ { "containerPort": 5000, @@ -160,6 +219,31 @@ } }, "status": {} + }, + { + "kind": "ImageStream", + "apiVersion": "v1", + "metadata": { + "name": "web", + "creationTimestamp": null + }, + "spec": { + "tags": [ + { + "name": "latest", + "annotations": null, + "from": { + "kind": "DockerImage", + "name": "tuna/docker-counter23" + }, + "generation": null, + "importPolicy": {} + } + ] + }, + "status": { + "dockerImageRepository": "" + } } ] }