Skip to content

Commit

Permalink
Makefile: bump kwok to v0.5.1 (#3730)
Browse files Browse the repository at this point in the history
Signed-off-by: zhangzujian <[email protected]>
  • Loading branch information
zhangzujian authored Feb 19, 2024
1 parent 7891205 commit b98d6ce
Show file tree
Hide file tree
Showing 5 changed files with 796 additions and 309 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-kube-ovn-base-dpdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Upload image to artifact
if: (github.event.inputs.branch || matrix.branch) == matrix.branch
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-amd64-dpdk-${{ matrix.branch }}
path: image-amd64-dpdk.tar
Expand All @@ -67,7 +67,7 @@ jobs:

- name: Download image
if: (github.event.inputs.branch || matrix.branch) == matrix.branch
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-amd64-dpdk-${{ matrix.branch }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-kube-ovn-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Upload image to artifact
if: (github.event.inputs.branch || matrix.branch) == matrix.branch
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-amd64-${{ matrix.branch }}
path: image-amd64.tar
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
- name: Upload image to artifact
if: (github.event.inputs.branch || matrix.branch) == matrix.branch
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-arm64-${{ matrix.branch }}
path: image-arm64.tar
Expand Down Expand Up @@ -114,13 +114,13 @@ jobs:

- name: Download image
if: (github.event.inputs.branch || matrix.branch) == matrix.branch
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-amd64-${{ matrix.branch }}

- name: Download image
if: (github.event.inputs.branch || matrix.branch) == matrix.branch
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-arm64-${{ matrix.branch }}

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,13 @@ jobs:
C:\msys64\usr\bin\bash.exe -lc "cd '%_ovn_dir%' && make install"
- name: Upload OVS
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ovs-win64
path: ovs\windows\ovs-windows-installer\bin\x64\Release\OpenvSwitch.msi

- name: Upload OVN
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ovn-win64
path: C:\ovn
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
make build-go-windows
- name: Upload Binaries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kube-ovn-bin
path: |
Expand All @@ -235,19 +235,19 @@ jobs:
- uses: actions/checkout@v4

- name: Download Kube-OVN binaries
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kube-ovn-bin
path: dist/windows

- name: Download OVS
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ovs-win64
path: dist/windows

- name: Download OVN
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ovn-win64
path: dist/windows/ovn
Expand All @@ -268,7 +268,7 @@ jobs:
Copy-Item kube-ovn-daemon.exe -Destination kube-ovn/bin
- name: Upload package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kube-ovn-win64
path: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ DEEPFLOW_CHART_REPO = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stab
DEEPFLOW_IMAGE_REPO = registry.cn-beijing.aliyuncs.com/deepflow-ce
DEEPFLOW_GRAFANA_PORT = 30080

KWOK_VERSION = v0.5.0
KWOK_VERSION = v0.5.1
KWOK_IMAGE = registry.k8s.io/kwok/kwok:$(KWOK_VERSION)

VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(VERSION)
Expand Down
Loading

0 comments on commit b98d6ce

Please sign in to comment.