Drop custom tigera operator patches (#3)

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.

We need to remove "calico-ctl" from the image spec as the Tigera
operator does not expect it and is going to throw an error.

While at it, we'll avoid using the "match" expression since it's
unsupported on 22.04.

tests/integration/test_calico.py

@@ -14,13 +14,11 @@
 
 def get_image_platform():
     arch = platform.machine()
-    match arch:
-        case "x86_64":
-            return "amd64"
-        case "aarch64":
-            return "arm64"
-        case _:
-            raise Exception(f"Unsupported cpu platform: {arch}")
+    if arch == "x86_64":
+        return "amd64"
+    elif arch == "aarch64":
+        return "arm64"
+    raise Exception(f"Unsupported cpu platform: {arch}")
 
 
 IMG_PLATFORM = get_image_platform()
@@ -45,7 +43,8 @@ def get_image_platform():
 def get_installation_spec(registry, repo):
     return f"""
 # This section includes base Calico installation configuration.
-# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
+# For more information, see:
+# https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
 apiVersion: operator.tigera.io/v1
 kind: Installation
 metadata:
@@ -92,7 +91,6 @@ def get_imageset_spec(operator_version, calico_version):
         "calico-kube-controllers",
         "calico-csi",
         "calico-apiserver",
-        "calico-ctl",
         "calico-pod2daemon-flexvol",
         "calico-key-cert-provisioner",
         "calico-node-driver-registrar",
@@ -105,11 +103,14 @@ def get_imageset_spec(operator_version, calico_version):
             image, version, IMG_PLATFORM
         )
         sha256_digest = get_image_sha256_digest(rock.image)
-        prefix = rock.image.split("/")[1]
+
+        # We're supposed to pass the original image names and new hashes.
+        orig_image = image.replace("calico-tigera-", "tigera/")
+        orig_image = orig_image.replace("calico-", "calico/")
 
         spec["spec"]["images"].append(
             {
-                "image": f"{prefix}/{image}",
+                "image": orig_image,
                 "digest": sha256_digest,
             }
         )

tests/sanity/test_calico.py

@@ -11,13 +11,11 @@
 
 def get_image_platform():
     arch = platform.machine()
-    match arch:
-        case "x86_64":
-            return "amd64"
-        case "aarch64":
-            return "arm64"
-        case _:
-            raise Exception(f"Unsupported cpu platform: {arch}")
+    if arch == "x86_64":
+        return "amd64"
+    elif arch == "aarch64":
+        return "arm64"
+    raise Exception(f"Unsupported cpu platform: {arch}")
 
 
 IMG_PLATFORM = get_image_platform()

tigera-operator/v1.34.0/rockcraft.yaml

@@ -38,8 +38,6 @@ parts:
       - PACKAGE_NAME: github.com/tigera/operator
     override-build: |
       export EMAIL=root@localhost
-      git am --ignore-whitespace $CRAFT_PROJECT_DIR/fix_image_component_handling.patch
-      git am --ignore-whitespace $CRAFT_PROJECT_DIR/fix_imageset_checks.patch
 
       LDFLAGS="-X ${PACKAGE_NAME}/version.VERSION=${GIT_VERSION} -s -w"