Skip to content

Commit 9766588

Browse files
committed
fix submariner install
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
1 parent ed732a6 commit 9766588

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGE
5454
CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION)
5555
CERT_MANAGER_YAML = https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml
5656

57-
SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.20.1})
57+
SUBMARINER_VERSION = $(shell echo $${SUBMARINER_VERSION:-0.22.0})
5858
SUBMARINER_OPERATOR = quay.io/submariner/submariner-operator:$(SUBMARINER_VERSION)
5959
SUBMARINER_GATEWAY = quay.io/submariner/submariner-gateway:$(SUBMARINER_VERSION)
6060
SUBMARINER_LIGHTHOUSE_AGENT = quay.io/submariner/lighthouse-agent:$(SUBMARINER_VERSION)

makefiles/kind.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,8 @@ kind-install-ovn-submariner: kind-install
354354
$(call kind_load_image,kube-ovn1,$(REGISTRY)/kube-ovn:$(VERSION))
355355

356356
kubectl config use-context kind-kube-ovn1
357+
kubectl create namespace submariner-operator
358+
kubectl create configmap submariner-global --namespace=submariner-operator --from-literal=use-nftables=false
357359
@$(MAKE) untaint-control-plane
358360
sed -e 's/10.16.0/10.18.0/g' \
359361
-e 's/10.96.0.0/10.112.0.0/g' \
@@ -363,11 +365,12 @@ kind-install-ovn-submariner: kind-install
363365
kubectl describe no
364366

365367
kubectl config use-context kind-kube-ovn
368+
kubectl create namespace submariner-operator
369+
kubectl create configmap submariner-global --namespace=submariner-operator --from-literal=use-nftables=false
366370
subctl deploy-broker
367371
cat broker-info.subm | base64 -d | \
368372
jq '.brokerURL = "https://$(shell docker inspect --format='{{.NetworkSettings.Networks.kind.IPAddress}}' kube-ovn-control-plane):6443"' | \
369373
base64 > broker-info-internal.subm
370-
371374
$(call kind_subctl_join,kube-ovn,cluster0,100.64.0.0/16;10.16.0.0/16)
372375
$(call kind_subctl_join,kube-ovn1,cluster1,100.68.0.0/16;10.18.0.0/16)
373376

0 commit comments

Comments
 (0)