Infrastructure - Update pod definitions

* Bring pod definitions in line with lates k8s release

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

roles/pods/files/pods/docker-registry.json

@@ -1,6 +1,6 @@
 {
   "kind": "Pod",
-  "version": "v1beta1",
+  "version": "v1beta2",
   "desiredState": {
     "manifest": {
       "version": "v1beta1",

roles/pods/files/pods/fedora_apache.json

@@ -1,5 +1,7 @@
 {
   "id": "apache",
+  "kind": "Pod",
+  "apiVersion": "v1beta2",
   "desiredState": {
     "manifest": {
       "version": "v1beta1",

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"},

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": {

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",

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"},

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": {

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"