Skip to content

Add handling of new GCP families c4d, m4 and a4 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
selvik merged 3 commits into from
Aug 25, 2025
Merged

Add handling of new GCP families c4d, m4 and a4 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23d98fb
Include handling of families c4d and m4 for GCP
selvik Aug 24, 2025
fcedc6c
Include family a4 in GCP
selvik Aug 25, 2025
aa95a66
Update github workflow action from v2 to v3
selvik Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:

- name: Cache Go module dependencies
id: cache-go-module-dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: go-mod-cache-${{ runner.os }}-${{ env.GO_VERSION }}-${{ hashFiles('go.sum') }}
Expand All @@ -44,7 +44,7 @@ jobs:

- name: Cache licenses
id: cache-licenses
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: .licensei.cache
key: licensei-v1-${{ steps.set-git-refname.outputs.git_refname }}-${{ hashFiles('go.sum') }}
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Cache Go module dependencies
id: cache-go-module-dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: go-mod-cache-${{ runner.os }}-${{ env.GO_VERSION }}-${{ hashFiles('go.sum') }}
Expand All @@ -116,7 +116,7 @@ jobs:

- name: Restore Go module dependencies cache
id: cache-go-module-dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: go-mod-cache-${{ runner.os }}-${{ env.GO_VERSION }}-${{ hashFiles('go.sum') }}
Expand All @@ -143,7 +143,7 @@ jobs:

- name: Restore Go module dependencies cache
id: cache-go-module-dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: go-mod-cache-${{ runner.os }}-${{ env.GO_VERSION }}-${{ hashFiles('go.sum') }}
Expand Down
23 changes: 12 additions & 11 deletions internal/cloudinfo/providers/google/cloudinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ import (
const svcGke = "gke"

var regionNames = map[string]string{
"asia-east1": "Asia Pacific (Taiwan)",
"asia-east2": "Asia Pacific (Hong Kong)",
"asia-northeast1": "Asia Pacific (Tokyo)",
"asia-northeast2": "Asia Pacific (Osaka)",
"asia-northeast3": "Asia Pacific (Seoul)",
"asia-south1": "Asia Pacific (Mumbai)",
"asia-south2": "Asia Pacific (Delhi)",
"asia-southeast1": "Asia Pacific (Singapore)",
"asia-southeast2": "Asia Pacific (Jakarta)",
"asia-east1": "Asia Pacific (Taiwan)",
"asia-east2": "Asia Pacific (Hong Kong)",
"asia-northeast1": "Asia Pacific (Tokyo)",
"asia-northeast2": "Asia Pacific (Osaka)",
"asia-northeast3": "Asia Pacific (Seoul)",
"asia-south1": "Asia Pacific (Mumbai)",
"asia-south2": "Asia Pacific (Delhi)",
"asia-southeast1": "Asia Pacific (Singapore)",
"asia-southeast2": "Asia Pacific (Jakarta)",

"australia-southeast1": "Asia Pacific (Sydney)",
"australia-southeast2": "Asia Pacific (Melbourne)",
Expand Down Expand Up @@ -257,7 +257,8 @@ func (g *GceInfoer) Initialize() (map[string]map[string]types.Price, error) {
func isSupportedFamily(family string) bool {
return family == "a2" || family == "a3" || family == "c3" || family == "c3d" || family == "c4" ||
family == "e2" || family == "g2" || family == "h3" || family == "n2" || family == "n4" || family == "m3" ||
family == "c4a" || family == "t2a" || family == "n2d" || family == "c2d" || family == "t2d" || family == "z3"
family == "c4a" || family == "t2a" || family == "n2d" || family == "c2d" || family == "t2d" || family == "z3" ||
family == "c4d" || family == "m4" || family == "a4"
}

func (g *GceInfoer) getPrice() (map[string]map[string]map[string]float64, error) {
Expand Down Expand Up @@ -331,7 +332,7 @@ func (g *GceInfoer) getPrice() (map[string]map[string]map[string]float64, error)
}
resMatch := (descSplit[1] == "Instance" && (descSplit[2] == "Ram" || descSplit[2] == "Core")) ||
(descSplit[2] == "Instance" && (descSplit[3] == "Ram" || descSplit[3] == "Core") &&
(descSplit[1] == "Memory-optimized" || descSplit[1] == "Arm" || descSplit[1] == "AMD"))
(descSplit[1] == "Memory-optimized" || descSplit[1] == "Arm" || descSplit[1] == "AMD"))
if !resMatch {
continue
}
Expand Down
Loading