fix(pvc): Get disk name from k8s labels instead #142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When comparing the output data from opencost and cloudcost exporter, one bit that didn't quite make sense was a mismatch in PVC's between the two. The total costs between the two was small enough to be insignificant, which only made things more confusing. After analyzing the metrics further, the biggest difference was the name of the disks. `cloudcost-exporter` was pulling the name directly from the disk metadata, which was prepending most pv's with `gke-$cluster`. The problem with this is that `kube-state-metrics` and other metrics only look at what k8s calls them. This change updates how name is sourced. 1. Loads the `disk.Description` into a map 2. Check for the existence of two labels 3. If either keys are found, return the value 4. Otherwise, fall back to `disk.Name` as a final resource
logyball
approved these changes
Apr 1, 2024
Comment on lines
+288
to
+295
| func coalesce(desc map[string]string, keys ...string) string { | ||
| for _, key := range keys { | ||
| if val, ok := desc[key]; ok { | ||
| return val | ||
| } | ||
| } | ||
| return "" | ||
| } |
There was a problem hiding this comment.
[NIT] - feels like this could go in the utils package, WDYT?
There was a problem hiding this comment.
Not until something else is using it 😉
pkg/google/gke/gke_test.go
Outdated
Comment on lines
574
to
584
| "Description not formatted as json should return an empty string": { | ||
| disk: &computev1.Disk{ | ||
| Description: "test", | ||
| }, | ||
| want: "", | ||
| }, | ||
| "Description not formatted as json should return the disks name": { | ||
| disk: &computev1.Disk{ | ||
| Description: "test", | ||
| }, | ||
| want: "", |
| }, | ||
| want: "", | ||
| }, | ||
| "Description formatted as json with multiple keys should return the name": { |
There was a problem hiding this comment.
Two random extra test cases:
Suggested change
| "Description formatted as json with multiple keys should return the name": { | |
| "Description formatted as json with one key should return the name": { | |
| disk: &computev1.Disk{ | |
| Description: `{"kubernetes.io-created-for/pv-name":"pvc-32613356-4cee-481d-902f-daa7223d14ab"}`, | |
| }, | |
| want: "pvc-32613356-4cee-481d-902f-daa7223d14ab", | |
| }, | |
| "Description formatted as json with multiple wrong keys should return empty string": { | |
| disk: &computev1.Disk{ | |
| Description: `{"kubernetes.io/created-for/pvc/name":"prometheus","kubernetes.io/created-for/pvc/namespace":"prometheus"}`, | |
| }, | |
| want: "", | |
| }, | |
| "Description formatted as json with multiple keys should return the name": { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When comparing the output data from opencost and cloudcost exporter, one bit that didn't quite make sense was a mismatch in PVC's between the two. The total costs between the two was small enough to be insignificant, which only made things more confusing.
After analyzing the metrics further, the biggest difference was the name of the disks.
cloudcost-exporterwas pulling the name directly from the disk metadata, which was prepending most pv's withgke-$cluster. The problem with this is thatkube-state-metricsand other metrics only look at what k8s calls them.This change updates how name is sourced.
disk.Descriptioninto a mapdisk.Nameas a final resource