diff --git a/metrics-server/deploy/1.7/auth-delegator.yaml b/metrics-server/deploy/1.7/auth-delegator.yaml
new file mode 100644
index 0000000..e3442c5
--- /dev/null
+++ b/metrics-server/deploy/1.7/auth-delegator.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: metrics-server:system:auth-delegator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
diff --git a/metrics-server/deploy/1.7/auth-reader.yaml b/metrics-server/deploy/1.7/auth-reader.yaml
new file mode 100644
index 0000000..f0616e1
--- /dev/null
+++ b/metrics-server/deploy/1.7/auth-reader.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: metrics-server-auth-reader
+  namespace: kube-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
diff --git a/metrics-server/deploy/1.7/metrics-apiservice.yaml b/metrics-server/deploy/1.7/metrics-apiservice.yaml
new file mode 100644
index 0000000..32b1b14
--- /dev/null
+++ b/metrics-server/deploy/1.7/metrics-apiservice.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  name: v1alpha1.metrics
+spec:
+  service:
+    name: metrics-server
+    namespace: kube-system
+  group: metrics
+  version: v1alpha1
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 100
diff --git a/metrics-server/deploy/1.7/metrics-server-deployment.yaml b/metrics-server/deploy/1.7/metrics-server-deployment.yaml
new file mode 100644
index 0000000..562091f
--- /dev/null
+++ b/metrics-server/deploy/1.7/metrics-server-deployment.yaml
@@ -0,0 +1,32 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: metrics-server
+  namespace: kube-system
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: metrics-server
+  namespace: kube-system
+  labels:
+    k8s-app: metrics-server
+spec:
+  selector:
+    matchLabels:
+      k8s-app: metrics-server
+  template:
+    metadata:
+      name: metrics-server
+      labels:
+        k8s-app: metrics-server
+    spec:
+      serviceAccountName: metrics-server
+      containers:
+      - name: metrics-server
+        image: gcr.io/google_containers/metrics-server-amd64:v0.1.0
+        imagePullPolicy: Always
+        command:
+        - /metrics-server
+        - --source=kubernetes.summary_api:''
diff --git a/metrics-server/deploy/1.7/metrics-server-service.yaml b/metrics-server/deploy/1.7/metrics-server-service.yaml
new file mode 100644
index 0000000..082b00c
--- /dev/null
+++ b/metrics-server/deploy/1.7/metrics-server-service.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: metrics-server
+  namespace: kube-system
+  labels:
+    kubernetes.io/name: "Metrics-server"
+spec:
+  selector:
+    k8s-app: metrics-server
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 443
diff --git a/metrics-server/deploy/1.8+/aggregated-metrics-reader.yaml b/metrics-server/deploy/1.8+/aggregated-metrics-reader.yaml
new file mode 100644
index 0000000..cdf3415
--- /dev/null
+++ b/metrics-server/deploy/1.8+/aggregated-metrics-reader.yaml
@@ -0,0 +1,12 @@
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: system:aggregated-metrics-reader
+  labels:
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+rules:
+- apiGroups: ["metrics.k8s.io"]
+  resources: ["pods"]
+  verbs: ["get", "list", "watch"]
diff --git a/metrics-server/deploy/1.8+/auth-delegator.yaml b/metrics-server/deploy/1.8+/auth-delegator.yaml
new file mode 100644
index 0000000..e3442c5
--- /dev/null
+++ b/metrics-server/deploy/1.8+/auth-delegator.yaml
@@ -0,0 +1,13 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: metrics-server:system:auth-delegator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
diff --git a/metrics-server/deploy/1.8+/auth-reader.yaml b/metrics-server/deploy/1.8+/auth-reader.yaml
new file mode 100644
index 0000000..f0616e1
--- /dev/null
+++ b/metrics-server/deploy/1.8+/auth-reader.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: metrics-server-auth-reader
+  namespace: kube-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
diff --git a/metrics-server/deploy/1.8+/metrics-apiservice.yaml b/metrics-server/deploy/1.8+/metrics-apiservice.yaml
new file mode 100644
index 0000000..08b0530
--- /dev/null
+++ b/metrics-server/deploy/1.8+/metrics-apiservice.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: apiregistration.k8s.io/v1beta1
+kind: APIService
+metadata:
+  name: v1beta1.metrics.k8s.io
+spec:
+  service:
+    name: metrics-server
+    namespace: kube-system
+  group: metrics.k8s.io
+  version: v1beta1
+  insecureSkipTLSVerify: true
+  groupPriorityMinimum: 100
+  versionPriority: 100
diff --git a/metrics-server/deploy/1.8+/metrics-server-deployment.yaml b/metrics-server/deploy/1.8+/metrics-server-deployment.yaml
new file mode 100644
index 0000000..ad2abaf
--- /dev/null
+++ b/metrics-server/deploy/1.8+/metrics-server-deployment.yaml
@@ -0,0 +1,37 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: metrics-server
+  namespace: kube-system
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: metrics-server
+  namespace: kube-system
+  labels:
+    k8s-app: metrics-server
+spec:
+  selector:
+    matchLabels:
+      k8s-app: metrics-server
+  template:
+    metadata:
+      name: metrics-server
+      labels:
+        k8s-app: metrics-server
+    spec:
+      serviceAccountName: metrics-server
+      volumes:
+      # mount in tmp so we can safely use from-scratch images and/or read-only containers
+      - name: tmp-dir
+        emptyDir: {}
+      containers:
+      - name: metrics-server
+        image: k8s.gcr.io/metrics-server-amd64:v0.3.1
+        imagePullPolicy: Always
+        volumeMounts:
+        - name: tmp-dir
+          mountPath: /tmp
+
diff --git a/metrics-server/deploy/1.8+/metrics-server-service.yaml b/metrics-server/deploy/1.8+/metrics-server-service.yaml
new file mode 100644
index 0000000..082b00c
--- /dev/null
+++ b/metrics-server/deploy/1.8+/metrics-server-service.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: metrics-server
+  namespace: kube-system
+  labels:
+    kubernetes.io/name: "Metrics-server"
+spec:
+  selector:
+    k8s-app: metrics-server
+  ports:
+  - port: 443
+    protocol: TCP
+    targetPort: 443
diff --git a/metrics-server/deploy/1.8+/resource-reader.yaml b/metrics-server/deploy/1.8+/resource-reader.yaml
new file mode 100644
index 0000000..4f98772
--- /dev/null
+++ b/metrics-server/deploy/1.8+/resource-reader.yaml
@@ -0,0 +1,29 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: system:metrics-server
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - nodes
+  - nodes/stats
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: system:metrics-server
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:metrics-server
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
diff --git a/metrics-server/deploy/docker/Dockerfile b/metrics-server/deploy/docker/Dockerfile
new file mode 100644
index 0000000..504d630
--- /dev/null
+++ b/metrics-server/deploy/docker/Dockerfile
@@ -0,0 +1,5 @@
+FROM BASEIMAGE
+
+COPY metrics-server /
+
+ENTRYPOINT ["/metrics-server"]