Skip to content

Commit

Permalink
move to v1.2.3
Browse files Browse the repository at this point in the history
Signed-off-by: Sunyanan Choochotkaew <[email protected]>
  • Loading branch information
sunya-ch committed Apr 9, 2024
1 parent 907a875 commit dee9650
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_push_concheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: Build and push connection check image
on:
push:
branches:
- v1.2.0
- v1.2.3
paths:
- connection-check/**

env:
IMAGE_VERSION: '1.2.0'
IMAGE_VERSION: '1.2.3'
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_push_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and push controller and its bundle image
on:
push:
branches:
- v1.2.0
- v1.2.3
paths:
- controllers/**
- compute/**
Expand All @@ -16,7 +16,7 @@ on:
- ./Makefile

env:
VERSION: '1.2.0'
VERSION: '1.2.3'
IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
DAEMON_REGISTRY: ghcr.io/${{ github.repository_owner }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_push_daemon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Build and push daemon image
on:
push:
branches:
- v1.2.0
- v1.2.3
paths:
- daemon/**
- cni/**
- Makefile

env:
IMAGE_VERSION: '1.2.0'
IMAGE_VERSION: '1.2.3'
DAEMON_REGISTRY: ghcr.io/${{ github.repository_owner }}

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daemon_unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Perform unittest for daemon
on:
pull_request:
branches:
- v1.2.0
- v1.2.3
push:
paths:
- daemon/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: e2e test
on:
pull_request:
branches:
- v1.2.0
- v1.2.3
push:
paths:
- controllers/**
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Perform unittest for controller
on:
pull_request:
branches:
- v1.2.0
- v1.2.3
push:
paths:
- controllers/**
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ endif
# - 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.0
VERSION ?= 1.2.3
export CHANNELS = "beta"

# CHANNELS define the bundle channels used in the bundle.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 -n multi-nic-cni-operator
operator-sdk run bundle ghcr.io/foundation-model-stack/multi-nic-cni-bundle:v1.2.3 -n multi-nic-cni-operator
```
#### Deploy MultiNicNetwork resource
1. Prepare `network.yaml` as shown in the [example](#multinicnetwork)
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: ghcr.io/foundation-model-stack/multi-nic-cni-controller
newTag: v1.2.0
newTag: v1.2.3
2 changes: 1 addition & 1 deletion config/samples/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
image: ghcr.io/foundation-model-stack/multi-nic-cni-daemon:v1.2.3
imagePullPolicy: Always
mounts:
- hostpath: /var/lib/cni/bin
Expand Down
2 changes: 1 addition & 1 deletion config/samples/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
newTag: v1.2.3
2 changes: 1 addition & 1 deletion connection-check/concheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
image: ghcr.io/foundation-model-stack/multi-nic-cni-concheck:v1.2.3
imagePullPolicy: Always
securityContext:
privileged: true
2 changes: 1 addition & 1 deletion controllers/vars/vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.0"
DefaultDaemonImage = "ghcr.io/foundation-model-stack/multi-nic-cni-daemon:v1.2.3"
DefaultJoinPath = "/join"
DefaultInterfacePath = "/interface"
DefaultAddRoutePath = "/addl3"
Expand Down
2 changes: 1 addition & 1 deletion daemon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
IMAGE_VERSION ?= 1.2.0
IMAGE_VERSION ?= 1.2.3
DAEMON_IMG ?= $(IMAGE_TAG_BASE)-daemon:v$(IMAGE_VERSION)


Expand Down
2 changes: 1 addition & 1 deletion daemon/dockerfiles/Dockerfile.kbuilder
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN curl -sSLo kubebuilder_2.0.0-alpha.1_linux_amd64.tar.gz https://github.com/k
RUN curl -sSLo setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.2/hack/setup-envtest.sh

RUN cd /tmp && \
git clone -b v1.2.0 https://github.com/containernetworking/plugins.git && \
git clone -b v1.2.3 https://github.com/containernetworking/plugins.git && \
cd plugins && \
./build_linux.sh && \
ls /tmp/plugins/bin && \
Expand Down

0 comments on commit dee9650

Please sign in to comment.