Make changes

deploy/addepar/certs/gencerts.sh

@@ -15,14 +15,14 @@ case $(uname) in
             b64_opts='--wrap=0'
 esac
 
-#go get -v -u github.com/cloudflare/cfssl/cmd/...
+go get -v -u github.com/cloudflare/cfssl/cmd/...
 
 export PURPOSE=metrics
 openssl req -x509 -sha256 -new -nodes -days 365 -newkey rsa:2048 -keyout ${PURPOSE}-ca.key -out ${PURPOSE}-ca.crt -subj "/CN=ca"
 echo '{"signing":{"default":{"expiry":"43800h","usages":["signing","key encipherment","'${PURPOSE}'"]}}}' > "${PURPOSE}-ca-config.json"
 
 export SERVICE_NAME=custom-metrics-apiserver
-export ALT_NAMES='"custom-metrics-apiserver.monitoring","custom-metrics-apiserver.monitoring.svc"'
+export ALT_NAMES='"custom-metrics-apiserver.custom-metrics","custom-metrics-apiserver.custom-metrics.svc"'
 echo "{\"CN\":\"${SERVICE_NAME}\", \"hosts\": [${ALT_NAMES}], \"key\": {\"algo\": \"rsa\",\"size\": 2048}}" | \
        	cfssl gencert -ca=metrics-ca.crt -ca-key=metrics-ca.key -config=metrics-ca-config.json - | cfssljson -bare apiserver
 
@@ -32,6 +32,6 @@ kind: Secret
 metadata:
   name: cm-adapter-serving-certs
 data:
-  serving.crt: $(base64 ${b64_opts} < apiserver.pem)
-  serving.key: $(base64 ${b64_opts} < apiserver-key.pem)
+  serving.crt: $(cat apiserver.pem | base64 ${b64_opts})
+  serving.key: $(cat apiserver-key.pem | base64 ${b64_opts})
 EOF

deploy/addepar/prometheus/prometheus.yaml

@@ -3,26 +3,32 @@ kind: ServiceAccount
 metadata:
   name: prometheus
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: prometheus
 rules:
-  - apiGroups: [""]
-    resources:
-      - nodes
-      - services
-      - endpoints
-      - pods
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources:
-      - configmaps
-    verbs: ["get"]
-  - nonResourceURLs: ["/metrics"]
-    verbs: ["get"]
+- apiGroups: [""]
+  resources:
+  - nodes
+  - nodes/metrics
+  - services
+  - endpoints
+  - pods
+  verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources:
+  - configmaps
+  verbs: ["get"]
+- apiGroups:
+  - networking.k8s.io
+  resources:
+  - ingresses
+  verbs: ["get", "list", "watch"]
+- nonResourceURLs: ["/metrics"]
+  verbs: ["get"]
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: prometheus
@@ -31,9 +37,9 @@ roleRef:
   kind: ClusterRole
   name: prometheus
 subjects:
-  - kind: ServiceAccount
-    name: prometheus
-    namespace: prom
+- kind: ServiceAccount
+  name: prometheus
+  namespace: default
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
@@ -41,11 +47,13 @@ metadata:
   name: prometheus
 spec:
   # Match all service monitors in all namespaces
+  serviceAccountName: prometheus
   serviceMonitorNamespaceSelector: {}
   serviceMonitorSelector: {}
   resources:
     requests:
       memory: 400Mi
+  enableAdminAPI: false
 ---
 apiVersion: v1
 kind: Service
@@ -54,10 +62,10 @@ metadata:
 spec:
   type: NodePort
   ports:
-    - name: web
-      nodePort: 30900
-      port: 9090
-      protocol: TCP
-      targetPort: web
+  - name: web
+    nodePort: 30900
+    port: 9090
+    protocol: TCP
+    targetPort: web
   selector:
     prometheus: prometheus

deploy/addepar/sample-hpa/Makefile

@@ -10,7 +10,6 @@ monitor:
 	kubectl create -n default -f service-monitor.yaml
 
 hpa:
-	kubectl delete -f sample-app.hpa.yaml
 	kubectl create -f sample-app.hpa.yaml
 
 test:

deploy/addepar/sample-hpa/sample-app.hpa.yaml

@@ -1,24 +1,19 @@
+apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
-apiVersion: autoscaling/v2beta1
 metadata:
   name: sample-app
 spec:
   scaleTargetRef:
-    # point the HPA at the sample application
-    # you created above
     apiVersion: apps/v1
     kind: Deployment
     name: sample-app
-  # autoscale between 1 and 10 replicas
   minReplicas: 1
-  maxReplicas: 10
+  maxReplicas: 5
   metrics:
-    # use a "Pods" metric, which takes the average of the
-    # given metric across all pods controlled by the autoscaling target
-    - type: Pods
-      pods:
-        # use the metric that you used above: pods/http_requests
-        metricName: http_requests
-        # target 500 milli-requests per second,
-        # which is 1 request every two seconds
-        targetAverageValue: 20m
+  - type: Pods
+    pods:
+      metric:
+        name: http_requests_total
+      target:
+        type: AverageValue
+        averageValue: 20m