Fix helm relase and set explicit name

outscale · Feb 16, 2024 · 96da9f2 · 96da9f2
1 parent 3ac50c9
commit 96da9f2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "osc-cost"
-version = "0.5.2"
+version = "0.5.3"
 edition = "2021"
 authors = ["OpenSource Team <[email protected]>"]
 license = "BSD-3-Clause"

diff --git a/helm/osccost/Chart.yaml b/helm/osccost/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.4.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.5.2"
+appVersion: "0.5.3"
diff --git a/helm/osccost/README.md b/helm/osccost/README.md
@@ -1,6 +1,6 @@
 # osccost
 
-![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.2](https://img.shields.io/badge/AppVersion-0.5.2-informational?style=flat-square)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.3](https://img.shields.io/badge/AppVersion-0.5.3-informational?style=flat-square)
 
 Exporter prometheus to allow Outscale users to estimate their cloud costs.
 
@@ -9,7 +9,7 @@ Exporter prometheus to allow Outscale users to estimate their cloud costs.
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | osccost.deployment.containers.image | string | `"outscale/osc-cost"` | Outscale provider image |
-| osccost.deployment.containers.imageTag | string | `"v0.5.0"` | Outscale provider image tag |
+| osccost.deployment.containers.imageTag | string | `"v0.5.3"` | Outscale provider image tag |
 | osccost.deployment.containers.osccostExtraParams | string | `""` |  |
 | osccost.deployment.containers.pullPolicy | string | `"Always"` | ImagePullPolcy to use (IfNotPresent, Never, Always) |
 | osccost.deployment.containers.resources.cpu.limits | string | `"600m"` | Container cpu limts |

diff --git a/helm/osccost/values.yaml b/helm/osccost/values.yaml
@@ -55,7 +55,7 @@ osccost:
     # -- Outscale provider image
       image: outscale/osc-cost
     # -- Outscale provider image tag
-      imageTag: "v0.5.2"
+      imageTag: "v0.5.3"
     # -- ImagePullPolcy to use (IfNotPresent, Never, Always)
       pullPolicy: Always
     # -- Additional securityContext to add

diff --git a/src/oapi/vms.rs b/src/oapi/vms.rs
@@ -419,12 +419,12 @@ impl VmSpecs {
     }
 
     fn parse_dedicated_instance_additional_prices(mut self, input: &Input) -> Option<VmSpecs> {
-        // dedicated_vm_additional is expressed as a per thousand (‰)
+        // factor_dedicated_vm_additional_cost_per_thousand is expressed as a per thousand (‰)
         // The doc is here https://docs.outscale.com/en/userguide/Getting-the-Price-of-Your-Resources.html but seems wrong, the good formula is: Instance_price + ((Instance_price x Additional_price * 1000 )/100
-        let dedicated_vm_additional =
+        let factor_dedicated_vm_additional_cost_per_thousand =
             input.catalog_entry("TinaOS-FCU", "DedicatedInstanceSurplus", "RunInstances")?;
         self.factor_vm_additional_cost = match self.tenancy.as_str() {
-            "dedicated" => 1.0 + (dedicated_vm_additional * 10.0),
+            "dedicated" => 1.0 + (factor_dedicated_vm_additional_cost_per_thousand * 10.0),
             "default" => 1.0,
             unkown_tenancy => {
                 error!(