Skip to content

Commit

Permalink
Merge pull request kubecost#826 from kubecost/master
Browse files Browse the repository at this point in the history
Merge master into develop
  • Loading branch information
AjayTripathy authored Mar 22, 2021
2 parents eef6c48 + 7418fe4 commit f2a1cb8
Show file tree
Hide file tree
Showing 6 changed files with 77,925 additions and 421 deletions.
9 changes: 8 additions & 1 deletion cost-analyzer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ global:
# iam.amazonaws.com/role: role-arn
additionalLabels: {}

# generated at http://kubecost.com/install, used for alerts tracking and free trials
kubecostToken: # ""

# Advanced pipeline for custom prices, enterprise key required
pricingCsv:
enabled: false
location:
Expand All @@ -115,7 +119,9 @@ pricingCsv:
URI: s3://kc-csv-test/pricing_schema.csv # a valid file URI
csvAccessCredentials: pricing-schema-access-secret

saml: # enterprise key required to use
# SAML integration for user management and RBAC, enterprise key required
# Ref: https://github.com/kubecost/docs/blob/master/user-management.md
saml:
enabled: false
secretName: "kubecost-authzero"
#metadataSecretName: "kubecost-authzero-metadata" # One of metadataSecretName or idpMetadataURL must be set. defaults to metadataURL if set
Expand Down Expand Up @@ -149,6 +155,7 @@ systemProxy:
# imagePullSecrets:
# - name: "image-pull-secret"

# Manages Kubecost alerts
kubecostChecks:
enabled: true
image: "quay.io/kubecost1/checks"
Expand Down
Loading

0 comments on commit f2a1cb8

Please sign in to comment.