3fcf279cfb
This branch includes a rollup series of commits from a fork of the kubernetes repository pre 1.5 release because we didn't make the code freeze. This additional effort has been fully tested and has results submit into the gubernator to enhance confidence in this code quality vs. the single layer, posing as both master/node. To reference the gubernator results, please see: https://k8s-gubernator.appspot.com/builds/canonical-kubernetes-tests/logs/kubernetes-gce-e2e-node/ Apologies in advance for the large commit, however we did not want to submit without having successful upstream automated testing results. This commit includes: - Support for CNI networking plugins - Support for durable storage provided by ceph - Building from upstream templates (read: kubedns - no more template drift!) - An e2e charm-layer to make running validation tests much simpler/repeatable - Changes to support the 1.5.x series of kubernetes Additional note: We will be targeting -all- future work against upstream so large pull requests of this magnitude will not occur again.
44 lines
965 B
YAML
44 lines
965 B
YAML
apiVersion: v1
|
|
kind: ReplicationController
|
|
metadata:
|
|
name: default-http-backend
|
|
spec:
|
|
replicas: 1
|
|
selector:
|
|
app: default-http-backend
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app: default-http-backend
|
|
spec:
|
|
terminationGracePeriodSeconds: 60
|
|
containers:
|
|
- name: default-http-backend
|
|
# Any image is permissable as long as:
|
|
# 1. It serves a 404 page at /
|
|
# 2. It serves 200 on a /healthz endpoint
|
|
image: gcr.io/google_containers/defaultbackend:1.0
|
|
livenessProbe:
|
|
httpGet:
|
|
path: /healthz
|
|
port: 8080
|
|
scheme: HTTP
|
|
initialDelaySeconds: 30
|
|
timeoutSeconds: 5
|
|
ports:
|
|
- containerPort: 8080
|
|
---
|
|
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
name: default-http-backend
|
|
labels:
|
|
app: default-http-backend
|
|
spec:
|
|
ports:
|
|
- port: 80
|
|
protocol: TCP
|
|
targetPort: 80
|
|
selector:
|
|
app: default-http-backend
|