Commit b4dcd13
committed
PRODENG-3471: fix Windows MCR install for FIPS channels
For FIPS channels (e.g. stable-29.2.1/fips) the Windows MCR installer
repo publishes versioned artifacts (docker-29.2.1+fips.zip) but does
NOT publish docker-latest+fips.zip. Launchpad was hardcoding
DOCKER_VERSION=latest, causing install.ps1 to construct a non-existent
URL and exit 1 on all Windows nodes. Linux nodes are unaffected.
Add windowsInstallerVersion(channel string) as a package-private helper
in pkg/configurer/windows.go, alongside the existing isExitCode3010
helper. Returns 'latest' for all non-FIPS channels (preserving current
behaviour) and extracts the version from the channel string for FIPS:
stable-29.2.1/fips → 29.2.1
test-29.4.1-rc3/fips → 29.4.1-rc3
stable-29.2 → latest (unchanged)
InstallMCR uses this instead of the hardcoded 'latest'.
Signed-off-by: James Nesbitt <jnesbitt@mirantis.com>1 parent c691642 commit b4dcd13
2 files changed
Lines changed: 52 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
| 63 | + | |
64 | 64 | | |
65 | 65 | | |
66 | 66 | | |
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
127 | 146 | | |
128 | 147 | | |
129 | 148 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
0 commit comments