Update kube-ovn v1.13.0-ge1310e17 and enable image building (#149)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>

Makefile

@@ -3,6 +3,7 @@
 build:
 	make -C packages/apps/http-cache image
 	make -C packages/apps/kubernetes image
+	make -C packages/system/kubeovn image
 	make -C packages/system/dashboard image
 	make -C packages/core/installer image
 	make manifests

packages/system/kubeovn/Makefile

@@ -1,9 +1,28 @@
+KUBEOVN_TAG = v1.13.0
+
 NAME=kubeovn
 NAMESPACE=cozy-$(NAME)
 
+include ../../../scripts/common-envs.mk
 include ../../../scripts/package-system.mk
 
 update:
 	rm -rf charts && mkdir -p charts/kube-ovn
 	curl -sSL https://github.com/kubeovn/kube-ovn/archive/refs/heads/master.tar.gz | \
-	tar -C charts/kube-ovn -xzvf - --strip 2 kube-ovn-master/charts
+	tar xzvf - --strip 1 kube-ovn-master/charts
+	patch -p4 --no-backup-if-mismatch < patches/cozyconfig.diff
+	ln -s ../../images charts/kube-ovn/images
+	sed -i '/image:/ s/{{.*}}/{{ include "kubeovn.image" . }}/g' `grep -rl image: charts/kube-ovn/templates/`
+
+image:
+	docker buildx build images/kubeovn \
+		--provenance false \
+		--tag $(REGISTRY)/kubeovn:$(call settag,$(TAG)) \
+		--tag $(REGISTRY)/kubeovn:$(call settag,$(KUBEOVN_TAG)) \
+		--tag $(REGISTRY)/kubeovn:$(call settag,$(KUBEOVN_TAG)-$(TAG)) \
+		--cache-from type=registry,ref=$(REGISTRY)/kubeovn:latest \
+		--cache-to type=inline \
+		--metadata-file images/kubeovn.json \
+		--push=$(PUSH) \
+		--load=$(LOAD)
+	echo "$(REGISTRY)/kubeovn:$(call settag,$(TAG))" > images/kubeovn.tag

packages/system/kubeovn/charts/kube-ovn/Chart.yaml

@@ -15,10 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 1.13.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.13.0"
+
+kubeVersion: ">= 1.23.0-0"

packages/system/kubeovn/charts/kube-ovn/README.md

@@ -10,13 +10,13 @@ $ kubectl label node -lnode-role.kubernetes.io/control-plane  kube-ovn/role=mast
 $ kubectl label node -lovn.kubernetes.io/ovs_dp_type!=userspace ovn.kubernetes.io/ovs_dp_type=kernel  --overwrite
 
 # standard install 
-$ helm install --debug kubeovn ./charts --set MASTER_NODES=${Node0}
+$ helm install --debug kubeovn ./charts/kube-ovn --set MASTER_NODES=${Node0}
 
 # high availability install
-$ helm install --debug kubeovn ./charts --set MASTER_NODES=${Node0},${Node1},${Node2}
+$ helm install --debug kubeovn ./charts/kube-ovn --set MASTER_NODES=${Node0},${Node1},${Node2}
 
 # upgrade to this version
-$ helm upgrade --debug kubeovn ./charts --set MASTER_NODES=${Node0},${Node1},${Node2}
+$ helm upgrade --debug kubeovn ./charts/kube-ovn --set MASTER_NODES=${Node0},${Node1},${Node2}
 ```
 
 If `MASTER_NODES` unspecified Helm will take internal IPs of nodes with `kube-ovn/role=master` label
@@ -32,7 +32,7 @@ machine:
     - name: openvswitch
 ```
 
-and use the following options for install this Helm-chart:
+and use the following options to install this Helm-chart:
 
 ```
 --set cni_conf.MOUNT_LOCAL_BIN_DIR=false