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 <zhangzujian.7@gmail.com>
zhangzujian authored and zbb88888 committed Mar 8, 2024
1 parent e57ecb3 commit 52b5084
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
@@ -26,7 +26,7 @@ jobs:
make base-tar-amd64-dpdk
- name: Upload image to artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-amd64-dpdk-${{ matrix.branch }}
path: image-amd64-dpdk.tar
@@ -49,7 +49,7 @@ jobs:
ref: ${{ matrix.branch }}

- name: Download image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-amd64-dpdk-${{ matrix.branch }}

8 changes: 4 additions & 4 deletions .github/workflows/build-kube-ovn-base.yaml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ jobs:
make base-tar-amd64
- name: Upload image to artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-amd64-${{ matrix.branch }}
path: image-amd64.tar
@@ -62,7 +62,7 @@ jobs:
make base-tar-arm64
- name: Upload image to artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image-arm64-${{ matrix.branch }}
path: image-arm64.tar
@@ -88,12 +88,12 @@ jobs:
with:
ref: ${{ matrix.branch }}
- name: Download image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-amd64-${{ matrix.branch }}

- name: Download image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: image-arm64-${{ matrix.branch }}

14 changes: 7 additions & 7 deletions .github/workflows/build-windows.yaml
Original file line number Diff line number Diff line change
@@ -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
@@ -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: |
@@ -235,19 +235,19 @@ jobs:
- uses: actions/checkout@v3

- 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
@@ -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: |
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ DEEPFLOW_GRAFANA_NODE_PORT = 30080
DEEPFLOW_MAPPED_PORTS = $(DEEPFLOW_SERVER_NODE_PORT),$(DEEPFLOW_SERVER_GRPC_PORT),$(DEEPFLOW_SERVER_HTTP_PORT),$(DEEPFLOW_GRAFANA_NODE_PORT)
DEEPFLOW_CTL_URL = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/bin/ctl/$(DEEPFLOW_VERSION)/linux/$(shell arch | sed 's|x86_64|amd64|' | sed 's|aarch64|arm64|')/deepflow-ctl

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)
1,077 changes: 782 additions & 295 deletions yamls/kwok.yaml

Large diffs are not rendered by default.

0 comments on commit 52b5084

Please sign in to comment.