From d0632994994616657d4cab4379e32a60365a0453 Mon Sep 17 00:00:00 2001 From: keithnguyen Date: Fri, 14 Feb 2025 23:08:02 +0000 Subject: [PATCH 1/2] feat: added 3 new fields on NC. Generated all CRD. --- .../manifests/acn.azure.com_clustersubnetstates.yaml | 2 +- ...enancy.acn.azure.com_multitenantpodnetworkconfigs.yaml | 2 +- .../manifests/multitenancy.acn.azure.com_nodeinfo.yaml | 2 +- .../multitenancy.acn.azure.com_podnetworkinstances.yaml | 2 +- .../manifests/multitenancy.acn.azure.com_podnetworks.yaml | 2 +- ...networking.azure.com_multitenantnetworkcontainers.yaml | 2 +- crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go | 3 +++ .../manifests/acn.azure.com_nodenetworkconfigs.yaml | 8 +++++++- .../manifests/acn.azure.com_overlayextensionconfigs.yaml | 2 +- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml b/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml index 952eb502c8..1ec7448ea2 100644 --- a/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml +++ b/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 name: clustersubnetstates.acn.azure.com spec: group: acn.azure.com diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml index 9390424b82..c94fc5e4a0 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 labels: managed: "" owner: "" diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml index de03a3816c..4ac34f37ae 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 name: nodeinfo.multitenancy.acn.azure.com spec: group: multitenancy.acn.azure.com diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml index 8dbbbe127f..05f1fe5f99 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 labels: managed: "" owner: "" diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml index f7aa88bbd9..fa8f566663 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 name: podnetworks.multitenancy.acn.azure.com spec: group: multitenancy.acn.azure.com diff --git a/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml b/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml index 8ccaa51c9f..a933292b1f 100644 --- a/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml +++ b/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 name: multitenantnetworkcontainers.networking.azure.com spec: group: networking.azure.com diff --git a/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go b/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go index 1137b28e96..7ded69a387 100644 --- a/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go +++ b/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go @@ -119,9 +119,12 @@ type NetworkContainer struct { // +kubebuilder:default=vnet Type NCType `json:"type,omitempty"` PrimaryIP string `json:"primaryIP,omitempty"` + PrimaryIPV6 string `json:"primaryIPV6,omitempty"` SubnetName string `json:"subnetName,omitempty"` IPAssignments []IPAssignment `json:"ipAssignments,omitempty"` DefaultGateway string `json:"defaultGateway,omitempty"` + DefaultGatewayV6 string `json:"defaultGatewayV6,omitempty"` + MacAddress string `json:"macAddress,omitempty"` SubnetAddressSpace string `json:"subnetAddressSpace,omitempty"` // +kubebuilder:default=0 // +kubebuilder:validation:Optional diff --git a/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml b/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml index 1410a85e2a..266fdb17a0 100644 --- a/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml +++ b/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 name: nodenetworkconfigs.acn.azure.com spec: group: acn.azure.com @@ -109,6 +109,8 @@ spec: type: string defaultGateway: type: string + defaultGatewayV6: + type: string id: type: string ipAssignments: @@ -122,10 +124,14 @@ spec: type: string type: object type: array + macAddress: + type: string nodeIP: type: string primaryIP: type: string + primaryIPV6: + type: string resourceGroupID: type: string status: diff --git a/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml b/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml index 418691c2af..3aee990cf1 100644 --- a/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml +++ b/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.3 + controller-gen.kubebuilder.io/version: v0.17.2 name: overlayextensionconfigs.acn.azure.com spec: group: acn.azure.com From b0f3bdd0573118dc3a406df185a9b1563bfce72c Mon Sep 17 00:00:00 2001 From: keithnguyen Date: Wed, 12 Mar 2025 18:51:50 +0000 Subject: [PATCH 2/2] Revert version --- .../manifests/acn.azure.com_clustersubnetstates.yaml | 2 +- ...multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml | 2 +- .../manifests/multitenancy.acn.azure.com_nodeinfo.yaml | 2 +- .../multitenancy.acn.azure.com_podnetworkinstances.yaml | 2 +- .../manifests/multitenancy.acn.azure.com_podnetworks.yaml | 2 +- .../networking.azure.com_multitenantnetworkcontainers.yaml | 2 +- .../manifests/acn.azure.com_nodenetworkconfigs.yaml | 2 +- .../manifests/acn.azure.com_overlayextensionconfigs.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml b/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml index 1ec7448ea2..952eb502c8 100644 --- a/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml +++ b/crd/clustersubnetstate/manifests/acn.azure.com_clustersubnetstates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: clustersubnetstates.acn.azure.com spec: group: acn.azure.com diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml index c94fc5e4a0..9390424b82 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_multitenantpodnetworkconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 labels: managed: "" owner: "" diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml index 4ac34f37ae..de03a3816c 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_nodeinfo.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: nodeinfo.multitenancy.acn.azure.com spec: group: multitenancy.acn.azure.com diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml index 05f1fe5f99..8dbbbe127f 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworkinstances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 labels: managed: "" owner: "" diff --git a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml index fa8f566663..f7aa88bbd9 100644 --- a/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml +++ b/crd/multitenancy/manifests/multitenancy.acn.azure.com_podnetworks.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: podnetworks.multitenancy.acn.azure.com spec: group: multitenancy.acn.azure.com diff --git a/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml b/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml index a933292b1f..8ccaa51c9f 100644 --- a/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml +++ b/crd/multitenantnetworkcontainer/manifests/networking.azure.com_multitenantnetworkcontainers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: multitenantnetworkcontainers.networking.azure.com spec: group: networking.azure.com diff --git a/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml b/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml index 266fdb17a0..64820de18f 100644 --- a/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml +++ b/crd/nodenetworkconfig/manifests/acn.azure.com_nodenetworkconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: nodenetworkconfigs.acn.azure.com spec: group: acn.azure.com diff --git a/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml b/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml index 3aee990cf1..418691c2af 100644 --- a/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml +++ b/crd/overlayextensionconfig/manifests/acn.azure.com_overlayextensionconfigs.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: overlayextensionconfigs.acn.azure.com spec: group: acn.azure.com