From 8771cdf1d76343e14ac08fbc320aaa28b6e9e768 Mon Sep 17 00:00:00 2001 From: Sean Holcomb Date: Thu, 11 Feb 2021 13:16:32 -0800 Subject: [PATCH 01/11] Template formating fixes --- .../templates/azure-storage-config-secret.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cost-analyzer/templates/azure-storage-config-secret.yaml b/cost-analyzer/templates/azure-storage-config-secret.yaml index a5e28ea9d..ae9e0a234 100644 --- a/cost-analyzer/templates/azure-storage-config-secret.yaml +++ b/cost-analyzer/templates/azure-storage-config-secret.yaml @@ -13,10 +13,10 @@ stringData: { "azureStorageAccount": "{{ .Values.kubecostProductConfigs.azureStorageAccount }}", "azureStorageAccessKey": "{{ .Values.kubecostProductConfigs.azureStorageAccessKey }}", - "azureStorageContainer": "{{ .Values.kubecostProductConfigs.azureStorageContainer }}", + "azureStorageContainer": "{{ .Values.kubecostProductConfigs.azureStorageContainer }}" } - {{- end -}} - {{- end -}} - {{- end -}} - {{- end -}} - {{- end -}} \ No newline at end of file +{{- end -}} +{{- end -}} +{{- end -}} +{{- end -}} +{{- end -}} \ No newline at end of file From 2899e2503e87a4c25178aa7ec48973d2fe955bfa Mon Sep 17 00:00:00 2001 From: Grace Do Date: Thu, 11 Feb 2021 15:50:44 -0800 Subject: [PATCH 02/11] Use unique names for psp templates --- cost-analyzer/templates/cost-analyzer-psp-role.template.yaml | 4 ++-- .../templates/cost-analyzer-psp-rolebinding.template.yaml | 4 ++-- cost-analyzer/templates/cost-analyzer-psp.template.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cost-analyzer/templates/cost-analyzer-psp-role.template.yaml b/cost-analyzer/templates/cost-analyzer-psp-role.template.yaml index f326b1f1c..95ca43ee8 100644 --- a/cost-analyzer/templates/cost-analyzer-psp-role.template.yaml +++ b/cost-analyzer/templates/cost-analyzer-psp-role.template.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: kubecost-cost-analyzer-psp + name: {{ template "cost-analyzer.fullname" . }}-psp annotations: {{- if .Values.podSecurityPolicy.annotations }} {{ toYaml .Values.podSecurityPolicy.annotations | indent 4 }} @@ -13,6 +13,6 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - kubecost-cost-analyzer-psp + - {{ template "cost-analyzer.fullname" . }}-psp {{- end }} {{- end }} diff --git a/cost-analyzer/templates/cost-analyzer-psp-rolebinding.template.yaml b/cost-analyzer/templates/cost-analyzer-psp-rolebinding.template.yaml index 8e1d925c5..1739f91b6 100644 --- a/cost-analyzer/templates/cost-analyzer-psp-rolebinding.template.yaml +++ b/cost-analyzer/templates/cost-analyzer-psp-rolebinding.template.yaml @@ -3,11 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: kubecost-cost-analyzer-psp + name: {{ template "cost-analyzer.fullname" . }}-psp roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: kubecost-cost-analyzer-psp + name: {{ template "cost-analyzer.fullname" . }}-psp subjects: - kind: ServiceAccount name: {{ template "cost-analyzer.serviceAccountName" . }} diff --git a/cost-analyzer/templates/cost-analyzer-psp.template.yaml b/cost-analyzer/templates/cost-analyzer-psp.template.yaml index 23ba4d2e5..68887771f 100644 --- a/cost-analyzer/templates/cost-analyzer-psp.template.yaml +++ b/cost-analyzer/templates/cost-analyzer-psp.template.yaml @@ -3,7 +3,7 @@ apiVersion: {{ include "cost-analyzer.podSecurityPolicy.apiVersion" . }} kind: PodSecurityPolicy metadata: - name: kubecost-cost-analyzer-psp + name: {{ template "cost-analyzer.fullname" . }}-psp spec: privileged: false seLinux: From d1a27f05938309362dda09683225d7f141ba0f24 Mon Sep 17 00:00:00 2001 From: Webb Brown <298359+dwbrown2@users.noreply.github.com> Date: Mon, 15 Feb 2021 06:08:05 -0800 Subject: [PATCH 03/11] Create LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From e3cb95f0e9ce811d4e8ed65195db7f6195d79494 Mon Sep 17 00:00:00 2001 From: Ajay Tripathy <4tripathy@gmail.com> Date: Tue, 16 Feb 2021 23:30:48 -0800 Subject: [PATCH 04/11] support additional labels in pod deployments --- cost-analyzer/templates/cost-analyzer-checks-template.yaml | 1 + .../templates/cost-analyzer-deployment-template.yaml | 1 + .../templates/cost-analyzer-network-costs-template.yaml | 1 + cost-analyzer/values.yaml | 5 +++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cost-analyzer/templates/cost-analyzer-checks-template.yaml b/cost-analyzer/templates/cost-analyzer-checks-template.yaml index 9f4875ea5..6fc8168e8 100644 --- a/cost-analyzer/templates/cost-analyzer-checks-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-checks-template.yaml @@ -6,6 +6,7 @@ metadata: name: cost-analyzer-checks labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }} + {{ toYaml .Values.kubecostChecks.additionalLabels | nindent 4 }} spec: {{- if .Values.kubecostChecks.debug }} schedule: "*/1 * * * *" diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index 4892bc3f7..7bbcfe5f1 100755 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -26,6 +26,7 @@ spec: metadata: labels: {{ include "cost-analyzer.selectorLabels" . | nindent 8 }} + {{ toYaml .Values.global.additionalLabels | nindent 8 }} {{- if .Values.kubecostDeployment }} {{- with .Values.kubecostDeployment.labels }} {{ toYaml . | indent 8 }} diff --git a/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml b/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml index 334e7d054..626a8dcef 100644 --- a/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-network-costs-template.yaml @@ -16,6 +16,7 @@ spec: metadata: labels: app: {{ template "cost-analyzer.networkCostsName" . }} + {{ toYaml .Values.networkCosts.additionalLabels | indent 8 }} spec: hostNetwork: true serviceAccountName: {{ template "cost-analyzer.serviceAccountName" . }} diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index c57c40bb5..d9af0b08b 100755 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -105,6 +105,7 @@ global: podAnnotations: {} # iam.amazonaws.com/role: role-arn + additionalLabels: {} pricingCsv: enabled: false @@ -158,7 +159,7 @@ kubecostChecks: limits: cpu: "100m" memory: "200Mi" - + additionalLabels: {} kubecostFrontend: image: "gcr.io/kubecost1/frontend" imagePullPolicy: Always @@ -462,7 +463,7 @@ networkCosts: podMonitor: enabled: false additionalLabels: {} - + additionalLabels: {} # Kubecost Deployment Configuration # Used for HA mode in Business & Enterprise tier kubecostDeployment: From e93e1285dc33cf251b11192c2300984780b05a66 Mon Sep 17 00:00:00 2001 From: Michael Dresser Date: Fri, 19 Feb 2021 10:02:29 -0500 Subject: [PATCH 05/11] Pass tolerations through to cost analyzer checks --- cost-analyzer/templates/cost-analyzer-checks-template.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-checks-template.yaml b/cost-analyzer/templates/cost-analyzer-checks-template.yaml index 9f4875ea5..63a118f5e 100644 --- a/cost-analyzer/templates/cost-analyzer-checks-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-checks-template.yaml @@ -61,6 +61,10 @@ spec: {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 12 }} {{- end }} restartPolicy: OnFailure securityContext: From ee47b367c7a31e189700b4b748dcc4ea5dfcd846 Mon Sep 17 00:00:00 2001 From: Ajay Tripathy <4tripathy@gmail.com> Date: Sun, 21 Feb 2021 14:12:12 -0800 Subject: [PATCH 06/11] disable legacy api option --- .../templates/cost-analyzer-deployment-template.yaml | 4 +++- cost-analyzer/values.yaml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index 9498bd4e2..5b206e7c1 100755 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -346,7 +346,7 @@ spec: secretKeyRef: name: {{ .Values.global.prometheus.queryServiceBasicAuthSecretName }} key: PASSWORD - {{- end }} + {{- end }} {{- if .Values.global.prometheus.queryServiceBearerTokenSecretName }} - name: DB_BEARER_TOKEN valueFrom: @@ -409,6 +409,8 @@ spec: value: "https://71964476292e4087af8d5072afe43abd@o394722.ingest.sentry.io/5245431" {{- end }} {{- end }} + - name: LEGACY_EXTERNAL_API_DISABLED + value: {{ (quote .Values.kubecostModel.legacyOutOfClusterAPIDisabled) | default (quote false) }} - name: OUT_OF_CLUSTER_PROM_METRICS_ENABLED value: {{ (quote .Values.kubecostModel.outOfClusterPromMetricsEnabled) | default (quote false) }} - name: CACHE_WARMING_ENABLED diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index bff2cec3d..498a45749 100755 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -183,6 +183,8 @@ kubecost: kubecostModel: image: "gcr.io/kubecost1/cost-model" imagePullPolicy: Always + # Disable the legacy out of cluster costs API. Set enabled for very large cost and usage reports to see cached data on reports.html + legacyOutOfClusterAPIDisabled: false # Enables the emission of the kubecost_cloud_credit_total and # kubecost_cloud_expense_total metrics outOfClusterPromMetricsEnabled: false From 27c7f74a539b9f621468c0ee05a573feec0d8a2d Mon Sep 17 00:00:00 2001 From: Ajay Tripathy <4tripathy@gmail.com> Date: Mon, 22 Feb 2021 15:42:31 -0800 Subject: [PATCH 07/11] remove comment and config so the option is hidden --- cost-analyzer/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/cost-analyzer/values.yaml b/cost-analyzer/values.yaml index 498a45749..bff2cec3d 100755 --- a/cost-analyzer/values.yaml +++ b/cost-analyzer/values.yaml @@ -183,8 +183,6 @@ kubecost: kubecostModel: image: "gcr.io/kubecost1/cost-model" imagePullPolicy: Always - # Disable the legacy out of cluster costs API. Set enabled for very large cost and usage reports to see cached data on reports.html - legacyOutOfClusterAPIDisabled: false # Enables the emission of the kubecost_cloud_credit_total and # kubecost_cloud_expense_total metrics outOfClusterPromMetricsEnabled: false From 512b32591accf79e4ec9da798a2ccb37f43d38b7 Mon Sep 17 00:00:00 2001 From: Sean Holcomb Date: Mon, 22 Feb 2021 15:49:44 -0800 Subject: [PATCH 08/11] change azure storage config file path --- cost-analyzer/templates/cost-analyzer-deployment-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index 9498bd4e2..e0329f358 100755 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -256,7 +256,7 @@ spec: {{- end }} {{- if .Values.kubecostProductConfigs.azureStorageSecretName }} - name: azure-storage-config - mountPath: /var/secrets + mountPath: /var/azure-storage-config {{- end }} {{- if or .Values.kubecostProductConfigs.serviceKeySecretName .Values.kubecostProductConfigs.createServiceKeySecret }} - name: service-key-secret From cc8b8f4c5a6d0f6e1036ec4604cae06ce10c664f Mon Sep 17 00:00:00 2001 From: Ajay Tripathy <4tripathy@gmail.com> Date: Mon, 22 Feb 2021 17:55:37 -0800 Subject: [PATCH 09/11] fix additional labels" --- cost-analyzer/templates/cost-analyzer-checks-template.yaml | 2 ++ cost-analyzer/templates/cost-analyzer-deployment-template.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cost-analyzer/templates/cost-analyzer-checks-template.yaml b/cost-analyzer/templates/cost-analyzer-checks-template.yaml index 8f3747c01..028f06623 100644 --- a/cost-analyzer/templates/cost-analyzer-checks-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-checks-template.yaml @@ -6,7 +6,9 @@ metadata: name: cost-analyzer-checks labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }} + {{- if .Values.global.podAnnotations}} {{ toYaml .Values.kubecostChecks.additionalLabels | nindent 4 }} + {{- end }} spec: {{- if .Values.kubecostChecks.debug }} schedule: "*/1 * * * *" diff --git a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml index 88c978545..9024ea1f7 100755 --- a/cost-analyzer/templates/cost-analyzer-deployment-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-deployment-template.yaml @@ -26,7 +26,9 @@ spec: metadata: labels: {{ include "cost-analyzer.selectorLabels" . | nindent 8 }} + {{- if .Values.global.additionalLabels }} {{ toYaml .Values.global.additionalLabels | nindent 8 }} + {{- end }} {{- if .Values.kubecostDeployment }} {{- with .Values.kubecostDeployment.labels }} {{ toYaml . | indent 8 }} From 2247f1ddbc3079b19e3012f311a9884bcd37db34 Mon Sep 17 00:00:00 2001 From: Ajay Tripathy <4tripathy@gmail.com> Date: Mon, 22 Feb 2021 18:01:54 -0800 Subject: [PATCH 10/11] fix check --- cost-analyzer/templates/cost-analyzer-checks-template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cost-analyzer/templates/cost-analyzer-checks-template.yaml b/cost-analyzer/templates/cost-analyzer-checks-template.yaml index 028f06623..490764124 100644 --- a/cost-analyzer/templates/cost-analyzer-checks-template.yaml +++ b/cost-analyzer/templates/cost-analyzer-checks-template.yaml @@ -6,7 +6,7 @@ metadata: name: cost-analyzer-checks labels: {{ include "cost-analyzer.commonLabels" . | nindent 4 }} - {{- if .Values.global.podAnnotations}} + {{- if .Values.kubecostChecks.additionalLabels }} {{ toYaml .Values.kubecostChecks.additionalLabels | nindent 4 }} {{- end }} spec: From 06c542ad319d83c957d650335839f447f53e02e3 Mon Sep 17 00:00:00 2001 From: Ajay Tripathy Date: Tue, 23 Feb 2021 12:29:59 -0800 Subject: [PATCH 11/11] Update Chart.yaml --- cost-analyzer/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cost-analyzer/Chart.yaml b/cost-analyzer/Chart.yaml index 9302b1ffd..b5b1d860d 100755 --- a/cost-analyzer/Chart.yaml +++ b/cost-analyzer/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: "1.74.0" +appVersion: "1.75.0" description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor cloud costs. name: cost-analyzer -version: 1.74.0 +version: 1.75.0