Explorar o código

Merge branch 'develop' into kubecost-test-errs

Cliff Colvin %!s(int64=2) %!d(string=hai) anos
pai
achega
b41504b034
Modificáronse 3 ficheiros con 4 adicións e 4 borrados
  1. 2 2
      kubernetes/opencost.yaml
  2. 1 1
      ui/src/cloudCost/tokens.js
  3. 1 1
      ui/src/components/Header.js

+ 2 - 2
kubernetes/opencost.yaml

@@ -142,7 +142,7 @@ spec:
       restartPolicy: Always
       restartPolicy: Always
       serviceAccountName: opencost
       serviceAccountName: opencost
       containers:
       containers:
-        - image: quay.io/kubecost1/kubecost-cost-model:latest
+        - image: gcr.io/kubecost1/opencost
           name: opencost
           name: opencost
           resources:
           resources:
             requests:
             requests:
@@ -167,7 +167,7 @@ spec:
             privileged: false
             privileged: false
             readOnlyRootFilesystem: true
             readOnlyRootFilesystem: true
             runAsUser: 1001
             runAsUser: 1001
-        - image: quay.io/kubecost1/opencost-ui:latest
+        - image: gcr.io/kubecost1/opencost-ui
           name: opencost-ui
           name: opencost-ui
           resources:
           resources:
             requests:
             requests:

+ 1 - 1
ui/src/cloudCost/tokens.js

@@ -19,7 +19,7 @@ const aggregationOptions = [
   { name: "Provider", value: "provider" },
   { name: "Provider", value: "provider" },
   { name: "Service ", value: "service" },
   { name: "Service ", value: "service" },
   { name: "Category", value: "category" },
   { name: "Category", value: "category" },
-  { name: "item", value: "item" },
+  { name: "Item", value: "item" },
 ];
 ];
 
 
 const costMetricOptions = [
 const costMetricOptions = [

+ 1 - 1
ui/src/components/Header.js

@@ -26,7 +26,7 @@ const Header = (props) => {
   const { title, breadcrumbs } = props;
   const { title, breadcrumbs } = props;
   const { pathname } = useLocation();
   const { pathname } = useLocation();
 
 
-  const headerTitle = pathname === "/cloud" ? "Cloud Cost" : "Cost Allocation";
+  const headerTitle = pathname === "/cloud" ? "Cloud Costs" : "Cost Allocation";
 
 
   return (
   return (
     <div className={classes.root}>
     <div className={classes.root}>