|
7 | 7 | # machineset.sh |
8 | 8 | # OPTIONS |
9 | 9 | # -b Set 'windowsmachineconfig.openshift.io/ignore' label for BYOH use case. Default: false |
10 | | -# -w Windows Server version (optional) 2019 or 2022. Default: 2022 |
| 10 | +# -w Windows Server version (optional) 2022 or 2025. Default: 2022 |
11 | 11 | # $1/$2 (if -w is used) Action (optional) apply/delete the MachineSet |
12 | 12 | # PREREQUISITES |
13 | 13 | # oc to fetch cluster info and apply/delete MachineSets on the cluster(cluster should be logged in) |
@@ -87,9 +87,6 @@ get_aws_ms() { |
87 | 87 | # check Windows version and set AMI filter |
88 | 88 | filter="" |
89 | 89 | case "$winver" in |
90 | | - "2019") |
91 | | - filter="Windows_Server-2019-English-Core-Base-????.??.??" |
92 | | - ;; |
93 | 90 | "2025") |
94 | 91 | filter="Windows_Server-2025-English-Core-Base-????.??.??" |
95 | 92 | ;; |
@@ -167,11 +164,6 @@ get_azure_ms() { |
167 | 164 | local sku="" |
168 | 165 | local release="latest" |
169 | 166 | case "$winver" in |
170 | | - "2019") |
171 | | - sku="2019-datacenter-smalldisk" |
172 | | - # TODO: remove when VM SSH issue is patched in Azure cloud |
173 | | - release="17763.6293.240905" |
174 | | - ;; |
175 | 167 | "2025") |
176 | 168 | sku="2025-datacenter-smalldisk" |
177 | 169 | ;; |
@@ -239,9 +231,6 @@ get_gcp_ms() { |
239 | 231 | # check Windows version and set image family |
240 | 232 | local image="" |
241 | 233 | case "$winver" in |
242 | | - "2019") |
243 | | - image="projects/windows-cloud/global/images/family/windows-2019-core" |
244 | | - ;; |
245 | 234 | "2025") |
246 | 235 | image="projects/windows-cloud/global/images/family/windows-2025-core" |
247 | 236 | ;; |
@@ -306,9 +295,6 @@ get_vsphere_ms() { |
306 | 295 |
|
307 | 296 | # set golden image template name based on Windows Server version |
308 | 297 | case "$winver" in |
309 | | - "2019") |
310 | | - error-exit "No template available for Windows Server 2019 in DevQE vCenter" |
311 | | - ;; |
312 | 298 | "2025") |
313 | 299 | template="windows-golden-images/windows-server-2025-template-ipv6-disabled" |
314 | 300 | ;; |
@@ -430,18 +416,18 @@ winver="2022" |
430 | 416 | byoh=false |
431 | 417 | while getopts ":w:b" opt; do |
432 | 418 | case ${opt} in |
433 | | - w ) # Windows Server version to use in the MachineSet. Defaults to 2022. Other option is 2019. |
| 419 | + w ) # Windows Server version to use in the MachineSet. Defaults to 2022. Other option is 2025. |
434 | 420 | winver="$OPTARG" |
435 | | - if [[ ! "$winver" =~ 2019|2022|2025$ ]]; then |
436 | | - echo "Invalid -w option $winver. Valid options are 2019, 2022 or 2025" |
| 421 | + if [[ ! "$winver" =~ 2022|2025$ ]]; then |
| 422 | + echo "Invalid -w option $winver. Valid options are 2022 or 2025" |
437 | 423 | exit 1 |
438 | 424 | fi |
439 | 425 | ;; |
440 | 426 | b ) |
441 | 427 | byoh=true |
442 | 428 | ;; |
443 | 429 | \? ) |
444 | | - echo "Usage: $0 -w <2019/2022> -b apply/delete" |
| 430 | + echo "Usage: $0 -w <2022/2025> -b apply/delete" |
445 | 431 | exit 0 |
446 | 432 | ;; |
447 | 433 | esac |
|
0 commit comments