Skip to content

Commit 059890f

Browse files
Drop custom tigera operator patches
The Tigera operator expects the ImageSet specs to contain the original image names, not the custom ones. We'll drop our custom patches and update the integration tests accordingly.
1 parent 33f3dff commit 059890f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

tests/integration/test_calico.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,13 @@ def get_imageset_spec(operator_version, calico_version):
107107
sha256_digest = get_image_sha256_digest(rock.image)
108108
prefix = rock.image.split("/")[1]
109109

110+
# We're supposed to pass the original image names and new hashes.
111+
orig_image = image.replace("calico-tigera", "tigera/")
112+
orig_image = orig_image.replace("calico-", "calico/")
113+
110114
spec["spec"]["images"].append(
111115
{
112-
"image": f"{prefix}/{image}",
116+
"image": orig_image,
113117
"digest": sha256_digest,
114118
}
115119
)

tigera-operator/v1.34.0/rockcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ parts:
3838
- PACKAGE_NAME: github.com/tigera/operator
3939
override-build: |
4040
export EMAIL=root@localhost
41-
git am --ignore-whitespace $CRAFT_PROJECT_DIR/fix_image_component_handling.patch
41+
# git am --ignore-whitespace $CRAFT_PROJECT_DIR/fix_image_component_handling.patch
4242
git am --ignore-whitespace $CRAFT_PROJECT_DIR/fix_imageset_checks.patch
4343
4444
LDFLAGS="-X ${PACKAGE_NAME}/version.VERSION=${GIT_VERSION} -s -w"

0 commit comments

Comments
 (0)