@@ -3,6 +3,7 @@ SHELL = /bin/bash
3
3
REGISTRY = kubeovn
4
4
DEV_TAG = dev
5
5
RELEASE_TAG = $(shell cat VERSION)
6
+ VERSION = $(shell echo $${VERSION:-$(RELEASE_TAG ) })
6
7
COMMIT = git-$(shell git rev-parse --short HEAD)
7
8
DATE = $(shell date +"% Y-% m-% d_% H:% M:% S")
8
9
GOLDFLAGS = "-w -s -extldflags '-z now' -X github.com/kubeovn/kube-ovn/versions.COMMIT=$(COMMIT ) -X github.com/kubeovn/kube-ovn/versions.VERSION=$(RELEASE_TAG ) -X github.com/kubeovn/kube-ovn/versions.BUILDDATE=$(DATE ) "
@@ -15,7 +16,7 @@ MULTUS_YAML = https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/
15
16
CILIUM_VERSION = 1.11.6
16
17
CILIUM_IMAGE_REPO = quay.io/cilium/cilium
17
18
18
- VPC_NAT_GW_IMG = $(REGISTRY ) /vpc-nat-gateway:$(RELEASE_TAG )
19
+ VPC_NAT_GW_IMG = $(REGISTRY ) /vpc-nat-gateway:$(VERSION )
19
20
20
21
E2E_NETWORK = bridge
21
22
ifneq ($(VLAN_ID ) ,)
@@ -158,16 +159,16 @@ define docker_config_bridge
158
159
default=$$(docker network inspect $(1 ) -f '{{index .Options "com.docker.network.bridge.default_bridge"}}' ) ; \
159
160
br="docker0"; \
160
161
[ "$$default" != "true" ] && br="br-$$(docker network inspect $(1 ) -f "{{.Id}}" | head -c 12 ) "; \
161
- docker run --rm --privileged --network=host $(REGISTRY ) /kube-ovn:$(RELEASE_TAG ) bash -ec '\
162
+ docker run --rm --privileged --network=host $(REGISTRY ) /kube-ovn:$(VERSION ) bash -ec '\
162
163
for brif in $$(ls /sys/class/net/'$$br'/brif ) ; do \
163
164
echo $(2 ) > /sys/class/net/'$$br'/brif/$$brif/hairpin_mode; \
164
165
done'; \
165
166
if [ -z "$(3 ) " ]; then \
166
- docker run --rm --privileged --network=host $(REGISTRY ) /kube-ovn:$(RELEASE_TAG ) bash -ec '\
167
+ docker run --rm --privileged --network=host $(REGISTRY ) /kube-ovn:$(VERSION ) bash -ec '\
167
168
echo 0 > /sys/class/net/'$$br'/bridge/vlan_filtering; \
168
169
'; \
169
170
else \
170
- docker run --rm --privileged --network=host $(REGISTRY ) /kube-ovn:$(RELEASE_TAG ) bash -ec '\
171
+ docker run --rm --privileged --network=host $(REGISTRY ) /kube-ovn:$(VERSION ) bash -ec '\
171
172
echo 1 > /sys/class/net/'$$br'/bridge/vlan_filtering; \
172
173
bridge vlan show | awk "/^'$$br'/{print \$$2; while (getline > 0) {\
173
174
if (\$$0 ~ /^[[:blank:]]/) {print \$$1} else {exit 0} }\
@@ -252,7 +253,7 @@ kind-init-cilium:
252
253
253
254
.PHONY : kind-load-image
254
255
kind-load-image :
255
- $(call kind_load_image,kube-ovn,$(REGISTRY ) /kube-ovn:$(RELEASE_TAG ) )
256
+ $(call kind_load_image,kube-ovn,$(REGISTRY ) /kube-ovn:$(VERSION ) )
256
257
257
258
.PHONY : kind-untaint-control-plane
258
259
kind-untaint-control-plane :
@@ -287,7 +288,7 @@ kind-install-overlay-ipv4: kind-install
287
288
288
289
.PHONY : kind-install-ovn-ic
289
290
kind-install-ovn-ic : kind-load-image kind-install
290
- $(call kind_load_image,kube-ovn1,$(REGISTRY ) /kube-ovn:$(RELEASE_TAG ) )
291
+ $(call kind_load_image,kube-ovn1,$(REGISTRY ) /kube-ovn:$(VERSION ) )
291
292
kubectl config use-context kind-kube-ovn1
292
293
sed -e ' s/10.16.0/10.18.0/g' \
293
294
-e ' s/10.96.0/10.98.0/g' \
@@ -296,7 +297,7 @@ kind-install-ovn-ic: kind-load-image kind-install
296
297
bash
297
298
kubectl describe no
298
299
299
- docker run -d --name ovn-ic-db --network kind $(REGISTRY)/kube-ovn:$(RELEASE_TAG ) bash start-ic-db.sh
300
+ docker run -d --name ovn-ic-db --network kind $(REGISTRY)/kube-ovn:$(VERSION ) bash start-ic-db.sh
300
301
@set -e; \
301
302
ic_db_host=$$(docker inspect ovn-ic-db -f "{{.NetworkSettings.Networks.kind.IPAddress}}"); \
302
303
zone=az0 ic_db_host=$$ic_db_host gateway_node_name=kube-ovn-control-plane j2 yamls/ovn-ic.yaml.j2 -o ovn-ic-0.yaml; \
0 commit comments