foundation-model-stack · tatsuhirochiba · Feb 18, 2025 · Feb 13, 2025 · Feb 13, 2025 · Feb 13, 2025
diff --git a/.github/workflows/build_push_concheck.yaml b/.github/workflows/build_push_concheck.yaml
@@ -3,12 +3,12 @@ name: Build and push connection check image
 on:
   push:
     branches:
-      - v1.2.5
+      - main
     paths:
       - 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
@@ -3,7 +3,7 @@ name: Build and push controller and its bundle image
 on:
   push:
     branches:
-      - v1.2.5
+      - main
     paths:
       - controllers/**
       - compute/**
@@ -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
@@ -3,14 +3,14 @@ name: Build and push daemon image
 on:
   push:
     branches:
-      - v1.2.5
+      - main
     paths:
       - daemon/**
       - cni/**
       - Makefile
 
 env:
-  IMAGE_VERSION: "1.2.5"
+  IMAGE_VERSION: "1.2.6"
   DAEMON_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
 jobs:

diff --git 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
@@ -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
@@ -2,9 +2,6 @@ name: Perform unittest for controller
 
 on:
   pull_request:
-    branches:
-      - v1.2.5
-      - main
   push:
     paths:
       - controllers/**

diff --git 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.
@@ -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
-
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,9 +2,6 @@ name: Perform unittest for daemon @@
     on:
       pull_request:
-        branches:
-          - v1.2.5
-          - main
       push:
         paths:
           - daemon/**
@@ Expand Down @@