Added missing NadVlanMap CRD and updated nodefabricnetworkattachments…

… CRD
noironetworks · Aug 30, 2023 · 5ab876d · 5ab876d
1 parent 29a5552
commit 5ab876d
Show file tree

Hide file tree

Showing 24 changed files with 827 additions and 19 deletions.
diff --git a/provision/acc_provision/templates/aci-containers.yaml b/provision/acc_provision/templates/aci-containers.yaml
@@ -3408,7 +3408,20 @@ spec:
                 description: Map of iface to fabricLink
                 type: object
               encapVlan:
-                type: string
+                properties:
+                  encapRef:
+                    properties:
+                      key:
+                        type: string
+                      nadVlanMap:
+                        type: string
+                    required:
+                    - key
+                    - nadVlanMap
+                    type: object
+                  vlanList:
+                    type: string
+                type: object
               networkRef:
                 description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                   Important: Run "operator-sdk generate k8s" to regenerate code after
@@ -3451,6 +3464,74 @@ spec:
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.12.0
+  name: nadvlanmaps.aci.fabricattachment
+spec:
+  group: aci.fabricattachment
+  names:
+    kind: NadVlanMap
+    listKind: NadVlanMapList
+    plural: nadvlanmaps
+    singular: nadvlanmap
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: NadVlanMap is the Schema for FabricAttachments NAD name to vlan
+          mapping API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              nadVlanMapping:
+                additionalProperties:
+                  items:
+                    properties:
+                      label:
+                        type: string
+                      vlans:
+                        type: string
+                    required:
+                    - vlans
+                    type: object
+                  type: array
+                description: NAD namespace/name to vlan list mapping
+                type: object
+            required:
+            - nadVlanMapping
+            type: object
+          status:
+            properties:
+              status:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+        x-kubernetes-validations:
+        - rule: "self.metadata.name == 'nad-vlan-map'"
+          message: "Only one instance with name nad-vlan-map allowed"
+    served: true
+    storage: true
+    subresources:
+      status: {}
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.12.0

diff --git a/provision/testdata/chained_mode_nad_vlan_map.kube.yaml b/provision/testdata/chained_mode_nad_vlan_map.kube.yaml
diff --git a/...tdata/chained_mode_nad_vlan_map_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...tdata/chained_mode_nad_vlan_map_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...etwork-34-CustomResourceDefinition-nodefabricnetworkattachments.aci.fabricattachment.yaml b/...etwork-34-CustomResourceDefinition-nodefabricnetworkattachments.aci.fabricattachment.yaml
@@ -65,7 +65,20 @@ spec:
                 description: Map of iface to fabricLink
                 type: object
               encapVlan:
-                type: string
+                properties:
+                  encapRef:
+                    properties:
+                      key:
+                        type: string
+                      nadVlanMap:
+                        type: string
+                    required:
+                    - key
+                    - nadVlanMap
+                    type: object
+                  vlanList:
+                    type: string
+                type: object
               networkRef:
                 description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                   Important: Run "operator-sdk generate k8s" to regenerate code after

diff --git a/...map_tar/cluster-network-35-CustomResourceDefinition-nadvlanmaps.aci.fabricattachment.yaml b/...map_tar/cluster-network-35-CustomResourceDefinition-nadvlanmaps.aci.fabricattachment.yaml
@@ -0,0 +1,67 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.12.0
+  name: nadvlanmaps.aci.fabricattachment
+spec:
+  group: aci.fabricattachment
+  names:
+    kind: NadVlanMap
+    listKind: NadVlanMapList
+    plural: nadvlanmaps
+    singular: nadvlanmap
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: NadVlanMap is the Schema for FabricAttachments NAD name to vlan
+          mapping API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              nadVlanMapping:
+                additionalProperties:
+                  items:
+                    properties:
+                      label:
+                        type: string
+                      vlans:
+                        type: string
+                    required:
+                    - vlans
+                    type: object
+                  type: array
+                description: NAD namespace/name to vlan list mapping
+                type: object
+            required:
+            - nadVlanMapping
+            type: object
+          status:
+            properties:
+              status:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+        x-kubernetes-validations:
+        - message: Only one instance with name nad-vlan-map allowed
+          rule: self.metadata.name == 'nad-vlan-map'
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/...workattachments.aci.fabricattachment.yaml → ...workattachments.aci.fabricattachment.yaml b/...workattachments.aci.fabricattachment.yaml → ...workattachments.aci.fabricattachment.yaml
diff --git a/...r-network-36-NadVlanMap-nad-vlan-map.yaml → ...r-network-37-NadVlanMap-nad-vlan-map.yaml b/...r-network-36-NadVlanMap-nad-vlan-map.yaml → ...r-network-37-NadVlanMap-nad-vlan-map.yaml
diff --git a/...rviceAccount-aci-containers-operator.yaml → ...rviceAccount-aci-containers-operator.yaml b/...rviceAccount-aci-containers-operator.yaml → ...rviceAccount-aci-containers-operator.yaml
diff --git a/...-ClusterRole-aci-containers-operator.yaml → ...-ClusterRole-aci-containers-operator.yaml b/...-ClusterRole-aci-containers-operator.yaml → ...-ClusterRole-aci-containers-operator.yaml
diff --git a/...rRoleBinding-aci-containers-operator.yaml → ...rRoleBinding-aci-containers-operator.yaml b/...rRoleBinding-aci-containers-operator.yaml → ...rRoleBinding-aci-containers-operator.yaml
diff --git a/provision/testdata/chained_mode_without_l3out.kube.yaml b/provision/testdata/chained_mode_without_l3out.kube.yaml
diff --git a/provision/testdata/chained_mode_without_phys_domains.kube.yaml b/provision/testdata/chained_mode_without_phys_domains.kube.yaml
diff --git a/provision/testdata/flavor_openshift_sdn_ovn_baremetal.kube.yaml b/provision/testdata/flavor_openshift_sdn_ovn_baremetal.kube.yaml
diff --git a/...vor_openshift_sdn_ovn_baremetal_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml b/...vor_openshift_sdn_ovn_baremetal_tar/cluster-network-21-ConfigMap-aci-operator-config.yaml
diff --git a/...etwork-34-CustomResourceDefinition-nodefabricnetworkattachments.aci.fabricattachment.yaml b/...etwork-34-CustomResourceDefinition-nodefabricnetworkattachments.aci.fabricattachment.yaml
@@ -65,7 +65,20 @@ spec:
                 description: Map of iface to fabricLink
                 type: object
               encapVlan:
-                type: string
+                properties:
+                  encapRef:
+                    properties:
+                      key:
+                        type: string
+                      nadVlanMap:
+                        type: string
+                    required:
+                    - key
+                    - nadVlanMap
+                    type: object
+                  vlanList:
+                    type: string
+                type: object
               networkRef:
                 description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                   Important: Run "operator-sdk generate k8s" to regenerate code after

diff --git a/...tal_tar/cluster-network-35-CustomResourceDefinition-nadvlanmaps.aci.fabricattachment.yaml b/...tal_tar/cluster-network-35-CustomResourceDefinition-nadvlanmaps.aci.fabricattachment.yaml
@@ -0,0 +1,67 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.12.0
+  name: nadvlanmaps.aci.fabricattachment
+spec:
+  group: aci.fabricattachment
+  names:
+    kind: NadVlanMap
+    listKind: NadVlanMapList
+    plural: nadvlanmaps
+    singular: nadvlanmap
+  scope: Cluster
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: NadVlanMap is the Schema for FabricAttachments NAD name to vlan
+          mapping API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            properties:
+              nadVlanMapping:
+                additionalProperties:
+                  items:
+                    properties:
+                      label:
+                        type: string
+                      vlans:
+                        type: string
+                    required:
+                    - vlans
+                    type: object
+                  type: array
+                description: NAD namespace/name to vlan list mapping
+                type: object
+            required:
+            - nadVlanMapping
+            type: object
+          status:
+            properties:
+              status:
+                type: string
+            type: object
+        required:
+        - spec
+        type: object
+        x-kubernetes-validations:
+        - message: Only one instance with name nad-vlan-map allowed
+          rule: self.metadata.name == 'nad-vlan-map'
+    served: true
+    storage: true
+    subresources:
+      status: {}
diff --git a/...workattachments.aci.fabricattachment.yaml → ...workattachments.aci.fabricattachment.yaml b/...workattachments.aci.fabricattachment.yaml → ...workattachments.aci.fabricattachment.yaml
diff --git a/...r-network-36-NadVlanMap-nad-vlan-map.yaml → ...r-network-37-NadVlanMap-nad-vlan-map.yaml b/...r-network-36-NadVlanMap-nad-vlan-map.yaml → ...r-network-37-NadVlanMap-nad-vlan-map.yaml
diff --git a/...rviceAccount-aci-containers-operator.yaml → ...rviceAccount-aci-containers-operator.yaml b/...rviceAccount-aci-containers-operator.yaml → ...rviceAccount-aci-containers-operator.yaml
diff --git a/...-ClusterRole-aci-containers-operator.yaml → ...-ClusterRole-aci-containers-operator.yaml b/...-ClusterRole-aci-containers-operator.yaml → ...-ClusterRole-aci-containers-operator.yaml
diff --git a/...rRoleBinding-aci-containers-operator.yaml → ...rRoleBinding-aci-containers-operator.yaml b/...rRoleBinding-aci-containers-operator.yaml → ...rRoleBinding-aci-containers-operator.yaml
diff --git a/provision/testdata/override_skip_node_network_provision.kube.yaml b/provision/testdata/override_skip_node_network_provision.kube.yaml
diff --git a/provision/testdata/override_use_global_scope_vlan.kube.yaml b/provision/testdata/override_use_global_scope_vlan.kube.yaml
diff --git a/provision/testdata/with_preexisting_tenant_chained_mode.kube.yaml b/provision/testdata/with_preexisting_tenant_chained_mode.kube.yaml