Skip to content

Commit f0b72ff

Browse files
committed
Clarify or remove tables
Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>
1 parent 67d14d5 commit f0b72ff

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

Standards/scs-0104-v2-standard-images.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ For each image whose name matches the regular expression
4040

4141
ubuntu-capi-image( |-)v[0-9]\.[0-9]+(\.[0-9]+)?
4242

43-
the `image_source` MUST have the form
43+
the value of the property `image_source` MUST have the form
4444

4545
https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/...
4646

@@ -54,18 +54,29 @@ so long as they do not violate above regulations on image sources.
5454

5555
### Generic OS images
5656

57+
Each row of the following table describes an image that MUST or SHOULD exist,
58+
depending on the value in the column 'status'.
59+
5760
| status | os_distro | os_version | os_purpose |
5861
| --- | --- | --- | --- |
5962
| required | `ubuntu` | latest LTS, no later than April 30 | `generic` |
6063
| recommended | `ubuntu` | previous LTS | `generic` |
6164
| recommended | `debian` | latest stable, no later than one month after release | `generic` |
6265
| recommended | `debian` | previous stable | `generic` |
6366

67+
A generic OS image MAY be named in the form "distro version",
68+
without codename or build date; for instance,
69+
70+
- `Ubuntu 24.04`,
71+
- `Debian 13`.
72+
6473
Note: when a new LTS/stable version is released and the respective image added to the environment,
6574
the images of any previous versions may or may not be kept.
6675

6776
### Official SCS CAPI images
6877

69-
| status | name scheme |
70-
| --- | --- |
71-
| recommended | `ubuntu-capi-image-v[0-9]\.[0-9]+(\.[0-9]+)?` |
78+
An image whose name matches the regular expression
79+
80+
ubuntu-capi-image-v[0-9]\.[0-9]+(\.[0-9]+)?
81+
82+
SHOULD be present.

0 commit comments

Comments
 (0)