Merge pull request #264 from kubecost/bolt/logs-role

Thanos Env + Adding Role and RoleBinding for Pods/Log
kubecost · Feb 3, 2020 · 89cf47a · 89cf47a
2 parents 666f44f + f2ac3a2
commit 89cf47a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/cost-analyzer/templates/cost-analyzer-cluser-role-template.yaml b/cost-analyzer/templates/cost-analyzer-cluser-role-template.yaml
@@ -1,3 +1,20 @@
+{{- if and .Values.bugReporting .Values.bugReporting.logCollection -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: {{ .Release.Namespace }}
+  name: {{ template "cost-analyzer.fullname" . }}
+rules:
+- apiGroups: 
+    - ''
+  resources:
+    - "pods/log"
+  verbs:
+    - get
+    - list
+    - watch
+---
+{{- end }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/cost-analyzer/templates/cost-analyzer-cluster-role-binding-template.yaml b/cost-analyzer/templates/cost-analyzer-cluster-role-binding-template.yaml
@@ -1,3 +1,20 @@
+{{- if and .Values.bugReporting .Values.bugReporting.logCollection -}}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ template "cost-analyzer.fullname" . }}
+  labels:
+    {{ include "cost-analyzer.commonLabels" . | nindent 4 }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ template "cost-analyzer.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ template "cost-analyzer.fullname" . }}
+    namespace: {{ .Release.Namespace }}
+---
+{{- end }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml
@@ -140,6 +140,16 @@ spec:
                 configMapKeyRef:
                   name: {{ template "cost-analyzer.fullname" . }}
                   key: prometheus-server-endpoint
+            {{- if .Values.thanos }}
+            {{- if .Values.thanos.query }}
+            {{- if .Values.thanos.query.enabled }}
+            - name: THANOS_ENABLED
+              value: "true"
+            - name: THANOS_QUERY_URL
+              value: http://{{ .Release.Name }}-thanos-query-http.{{ .Release.Namespace }}:{{ .Values.thanos.query.http.port }}
+            {{- end }}
+            {{- end }}
+            {{- end }}
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: /var/configs/key.json
             - name: KUBECOST_TOKEN

diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml
@@ -229,9 +229,14 @@ networkCosts:
 
 turndown:
   enabled: false
-  image: gcr.io/kubecost1/kubecost-turndown:v2
+  image: gcr.io/kubecost1/kubecost-turndown:v3
   imagePullPolicy: Always
 
+# Kubecost bug report feature
+bugReporting:
+  # .Release.Namespace Logs Access
+  logCollection: true
+
 serviceMonitor:
   enabled: false
   additionalLabels: {}