Vnet import (#20)

* vNet: added importing

* added separate helm push target in makefile

Author: pogossian

Makefile

@@ -128,6 +128,8 @@ helm: generate fmt vet manifests pip-install-reqs
 	scripts/rbac-helm-template.py config/rbac/$${i} | yq -y . >> deploy/charts/netris-operator/templates/rbac.yaml;\
 	done
 	echo "{{- end }}" >> deploy/charts/netris-operator/templates/rbac.yaml
+
+helm-push: helm
 	@{ \
 	set -e ;\
 	HELM_CHART_GEN_TMP_DIR=$$(mktemp -d) ;\

deploy/charts/netris-operator/Chart.yaml

@@ -15,12 +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.2.3
+version: 0.2.4
 
 # 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.
-appVersion: v0.3.1
+appVersion: v0.3.2
 home: https://github.com/netrisai/netris-operator
 icon: https://www.netris.ai/wp-content/uploads/2020/05/logo-600.png  # [todo] Change url to permalink
 keywords:

deploy/charts/netris-operator/crds/k8s.netris.ai_vnetmeta.yaml

@@ -59,6 +59,8 @@ spec:
               type: array
             id:
               type: integer
+            imported:
+              type: boolean
             members:
               items:
                 description: VNetMetaMember .
@@ -131,6 +133,7 @@ spec:
           required:
           - gateways
           - id
+          - imported
           - members
           - name
           - owner

deploy/charts/netris-operator/crds/k8s.netris.ai_vnets.yaml

@@ -38,7 +38,7 @@ spec:
           properties:
             guestTenants:
               items:
-                type: integer
+                type: string
               type: array
             ownerTenant:
               type: string
@@ -48,13 +48,7 @@ spec:
                 properties:
                   gateways:
                     items:
-                      description: VNetGateway .
-                      properties:
-                        gateway4:
-                          type: string
-                        gateway6:
-                          type: string
-                      type: object
+                      type: string
                     type: array
                   name:
                     type: string
@@ -64,16 +58,16 @@ spec:
                       properties:
                         name:
                           type: string
+                        state:
+                          type: string
                         vlanId:
                           type: integer
                       required:
                       - name
                       type: object
                     type: array
                 required:
-                - gateways
                 - name
-                - switchPorts
                 type: object
               type: array
             state: