From 8dc9109ab1ae6458d187b83dff3bb3522a06eb67 Mon Sep 17 00:00:00 2001 From: Sunyanan Choochotkaew Date: Thu, 13 Feb 2025 10:20:15 +0900 Subject: [PATCH 1/3] chore: build on main and test all pr Signed-off-by: Sunyanan Choochotkaew --- .github/workflows/build_push_concheck.yaml | 2 +- .github/workflows/build_push_controller.yaml | 2 +- .github/workflows/build_push_daemon.yaml | 2 +- .github/workflows/daemon_unittest.yaml | 3 --- .github/workflows/integration_test.yaml | 3 --- .github/workflows/unittest.yaml | 3 --- 6 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_push_concheck.yaml b/.github/workflows/build_push_concheck.yaml index cba73d5..27dc6b5 100644 --- a/.github/workflows/build_push_concheck.yaml +++ b/.github/workflows/build_push_concheck.yaml @@ -3,7 +3,7 @@ name: Build and push connection check image on: push: branches: - - v1.2.5 + - main paths: - connection-check/** diff --git a/.github/workflows/build_push_controller.yaml b/.github/workflows/build_push_controller.yaml index 0664df7..00847dd 100644 --- a/.github/workflows/build_push_controller.yaml +++ b/.github/workflows/build_push_controller.yaml @@ -3,7 +3,7 @@ name: Build and push controller and its bundle image on: push: branches: - - v1.2.5 + - main paths: - controllers/** - compute/** diff --git a/.github/workflows/build_push_daemon.yaml b/.github/workflows/build_push_daemon.yaml index e72edbb..c1f7d62 100644 --- a/.github/workflows/build_push_daemon.yaml +++ b/.github/workflows/build_push_daemon.yaml @@ -3,7 +3,7 @@ name: Build and push daemon image on: push: branches: - - v1.2.5 + - main paths: - daemon/** - cni/** diff --git a/.github/workflows/daemon_unittest.yaml b/.github/workflows/daemon_unittest.yaml index 69e279e..bc2c118 100644 --- a/.github/workflows/daemon_unittest.yaml +++ b/.github/workflows/daemon_unittest.yaml @@ -2,9 +2,6 @@ name: Perform unittest for daemon on: pull_request: - branches: - - v1.2.5 - - main push: paths: - daemon/** diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 01f52da..2b6a459 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -2,9 +2,6 @@ name: e2e test on: pull_request: - branches: - - v1.2.5 - - main push: paths: - controllers/** diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml index 2698f6f..346e020 100644 --- a/.github/workflows/unittest.yaml +++ b/.github/workflows/unittest.yaml @@ -2,9 +2,6 @@ name: Perform unittest for controller on: pull_request: - branches: - - v1.2.5 - - main push: paths: - controllers/** From 31077b3f302a962c1bea4c9bd41f20968ff00495 Mon Sep 17 00:00:00 2001 From: Sunyanan Choochotkaew Date: Thu, 13 Feb 2025 10:21:30 +0900 Subject: [PATCH 2/3] chore: set v1.2.6 Signed-off-by: Sunyanan Choochotkaew --- .github/workflows/build_push_concheck.yaml | 2 +- .github/workflows/build_push_controller.yaml | 2 +- .github/workflows/build_push_daemon.yaml | 2 +- Makefile | 2 +- README.md | 2 +- config/manager/kustomization.yaml | 2 +- config/samples/config.yaml | 2 +- config/samples/kustomization.yaml | 2 +- connection-check/concheck.yaml | 2 +- controllers/vars/vars.go | 2 +- daemon/Makefile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_push_concheck.yaml b/.github/workflows/build_push_concheck.yaml index 27dc6b5..b16387b 100644 --- a/.github/workflows/build_push_concheck.yaml +++ b/.github/workflows/build_push_concheck.yaml @@ -8,7 +8,7 @@ on: - connection-check/** env: - IMAGE_VERSION: "1.2.5" + IMAGE_VERSION: "1.2.6" IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} jobs: diff --git a/.github/workflows/build_push_controller.yaml b/.github/workflows/build_push_controller.yaml index 00847dd..2e21416 100644 --- a/.github/workflows/build_push_controller.yaml +++ b/.github/workflows/build_push_controller.yaml @@ -16,7 +16,7 @@ on: - ./Makefile env: - VERSION: "1.2.5" + VERSION: "1.2.6" IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} DAEMON_REGISTRY: ghcr.io/${{ github.repository_owner }} diff --git a/.github/workflows/build_push_daemon.yaml b/.github/workflows/build_push_daemon.yaml index c1f7d62..5305f1a 100644 --- a/.github/workflows/build_push_daemon.yaml +++ b/.github/workflows/build_push_daemon.yaml @@ -10,7 +10,7 @@ on: - Makefile env: - IMAGE_VERSION: "1.2.5" + IMAGE_VERSION: "1.2.6" DAEMON_REGISTRY: ghcr.io/${{ github.repository_owner }} jobs: diff --git a/Makefile b/Makefile index d2803ae..cfafad1 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ export IMAGE_REGISTRY ?= ghcr.io/foundation-model-stack # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) # VERSION ?= 0.0.1 -VERSION ?= 1.2.5 +VERSION ?= 1.2.6 export CHANNELS = "alpha-1.2" # CHANNELS define the bundle channels used in the bundle. diff --git a/README.md b/README.md index a9f0a35..a53ee2e 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ Recommended to deploy in the same default namespace for [health check service](. ``` ##### by bundle with operator-sdk ```bash - operator-sdk run bundle ghcr.io/foundation-model-stack/multi-nic-cni-bundle:v1.2.5 -n multi-nic-cni-operator + operator-sdk run bundle ghcr.io/foundation-model-stack/multi-nic-cni-bundle:v1.2.6 -n multi-nic-cni-operator ``` #### Deploy MultiNicNetwork resource 1. Prepare `network.yaml` as shown in the [example](#multinicnetwork) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 2980d8d..34fe26a 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/foundation-model-stack/multi-nic-cni-controller - newTag: v1.2.5 + newTag: v1.2.6 diff --git a/config/samples/config.yaml b/config/samples/config.yaml index efef03c..8910497 100644 --- a/config/samples/config.yaml +++ b/config/samples/config.yaml @@ -11,7 +11,7 @@ spec: value: "11000" - name: RT_TABLE_PATH value: /opt/rt_tables - image: ghcr.io/foundation-model-stack/multi-nic-cni-daemon:v1.2.5 + image: ghcr.io/foundation-model-stack/multi-nic-cni-daemon:v1.2.6 imagePullPolicy: Always mounts: - hostpath: /var/lib/cni/bin diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index b21187d..5ce5441 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -15,4 +15,4 @@ kind: Kustomization images: - name: multi-nic-cni-daemon newName: ghcr.io/foundation-model-stack/multi-nic-cni-daemon - newTag: v1.2.5 + newTag: v1.2.6 diff --git a/connection-check/concheck.yaml b/connection-check/concheck.yaml index 1ea4932..2b24bb1 100644 --- a/connection-check/concheck.yaml +++ b/connection-check/concheck.yaml @@ -71,7 +71,7 @@ spec: serviceAccountName: multi-nic-concheck-account containers: - name: concheck - image: ghcr.io/foundation-model-stack/multi-nic-cni-concheck:v1.2.5 + image: ghcr.io/foundation-model-stack/multi-nic-cni-concheck:v1.2.6 imagePullPolicy: Always securityContext: privileged: true diff --git a/controllers/vars/vars.go b/controllers/vars/vars.go index 7e6a35d..847588d 100644 --- a/controllers/vars/vars.go +++ b/controllers/vars/vars.go @@ -36,7 +36,7 @@ const ( DefaultOperatorNamespace = "multi-nic-cni-operator" DefaultCNIType = "multi-nic" DefaultIPAMType = "multi-nic-ipam" - DefaultDaemonImage = "ghcr.io/foundation-model-stack/multi-nic-cni-daemon:v1.2.5" + DefaultDaemonImage = "ghcr.io/foundation-model-stack/multi-nic-cni-daemon:v1.2.6" DefaultJoinPath = "/join" DefaultInterfacePath = "/interface" DefaultAddRoutePath = "/addl3" diff --git a/daemon/Makefile b/daemon/Makefile index 6e5da6e..5803643 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -6,7 +6,7 @@ export DAEMON_REGISTRY ?= ghcr.io/foundation-model-stack # DAEMON_IMG defines the image:tag used for daemon IMAGE_TAG_BASE = $(DAEMON_REGISTRY)/multi-nic-cni -DAEMON_IMG ?= $(IMAGE_TAG_BASE)-daemon:v1.2.5 +DAEMON_IMG ?= $(IMAGE_TAG_BASE)-daemon:v1.2.6 test-verbose: From 8c3465ebeb79f6acde3982eaf9a248db6cefb020 Mon Sep 17 00:00:00 2001 From: Sunyanan Choochotkaew Date: Thu, 13 Feb 2025 13:48:42 +0900 Subject: [PATCH 3/3] chore: remove set branch version in workflow Signed-off-by: Sunyanan Choochotkaew --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index cfafad1..814a89b 100644 --- a/Makefile +++ b/Makefile @@ -297,9 +297,7 @@ set_version: @$(SED_CMD) -i 's/\(image: ghcr.io\/foundation-model-stack\/multi-nic-cni-daemon:v\).*/\1$(VERSION)/' config/samples/config.yaml @$(SED_CMD) -i 's/\(IMAGE_VERSION: \).*/\1\"$(VERSION)\"/' .github/workflows/*.yaml @$(SED_CMD) -i 's/\(VERSION: \).*/\1\"$(VERSION)\"/' .github/workflows/build_push_controller.yaml - @$(SED_CMD) -i '0,/branches:/s//branches:/; n; s/- v.*/- v$(VERSION)/' .github/workflows/*.yaml @$(SED_CMD) -i 's/multi-nic-cni-bundle:v[0-9.]\+/multi-nic-cni-bundle:v$(VERSION)/' README.md @$(SED_CMD) -i 's/multi-nic-cni-concheck:v[0-9.]\+/multi-nic-cni-concheck:v$(VERSION)/' connection-check/concheck.yaml @$(SED_CMD) -i 's/multi-nic-cni-daemon:v[0-9.]\+/multi-nic-cni-daemon:v$(VERSION)/' controllers/vars/vars.go @$(SED_CMD) -i 's/-daemon:v[0-9.]\+/-daemon:v$(VERSION)/' daemon/Makefile -