Merge pull request #45 from jwhonce/wip/pod_updates

Infrastructure - Update pod definitions

9 files changed, 10 insertions, 8 deletions

diff --git a/cluster.sh b/cluster.sh
index afb9826ff..bd70a3a13 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -eu
 
-MINIONS=3
+MINIONS=2
 MASTERS=1
 
 # If the environment variable OO_PROVDER is defined, it used for the provider
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"