diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-01-09 14:00:46 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-01-09 14:23:31 -0700 |
| commit | 91d3b9e0cf8eee10b7f920c23c9d676ccfbe6635 (patch) | |
| tree | fc6a368278a098ea0961d4f4e2fa4d943ce57025 /roles/pods | |
| parent | e555eeae216e3f9c4061ffc3397bba8d59620615 (diff) | |
| download | openshift-91d3b9e0cf8eee10b7f920c23c9d676ccfbe6635.tar.gz openshift-91d3b9e0cf8eee10b7f920c23c9d676ccfbe6635.tar.bz2 openshift-91d3b9e0cf8eee10b7f920c23c9d676ccfbe6635.tar.xz openshift-91d3b9e0cf8eee10b7f920c23c9d676ccfbe6635.zip | |
Infrastructure - Update pod definitions
* Bring pod definitions in line with lates k8s release
Diffstat (limited to 'roles/pods')
| -rw-r--r-- | roles/pods/files/pods/docker-registry.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/fedora_apache.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/frontend-controller.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/redis-master-service.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/redis-master.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/redis-slave-controller.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/redis-slave-service.json | 2 | ||||
| -rw-r--r-- | roles/pods/files/pods/registry-service.json | 2 |
8 files changed, 9 insertions, 7 deletions
diff --git a/roles/pods/files/pods/docker-registry.json b/roles/pods/files/pods/docker-registry.json index 388a1015e..a480e6b30 100644 --- a/roles/pods/files/pods/docker-registry.json +++ b/roles/pods/files/pods/docker-registry.json @@ -1,6 +1,6 @@ { "kind": "Pod", - "version": "v1beta1", + "version": "v1beta2", "desiredState": { "manifest": { "version": "v1beta1", diff --git a/roles/pods/files/pods/fedora_apache.json b/roles/pods/files/pods/fedora_apache.json index 54eb712c2..187927559 100644 --- a/roles/pods/files/pods/fedora_apache.json +++ b/roles/pods/files/pods/fedora_apache.json @@ -1,5 +1,7 @@ { "id": "apache", + "kind": "Pod", + "apiVersion": "v1beta2", "desiredState": { "manifest": { "version": "v1beta1", diff --git a/roles/pods/files/pods/frontend-controller.json b/roles/pods/files/pods/frontend-controller.json index 1558724b6..2a2cdea9a 100644 --- a/roles/pods/files/pods/frontend-controller.json +++ b/roles/pods/files/pods/frontend-controller.json @@ -1,7 +1,7 @@ { "id": "frontendController", "kind": "ReplicationController", - "apiVersion": "v1beta1", + "apiVersion": "v1beta2", "desiredState": { "replicas": 2, "replicaSelector": {"name": "frontend"}, diff --git a/roles/pods/files/pods/redis-master-service.json b/roles/pods/files/pods/redis-master-service.json index 80808dcd6..0f590272d 100644 --- a/roles/pods/files/pods/redis-master-service.json +++ b/roles/pods/files/pods/redis-master-service.json @@ -1,7 +1,7 @@ { "id": "redismaster", "kind": "Service", - "apiVersion": "v1beta1", + "apiVersion": "v1beta2", "port": 10000, "containerPort": 6379, "selector": { diff --git a/roles/pods/files/pods/redis-master.json b/roles/pods/files/pods/redis-master.json index 71acea530..0a281a045 100644 --- a/roles/pods/files/pods/redis-master.json +++ b/roles/pods/files/pods/redis-master.json @@ -1,7 +1,7 @@ { "id": "redis-master-2", "kind": "Pod", - "apiVersion": "v1beta1", + "apiVersion": "v1beta2", "desiredState": { "manifest": { "version": "v1beta1", diff --git a/roles/pods/files/pods/redis-slave-controller.json b/roles/pods/files/pods/redis-slave-controller.json index 5c8d1ea30..b85fff66a 100644 --- a/roles/pods/files/pods/redis-slave-controller.json +++ b/roles/pods/files/pods/redis-slave-controller.json @@ -1,7 +1,7 @@ { "id": "redisSlaveController", "kind": "ReplicationController", - "apiVersion": "v1beta1", + "apiVersion": "v1beta2", "desiredState": { "replicas": 2, "replicaSelector": {"name": "redisslave"}, diff --git a/roles/pods/files/pods/redis-slave-service.json b/roles/pods/files/pods/redis-slave-service.json index f90a9be9f..e1c5029f6 100644 --- a/roles/pods/files/pods/redis-slave-service.json +++ b/roles/pods/files/pods/redis-slave-service.json @@ -1,7 +1,7 @@ { "id": "redisslave", "kind": "Service", - "apiVersion": "v1beta1", + "apiVersion": "v1beta2", "port": 10001, "containerPort": 6379, "labels": { diff --git a/roles/pods/files/pods/registry-service.json b/roles/pods/files/pods/registry-service.json index 96eaf261c..3a711a1ac 100644 --- a/roles/pods/files/pods/registry-service.json +++ b/roles/pods/files/pods/registry-service.json @@ -1,7 +1,7 @@ { "id": "dockerregistry", "kind": "Service", - "apiVersion": "v1beta1", + "apiVersion": "v1beta2", "port": 8888, "selector": { "name": "docker-registry" |