commit d457d189772c96c498ddef396924978b14fd20a1
author Hyunsun Moon <hyunsun.moon@gmail.com> Thu Sep 10 15:52:09 2020 -0700
committer Hyunsun Moon <hyunsun.moon@gmail.com> Fri Sep 11 01:47:19 2020 +0000
tree 63590f4872a143297853711dc3ba2eec8fa57267
parent 0e39f2722db5d579e39786411e270d79852015de

AETHER-487 Add support of k8s 1.18

Change-Id: I759b71546e6ba2fc1a52ab135ea26c403fecc417

omec/omec-user-plane/templates/networks.yaml

diff --git a/omec/omec-user-plane/templates/networks.yaml b/omec/omec-user-plane/templates/networks.yaml
index b749ea8..37f54e7 100644
--- a/omec/omec-user-plane/templates/networks.yaml
+++ b/omec/omec-user-plane/templates/networks.yaml
@@ -15,6 +15,9 @@
 {{- end }}
 spec:
   config: '{
+{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
+    "cniVersion": "0.3.1",
+{{- end }}
     "type": {{ .Values.config.upf.cniPlugin | quote }},
     "ipam": {
         "type": {{ .Values.config.upf.ipam | quote }}
@@ -31,6 +34,9 @@
 {{- end }}
 spec:
   config: '{
+{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion }}
+    "cniVersion": "0.3.1",
+{{- end }}
     "type": {{ .Values.config.upf.cniPlugin | quote }},
     "ipam": {
         "type": {{ .Values.config.upf.ipam | quote }}