Merge branch 'master' into add-rbac-to-heapster

Author: vlal

deploy/kubernetes/autoscaling/cart-hsc.yaml

@@ -1,15 +1,14 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: cart
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: cart
- subresource: scale
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50

deploy/kubernetes/autoscaling/catalogue-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: catalogue
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: catalogue
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/autoscaling/front-end-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: front-end
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: front-end
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/autoscaling/orders-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: orders
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: orders
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/autoscaling/payment-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: payment
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: payment
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/autoscaling/queue-master-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: queue-master
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: queue-master
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/autoscaling/shipping-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: shipping
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: shipping
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/autoscaling/user-hsc.yaml

@@ -1,15 +1,16 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
  name: user
  namespace: sock-shop
 spec:
- scaleRef:
+ scaleTargetRef:
+ apiVersion: apps/v1beta1
  kind: Deployment
  name: user
- subresource: scale
+
  minReplicas: 1
  maxReplicas: 10
- cpuUtilization:
- targetPercentage: 50
+ targetCPUUtilizationPercentage: 50
+ 

deploy/kubernetes/manifests-logging/fluentd-cr.yml

@@ -0,0 +1,14 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+ name: fluentd
+rules:
+- apiGroups:
+ - ""
+ resources:
+ - pods
+ verbs:
+ - get
+ - list
+ - watch

deploy/kubernetes/manifests-logging/fluentd-crb.yml

@@ -0,0 +1,13 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+ name: fluentd
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: fluentd
+subjects:
+- kind: ServiceAccount
+ name: fluentd
+ namespace: kube-system