Skip to content

Commit 486d7a6

Browse files
authored
Revert "Re-apply [ACIX-1036] Update AMIs" (#1783)
1 parent 232a395 commit 486d7a6

File tree

1 file changed

+68
-69
lines changed

1 file changed

+68
-69
lines changed

resources/aws/platforms.go

Lines changed: 68 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -14,126 +14,125 @@ type PlatformsArchsType = map[string]PlatformsAMIsType
1414
type PlatformsType = map[string]PlatformsArchsType
1515

1616
// All the OS descriptors / AMIs correspondance
17-
// NOTE: Please read this documentation to update these AMIs: https://datadoghq.atlassian.net/wiki/x/04B8TgE
1817
var platforms = PlatformsType{
18+
"debian": PlatformsArchsType{
19+
"x86_64": PlatformsAMIsType{
20+
"9": "ami-0182559468c1975fe",
21+
"10": "ami-0ea3c9b1a2bcdabfc",
22+
"11": "ami-03039e227b7b461b5",
23+
"12": "ami-0eef9d92ec044bc94",
24+
},
25+
"arm64": PlatformsAMIsType{
26+
"10": "ami-0497a51e798361d65",
27+
"11": "ami-05f3f532b93bba0b3",
28+
"12": "ami-0f6dec0dab168c2f5",
29+
},
30+
},
31+
"ubuntu": PlatformsArchsType{
32+
"x86_64": PlatformsAMIsType{
33+
"14-04": "ami-013d633d3b6cdb22c",
34+
"16-04": "ami-0b0ea68c435eb488d",
35+
"18-04": "ami-055744c75048d8296",
36+
"20-04": "ami-0fb0b230890ccd1e6",
37+
"22-04": "ami-090c309e8ced8ecc2",
38+
"23-04": "ami-0bf964046a441a4ee",
39+
"23-10": "ami-0949b45ef274e55a1",
40+
"24-04": "ami-0360c520857e3138f",
41+
},
42+
"arm64": PlatformsAMIsType{
43+
"18-04": "ami-0fea31578248bcd6c",
44+
"20-04": "ami-0c7114fa3eac14de1",
45+
"20-04-2": "ami-023f1e40b096c3ebc",
46+
"21-04": "ami-044f0ceee8e885e87",
47+
"22-04": "ami-09059bc76ad3db67f",
48+
"23-04": "ami-09b2701695676705d",
49+
"23-10": "ami-0dea732dd5f1da0a8",
50+
"24-04": "ami-026fccd88446aa0bf",
51+
},
52+
},
1953
"amazon-linux": PlatformsArchsType{
2054
"x86_64": PlatformsAMIsType{
2155
"2-4-14": "ami-038b3df3312ddf25d",
2256
"2-5-10": "ami-06a0cd9728546d178",
23-
"2": "ami-09f3869f369570aea",
2457
"2022-5-15": "ami-0f0f00c2d082c52ae",
25-
"2023": "ami-0f4a4fa5d1c6e0704",
26-
"2018": "ami-0cabc8cbc2098cbb8",
58+
"2023": "ami-00ca32bbc84273381",
59+
"2018": "ami-07541a4f680f1ba8e",
60+
"2": "ami-0023921b4fcd5382b",
2761
},
2862
"arm64": PlatformsAMIsType{
2963
"2-4-14": "ami-090230ed0c6b13c74",
3064
"2-5-10": "ami-09e51988f56677f44",
31-
"2": "ami-032ef643b17e7d307",
3265
"2022-5-15": "ami-0acc51c3357f26240",
33-
"2023": "ami-0505d2a2a44257d17",
66+
"2023": "ami-0aa7db6294d00216f",
67+
"2": "ami-00aae26e31bb072a2",
3468
},
3569
},
3670
"amazon-linux-ecs": PlatformsArchsType{
3771
"x86_64": PlatformsAMIsType{
38-
"2023": "ami-0307e11f511d976b0",
39-
"2": "ami-00ca58aa4e961c973",
72+
"2023": "ami-0986768eff12aa2b9",
73+
"2": "ami-0293ff221e87260aa",
4074
},
4175
"arm64": PlatformsAMIsType{
42-
"2023": "ami-0729b1e535f19c7b8",
43-
"2": "ami-0033bec731b87c602",
76+
"2023": "ami-032a0cd402947954b",
77+
"2": "ami-07af7b838076acdcc",
4478
},
4579
},
46-
"debian": PlatformsArchsType{
80+
"redhat": PlatformsArchsType{
4781
"x86_64": PlatformsAMIsType{
48-
"9": "ami-0182559468c1975fe",
49-
"10": "ami-0c0131c7dd91f82ea",
50-
"11": "ami-0136ba2af1041319b",
51-
"12": "ami-03b080214eb370bf2",
82+
"9": "ami-0c878dd49ca800252",
83+
"86": "ami-031eff1ae75bb87e4",
84+
"86-fips": "ami-0d0fb96b595c56e03",
5285
},
5386
"arm64": PlatformsAMIsType{
54-
"10": "ami-054d2bc47c1082594",
55-
"11": "ami-089492faff470d87d",
56-
"12": "ami-07e7ff4fc4bfb342e",
87+
"9": "ami-089b86d2f4d27cd98",
88+
"86": "ami-0238411fb452f8275",
5789
},
5890
},
59-
"centos": PlatformsArchsType{
91+
"suse": PlatformsArchsType{
6092
"x86_64": PlatformsAMIsType{
61-
"610": "ami-0506f01ccb6dddeda",
62-
"79": "ami-036de472bb001ae9c",
93+
"12": "ami-0b0597153739840c4",
94+
"15-4": "ami-067dfda331f8296b0",
6395
},
6496
"arm64": PlatformsAMIsType{
65-
"79": "ami-0cb7a00afccf30559",
97+
"15-4": "ami-08350d1d1649d8c05",
6698
},
6799
},
68100
"fedora": PlatformsArchsType{
69101
"x86_64": PlatformsAMIsType{
70-
"40": "ami-0fac75d0443e36a79",
102+
"40": "ami-004f552bba0e5f64f",
71103
},
72104
"arm64": PlatformsAMIsType{
73-
"42": "ami-0b2d98d9724ad62c3",
105+
"42": "ami-0184eee8cd4a6080b",
74106
},
75107
},
76-
"macos": PlatformsArchsType{
77-
"x86_64": PlatformsAMIsType{
78-
"sonoma": "ami-023abfbd427744a75",
79-
},
80-
"arm64": PlatformsAMIsType{
81-
"sonoma": "ami-0e76a72aa5d6effe8",
82-
},
83-
},
84-
"redhat": PlatformsArchsType{
108+
"centos": PlatformsArchsType{
85109
"x86_64": PlatformsAMIsType{
86-
"86": "ami-00064b50696aa0436",
87-
"86-fips": "ami-0d0fb96b595c56e03",
88-
"9": "ami-028e9c68b36a04979",
110+
"610": "ami-0506f01ccb6dddeda",
111+
"79": "ami-036de472bb001ae9c",
89112
},
90113
"arm64": PlatformsAMIsType{
91-
"86": "ami-0d4438fbccc652f68",
92-
"9": "ami-02a1ba80018705af3",
114+
"79": "ami-0cb7a00afccf30559",
93115
},
94116
},
95117
"rocky-linux": PlatformsArchsType{
96118
"x86_64": PlatformsAMIsType{
97119
"92": "ami-08f362c39d03a4eb5",
98120
},
99121
},
100-
"suse": PlatformsArchsType{
122+
"windows-server": PlatformsArchsType{
101123
"x86_64": PlatformsAMIsType{
102-
"12": "ami-095d0932653cdb09b",
103-
"15-4": "ami-025731bf74aa12ed6",
104-
},
105-
"arm64": PlatformsAMIsType{
106-
"15-4": "ami-0fee86fe165a4b4c3",
124+
"2025": "ami-0efee5160a1079475",
125+
"2022": "ami-028dc1123403bd543",
126+
"2019": "ami-043cf96255cd85b98",
127+
"2016": "ami-0fe657c1315199148",
107128
},
108129
},
109-
"ubuntu": PlatformsArchsType{
110-
"x86_64": PlatformsAMIsType{
111-
"14-04": "ami-013d633d3b6cdb22c",
112-
"16-04": "ami-0dd82fcb5978fb075",
113-
"18-04": "ami-081753330aeb8a334",
114-
"20-04": "ami-0f22bf0f32cb71fb0",
115-
"22-04": "ami-031d84b460f190047",
116-
"23-04": "ami-04909211b4197c028",
117-
"23-10": "ami-0949b45ef274e55a1",
118-
"24-04": "ami-07458119f8579729d",
119-
},
130+
"macos": PlatformsArchsType{
120131
"arm64": PlatformsAMIsType{
121-
"18-04": "ami-055744c75048d8296",
122-
"20-04": "ami-062505f473642c789",
123-
"20-04-2": "ami-023f1e40b096c3ebc",
124-
"21-04": "ami-0aa5218db2b0ff1d9",
125-
"22-04": "ami-02490af8f731890a0",
126-
"23-04": "ami-0820bcaf37ee46ff4",
127-
"23-10": "ami-0dea732dd5f1da0a8",
128-
"24-04": "ami-08a72149658f1eeea",
132+
"sonoma": "ami-0c582a76ed8159789",
129133
},
130-
},
131-
"windows-server": PlatformsArchsType{
132134
"x86_64": PlatformsAMIsType{
133-
"2016": "ami-067445cefec7d6dc2",
134-
"2019": "ami-099d25416e4c6b6d0",
135-
"2022": "ami-0a1d318bc20fe9080",
136-
"2025": "ami-0a9e84d3e59a24b71",
135+
"sonoma": "ami-0af4746d79fd670cd",
137136
},
138137
},
139138
}

0 commit comments

Comments
 (0)