mirror of
https://github.com/kubernetes/node-problem-detector.git
synced 2026-08-23 22:26:27 +00:00
Merge pull request #1092 from johananl/flatcar
CodeQL / Analyze (go) (push) Failing after 1m39s
Scorecard supply-chain security / Scorecard analysis (push) Failing after 35s
CodeQL / Analyze (go) (push) Failing after 1m39s
Scorecard supply-chain security / Scorecard analysis (push) Failing after 35s
feat: Add support for Flatcar Container Linux
This commit is contained in:
@@ -70,6 +70,8 @@ func getOSVersion(osReleasePath string) (string, error) {
|
|||||||
return getDebianVersion(osReleaseMap), nil
|
return getDebianVersion(osReleaseMap), nil
|
||||||
case "azurelinux":
|
case "azurelinux":
|
||||||
return getDebianVersion(osReleaseMap), nil
|
return getDebianVersion(osReleaseMap), nil
|
||||||
|
case "flatcar":
|
||||||
|
return getDebianVersion(osReleaseMap), nil
|
||||||
default:
|
default:
|
||||||
return "", fmt.Errorf("Unsupported ID in /etc/os-release: %q", osReleaseMap["ID"])
|
return "", fmt.Errorf("Unsupported ID in /etc/os-release: %q", osReleaseMap["ID"])
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,6 +93,12 @@ func TestGetOSVersionLinux(t *testing.T) {
|
|||||||
expectedOSVersion: "azurelinux 3.0.20240328",
|
expectedOSVersion: "azurelinux 3.0.20240328",
|
||||||
expectErr: false,
|
expectErr: false,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "flatcar",
|
||||||
|
fakeOSReleasePath: "testdata/os-release-flatcar",
|
||||||
|
expectedOSVersion: "flatcar 4372.0.1",
|
||||||
|
expectErr: false,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "Unknown",
|
name: "Unknown",
|
||||||
fakeOSReleasePath: "testdata/os-release-unknown",
|
fakeOSReleasePath: "testdata/os-release-unknown",
|
||||||
|
|||||||
Vendored
+13
@@ -0,0 +1,13 @@
|
|||||||
|
NAME="Flatcar Container Linux by Kinvolk"
|
||||||
|
ID=flatcar
|
||||||
|
ID_LIKE=coreos
|
||||||
|
VERSION=4372.0.1
|
||||||
|
VERSION_ID=4372.0.1
|
||||||
|
BUILD_ID=2025-07-06-2244
|
||||||
|
SYSEXT_LEVEL=1.0
|
||||||
|
PRETTY_NAME="Flatcar Container Linux by Kinvolk 4372.0.1 (Oklo)"
|
||||||
|
ANSI_COLOR="38;5;75"
|
||||||
|
HOME_URL="https://flatcar.org/"
|
||||||
|
BUG_REPORT_URL="https://issues.flatcar.org"
|
||||||
|
FLATCAR_BOARD="amd64-usr"
|
||||||
|
CPE_NAME="cpe:2.3:o:flatcar-linux:flatcar_linux:4372.0.1:*:*:*:*:*:*:*"
|
||||||
Reference in New Issue
Block a user