Add RBAC rules to the heapster manifests and combine logical API obje…

…cts into the same file
kubernetes-retired · Apr 25, 2017 · 1308dd7 · 1308dd7
1 parent 4c7736c
commit 1308dd7
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 164 deletions.
diff --git a/deploy/kube-config/google/heapster-controller.yaml b/deploy/kube-config/google/heapster-controller.yaml
diff --git a/deploy/kube-config/google/heapster-service.yaml b/deploy/kube-config/google/heapster-service.yaml
diff --git a/deploy/kube-config/google/heapster.yaml b/deploy/kube-config/google/heapster.yaml
@@ -0,0 +1,57 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: heapster
+  namespace: kube-system
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: heapster
+  namespace: kube-system
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        task: monitoring
+        k8s-app: heapster
+    spec:
+      serviceAccountName: heapster
+      containers:
+      - name: heapster
+        image: gcr.io/google_containers/heapster-amd64:v1.3.0
+        imagePullPolicy: IfNotPresent
+        command:
+        - /heapster
+        - --source=kubernetes:https://kubernetes.default
+        - --sink=gcm
+        - --sink=gcl
+        - --poll_duration=2m
+        - --stats_resolution=1m
+        volumeMounts:
+        - mountPath: /etc/ssl/certs
+          name: ssl-certs
+          readOnly: true
+      volumes:
+      - name: ssl-certs
+        hostPath:
+          path: /etc/ssl/certs
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    task: monitoring
+    # For use as a Cluster add-on (https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
+    # If you are NOT using this as an addon, you should comment out this line.
+    kubernetes.io/cluster-service: 'true'
+    kubernetes.io/name: Heapster
+  name: heapster
+  namespace: kube-system
+spec:
+  ports:
+  - port: 80
+    targetPort: 8082
+  selector:
+    k8s-app: heapster
diff --git a/deploy/kube-config/influxdb/grafana-service.yaml b/deploy/kube-config/influxdb/grafana-service.yaml
diff --git a/...e-config/influxdb/grafana-deployment.yaml → deploy/kube-config/influxdb/grafana.yaml b/...e-config/influxdb/grafana-deployment.yaml → deploy/kube-config/influxdb/grafana.yaml
@@ -15,8 +15,8 @@ spec:
       - name: grafana
         image: gcr.io/google_containers/heapster-grafana-amd64:v4.0.2
         ports:
-          - containerPort: 3000
-            protocol: TCP
+        - containerPort: 3000
+          protocol: TCP
         volumeMounts:
         - mountPath: /var
           name: grafana-storage
@@ -42,3 +42,25 @@ spec:
       volumes:
       - name: grafana-storage
         emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    # For use as a Cluster add-on (https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
+    # If you are NOT using this as an addon, you should comment out this line.
+    kubernetes.io/cluster-service: 'true'
+    kubernetes.io/name: monitoring-grafana
+  name: monitoring-grafana
+  namespace: kube-system
+spec:
+  # In a production setup, we recommend accessing Grafana through an external Loadbalancer
+  # or through a public IP.
+  # type: LoadBalancer
+  # You could also use NodePort to expose the service at a randomly-generated port
+  # type: NodePort
+  ports:
+  - port: 80
+    targetPort: 3000
+  selector:
+    k8s-app: grafana
diff --git a/deploy/kube-config/influxdb/heapster-deployment.yaml b/deploy/kube-config/influxdb/heapster-deployment.yaml
diff --git a/deploy/kube-config/influxdb/heapster-service.yaml b/deploy/kube-config/influxdb/heapster-service.yaml
diff --git a/deploy/kube-config/influxdb/heapster.yaml b/deploy/kube-config/influxdb/heapster.yaml
@@ -0,0 +1,46 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: heapster
+  namespace: kube-system
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: heapster
+  namespace: kube-system
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        task: monitoring
+        k8s-app: heapster
+    spec:
+      serviceAccountName: heapster
+      containers:
+      - name: heapster
+        image: gcr.io/google_containers/heapster-amd64:v1.3.0
+        imagePullPolicy: IfNotPresent
+        command:
+        - /heapster
+        - --source=kubernetes:https://kubernetes.default
+        - --sink=influxdb:http://monitoring-influxdb.kube-system.svc:8086
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    task: monitoring
+    # For use as a Cluster add-on (https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
+    # If you are NOT using this as an addon, you should comment out this line.
+    kubernetes.io/cluster-service: 'true'
+    kubernetes.io/name: Heapster
+  name: heapster
+  namespace: kube-system
+spec:
+  ports:
+  - port: 80
+    targetPort: 8082
+  selector:
+    k8s-app: heapster
diff --git a/deploy/kube-config/influxdb/influxdb-service.yaml b/deploy/kube-config/influxdb/influxdb-service.yaml
diff --git a/...-config/influxdb/influxdb-deployment.yaml → deploy/kube-config/influxdb/influxdb.yaml b/...-config/influxdb/influxdb-deployment.yaml → deploy/kube-config/influxdb/influxdb.yaml
@@ -20,3 +20,21 @@ spec:
       volumes:
       - name: influxdb-storage
         emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    task: monitoring
+    # For use as a Cluster add-on (https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
+    # If you are NOT using this as an addon, you should comment out this line.
+    kubernetes.io/cluster-service: 'true'
+    kubernetes.io/name: monitoring-influxdb
+  name: monitoring-influxdb
+  namespace: kube-system
+spec:
+  ports:
+  - port: 8086
+    targetPort: 8086
+  selector:
+    k8s-app: influxdb
diff --git a/deploy/kube-config/rbac/heapster-rbac.yaml b/deploy/kube-config/rbac/heapster-rbac.yaml
@@ -0,0 +1,12 @@
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: heapster
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:heapster
+subjects:
+- kind: ServiceAccount
+  name: heapster
+  namespace: kube-system
diff --git a/deploy/kube-config/standalone/heapster-controller.yaml b/deploy/kube-config/standalone/heapster-controller.yaml
@@ -1,35 +1,45 @@
 apiVersion: v1
-kind: ReplicationController
+kind: ServiceAccount
+metadata:
+  name: heapster
+  namespace: kube-system
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  labels:
-    k8s-app: heapster
-    name: heapster
-    version: v6
   name: heapster
   namespace: kube-system
 spec:
   replicas: 1
-  selector:
-    k8s-app: heapster
-    version: v6
   template:
     metadata:
       labels:
+        task: monitoring
         k8s-app: heapster
-        version: v6
     spec:
+      serviceAccountName: heapster
       containers:
       - name: heapster
-        image: gcr.io/google_containers/heapster-amd64:v1.3.0-beta.1
-        imagePullPolicy: Always
+        image: gcr.io/google_containers/heapster-amd64:v1.3.0
+        imagePullPolicy: IfNotPresent
         command:
         - /heapster
         - --source=kubernetes:https://kubernetes.default
-        volumeMounts:
-        - name: ssl-certs
-          mountPath: /etc/ssl/certs
-          readOnly: true
-      volumes:
-      - name: ssl-certs
-        hostPath:
-          path: /etc/ssl/certs
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    task: monitoring
+    # For use as a Cluster add-on (https://github.com/kubernetes/kubernetes/tree/master/cluster/addons)
+    # If you are NOT using this as an addon, you should comment out this line.
+    kubernetes.io/cluster-service: 'true'
+    kubernetes.io/name: Heapster
+  name: heapster
+  namespace: kube-system
+spec:
+  ports:
+  - port: 80
+    targetPort: 8082
+  selector:
+    k8s-app: heapster
diff --git a/deploy/kube-config/standalone/heapster-service.yaml b/deploy/kube-config/standalone/heapster-service.yaml