Skip to content
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

Jump to bottom

Flatcar Support for GCE #1739

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Flatcar Support for GCE #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b65b8
Flatcar Support for GCE
ahmedwaleedmalik Nov 29, 2023
c491cdc
Update compatibility matrix
ahmedwaleedmalik Nov 29, 2023
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
2 changes: 1 addition & 1 deletion docs/operating-system.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
| Azure | ✓ | ✓ | ✓ | ✓ | x | ✓ |
| Digitalocean | ✓ | ✓ | x | x | x | ✓ |
| Equinix Metal | ✓ | ✓ | ✓ | x | x | ✓ |
| Google Cloud Platform | ✓ | x | x | x | x | x |
| Google Cloud Platform | ✓ | x | ✓ | x | x | x |
| Hetzner | ✓ | x | x | x | x | ✓ |
| KubeVirt | ✓ | ✓ | ✓ | ✓ | x | ✓ |
| Nutanix | ✓ | ✓ | x | x | x | x |
Expand Down
6 changes: 4 additions & 2 deletions pkg/cloudprovider/provider/gce/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ const (

// imageProjects maps the OS to the Google Cloud image projects.
var imageProjects = map[providerconfigtypes.OperatingSystem]string{
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-os-cloud",
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-os-cloud",
providerconfigtypes.OperatingSystemFlatcar: "kinvolk-public",
}

// imageFamilies maps the OS to the Google Cloud image projects.
var imageFamilies = map[providerconfigtypes.OperatingSystem]string{
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2204-lts",
providerconfigtypes.OperatingSystemUbuntu: "ubuntu-2204-lts",
providerconfigtypes.OperatingSystemFlatcar: "flatcar-stable",
}

// diskTypes are the disk types of the Google Cloud. Map is used for
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/provisioning/all_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ func TestGCEProvisioningE2E(t *testing.T) {
}

// Act. GCE does not support CentOS.
selector := OsSelector("ubuntu")
selector := OsSelector("ubuntu", "flatcar")
params := []string{
fmt.Sprintf("<< GOOGLE_SERVICE_ACCOUNT_BASE64 >>=%s", safeBase64Encoding(googleServiceAccount)),
}
Expand Down