Merge pull request #3856 from smarterclayton/validation_logic_needs_cleanup

Validation of ObjectMeta is inconsistently applied
This commit is contained in:
Tim Hockin
2015-01-29 14:12:44 -08:00
27 changed files with 387 additions and 147 deletions

View File

@@ -1,5 +1,5 @@
apiVersion: "v1beta1"
id: "monitoring-heapsterController"
id: "monitoring-heapster-controller"
kind: "ReplicationController"
desiredState:
replicas: 1
@@ -9,7 +9,7 @@ desiredState:
desiredState:
manifest:
version: "v1beta1"
id: "monitoring-heapsterController"
id: "monitoring-heapster-controller"
containers:
- name: "heapster"
image: "kubernetes/heapster:v0.6"

View File

@@ -1,6 +1,6 @@
apiVersion: "v1beta1"
kind: "ReplicationController"
id: "monitoring-influxGrafanaController"
id: "monitoring-influx-grafana-controller"
desiredState:
replicas: 1
replicaSelector:
@@ -11,7 +11,7 @@ desiredState:
desiredState:
manifest:
version: "v1beta1"
id: "monitoring-influxGrafanaController"
id: "monitoring-influx-grafana-controller"
containers:
- name: "influxdb"
image: "kubernetes/heapster_influxdb:v0.3"