Update build workflow (#107)

sieve-project · Feb 21, 2023 · 8e3fe64 · 8e3fe64
1 parent 6b8b3ee
commit 8e3fe64
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/kind-image-build.yml b/.github/workflows/kind-image-build.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.15
+          go-version: 1.19
       - name: Setup Python
         uses: actions/setup-python@v2.2.2
         with:
@@ -26,8 +26,18 @@ jobs:
         run: |
           pip install kubernetes
           pip install pyyaml
-      - name: Build Image
+      - name: Build Image for v1.18
         run: |
           python3 build.py -m vanilla -p -r $IMAGE_NAMESPACE
           python3 build.py -m learn -p -r $IMAGE_NAMESPACE
           python3 build.py -m test -p -r $IMAGE_NAMESPACE
+      - name: Build Image for v1.23
+        run: |
+          python3 build.py -v v1.23.16 -m vanilla -p -r $IMAGE_NAMESPACE
+          python3 build.py -v v1.23.16 -m learn -p -r $IMAGE_NAMESPACE
+          python3 build.py -v v1.23.16 -m test -p -r $IMAGE_NAMESPACE
+      - name: Build Image for v1.24
+        run: |
+          python3 build.py -v v1.24.10 -m vanilla -p -r $IMAGE_NAMESPACE
+          python3 build.py -v v1.24.10 -m learn -p -r $IMAGE_NAMESPACE
+          python3 build.py -v v1.24.10 -m test -p -r $IMAGE_NAMESPACE
diff --git a/build.py b/build.py
@@ -21,7 +21,13 @@
 GOPATH = os.environ["GOPATH"]
 
 DEFAULT_K8S_VERSION = "v1.18.9"
-K8S_VER_TO_APIMACHINERY_VER = {"v1.18.9": "v0.18.9", "v1.23.1": "v0.23.1"}
+
+# TODO: it is a bit ad-hoc to decide the compatible apimachinery version
+def k8s_version_to_apimachinery_version(k8s_version):
+    apimachinery_version = "v0" + k8s_version[2:]
+    print(
+        "Use the apimachinery version {} in sieve client".format(apimachinery_version)
+    )
 
 
 def update_sieve_client_go_mod_with_version(go_mod_path, version):
@@ -62,7 +68,7 @@ def install_lib_for_kubernetes(version):
     if version != DEFAULT_K8S_VERSION:
         update_sieve_client_go_mod_with_version(
             "fakegopath/src/k8s.io/kubernetes/staging/src/sieve.client/go.mod",
-            K8S_VER_TO_APIMACHINERY_VER[version],
+            k8s_version_to_apimachinery_version(version),
         )
     os.symlink(
         "../staging/src/sieve.client",
@@ -176,7 +182,7 @@ def install_lib_for_controller(
     if controller_config.kubernetes_version != DEFAULT_K8S_VERSION:
         update_sieve_client_go_mod_with_version(
             os.path.join(sieve_dep_src_dir, "sieve.client", "go.mod"),
-            K8S_VER_TO_APIMACHINERY_VER[controller_config.kubernetes_version],
+            k8s_version_to_apimachinery_version(controller_config.kubernetes_version),
         )
     elif controller_config.apimachinery_version is not None:
         update_sieve_client_go_mod_with_version(
@@ -291,7 +297,7 @@ def install_lib_for_controller_with_vendor(
             os.path.join(
                 application_dir, controller_config.vendored_sieve_client_path, "go.mod"
             ),
-            K8S_VER_TO_APIMACHINERY_VER[controller_config.kubernetes_version],
+            k8s_version_to_apimachinery_version(controller_config.kubernetes_version),
         )
     elif controller_config.apimachinery_version is not None:
         update_sieve_client_go_mod_with_version(