Skip to content

Commit 6278da3

Browse files
Be even less strict with OCI image index manifest annotations
This commit accepts undefined `annotations.cname` values while `append_layer()` is called. Signed-off-by: Tobias Wolf <[email protected]>
1 parent 7335580 commit 6278da3

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

.github/actions/features_parse/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ outputs:
1111
runs:
1212
using: composite
1313
steps:
14-
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].2
14+
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].3
1515
- id: result
1616
shell: bash
1717
run: |

.github/actions/flavors_parse/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ outputs:
1313
runs:
1414
using: composite
1515
steps:
16-
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].2
16+
- uses: gardenlinux/python-gardenlinux-lib/.github/actions/[email protected].3
1717
- id: matrix
1818
shell: bash
1919
run: |

.github/actions/setup/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Installs the given GardenLinux Python library
33
inputs:
44
version:
55
description: GardenLinux Python library version
6-
default: "0.7.2"
6+
default: "0.7.3"
77
runs:
88
using: composite
99
steps:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "gardenlinux"
3-
version = "0.7.2"
3+
version = "0.7.3"
44
description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames"
55
authors = ["Garden Linux Maintainers <[email protected]>"]
66
license = "Apache-2.0"

src/gardenlinux/oci/index.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ def append_manifest(self, manifest):
8484

8585
for existing_manifest in self["manifests"]:
8686
if "cname" not in existing_manifest.get("annotations", {}):
87-
raise RuntimeError(
88-
"Unexpected layer with missing annotation 'cname' found"
89-
)
87+
existing_manifest_index += 1
88+
continue
9089

9190
if cname == existing_manifest["annotations"]["cname"]:
9291
break

0 commit comments

Comments
 (0)