bump: nmstate-2.2.35

Signed-off-by: Enrique Llorente <[email protected]>

Author: qinqon

Makefile

@@ -4,7 +4,7 @@
 SHELL := /bin/bash
 OUTPUT_DIR=${CURDIR}/.output
 
-NMSTATE_VERSION ?= 2.2.34
+NMSTATE_VERSION ?= 2.2.35
 NMSTATE_E2E_VERSION ?= 2.2.33# We are missing the dumps from newer releases this is the fix https://github.com/nmstate/nmstate/pull/2797
 NMSTATE_REPO ?= https://github.com/nmstate/nmstate
 NMSTATE_SOURCE_TARBALL_URL ?= https://github.com/nmstate/nmstate/archive/refs/tags/v${NMSTATE_VERSION}.tar.gz

src/bin/nmstate-kubernetes-go-apigen/main.rs

@@ -516,7 +516,10 @@ import (
     fn parse_field_path_type(&mut self, t: syn::TypePath, field_context: &mut FieldContext) {
         if let Some(last_segment) = t.path.segments.last() {
             let last_segment_name = last_segment.ident.to_string();
-            if last_segment_name == "Option" || last_segment_name == "Vec" {
+            if last_segment_name == "Option"
+                || last_segment_name == "Vec"
+                || last_segment_name == "Box"
+            {
                 self.emitter
                     .emit_type_name(last_segment_name, field_context);
                 if let syn::PathArguments::AngleBracketed(ab) = last_segment.arguments.clone() {
@@ -905,6 +908,8 @@ impl GolangEmitter {
                 self.emit_optional();
             }
             self.output.push_str("InterfaceIP");
+        } else if type_name == "Box" {
+            //no-op
         } else {
             if field_ctx.is_optional {
                 self.emit_optional();

test/crd/nmstate.io_clusternetworkstate.yaml

@@ -173,6 +173,15 @@ spec:
                               type: array
                             identity:
                               type: string
+                            password:
+                              description: |-
+                                Password  Deserialize and serialize from/to `password`.
+                                Replaced to `<_password_hid_by_nmstate>` when querying.
+                              type: string
+                            phase2-auth:
+                              description: Phase2Auth  Deserialize and serialize from/to
+                                `phase2-auth`.
+                              type: string
                             private-key:
                               description: PrivateKey  Deserialize and serialize from/to
                                 `private-key`.
@@ -2308,12 +2317,13 @@ spec:
                                 type: string
                               type: array
                             route-table-id:
+                              anyOf:
+                              - type: integer
+                              - type: string
                               description: |-
                                 TableID  Route table ID of this VRF interface.
-                                Use 0 to preserve current `table_id`.
                                 Deserialize and serialize from/to `route-table-id`.
-                              format: int32
-                              type: integer
+                              x-kubernetes-int-or-string: true
                           required:
                           - port
                           type: object

v2/zz_generated.deepcopy.go

@@ -251,6 +251,11 @@ type Ieee8021XConfig struct {
 	// PrivateKeyPassword  Deserialize and serialize from/to `private-key-password`.
 	// Replaced to `<_password_hid_by_nmstate>` when querying.
 	PrivateKeyPassword *string `json:"private-key-password,omitempty"`
+	// Phase2Auth  Deserialize and serialize from/to `phase2-auth`.
+	Phase2Auth *string `json:"phase2-auth,omitempty"`
+	// Password  Deserialize and serialize from/to `password`.
+	// Replaced to `<_password_hid_by_nmstate>` when querying.
+	Password *string `json:"password,omitempty"`
 }
 
 // +k8s:deepcopy-gen=true
@@ -1958,9 +1963,8 @@ type VrfConfig struct {
 	// Also deserialize from `ports`.
 	Port *[]string `json:"port"`
 	// TableID  Route table ID of this VRF interface.
-	// Use 0 to preserve current `table_id`.
 	// Deserialize and serialize from/to `route-table-id`.
-	TableID uint32 `json:"route-table-id,omitempty"`
+	TableID *intstr.IntOrString `json:"route-table-id,omitempty"`
 }
 
 // InfiniBandInterface  IP over InfiniBand interface. The example yaml output of a