bump: nmstate-2.2.34

Signed-off-by: Enrique Llorente <[email protected]>
nmstate · Oct 3, 2024 · ae4ffc4 · ae4ffc4
1 parent 7ee7769
commit ae4ffc4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -4,11 +4,12 @@
 SHELL := /bin/bash
 OUTPUT_DIR=${CURDIR}/.output
 
-NMSTATE_VERSION ?= 2.2.33
+NMSTATE_VERSION ?= 2.2.34
+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
 export NMSTATE_SOURCE_INSTALL_DIR ?= ${OUTPUT_DIR}/nmstate-${NMSTATE_VERSION}
-export NMSTATE_E2E_DUMP ?= ${OUTPUT_DIR}/nmstate-${NMSTATE_VERSION}-e2e-dump
+export NMSTATE_E2E_DUMP ?= ${OUTPUT_DIR}/nmstate-${NMSTATE_E2E_VERSION}-e2e-dump
 
 GOLANGCI_LINT_VERSION ?= v1.52.2
 CONTROLLER_GEN_VERSION ?= v0.14.0 
@@ -21,7 +22,7 @@ ${GO_JUNIT_REPORT}:
 	go install github.com/jstemmer/go-junit-report/v2@latest
 
 ${NMSTATE_E2E_DUMP}:
-	hack/download-nmstate-e2e-assets.sh v${NMSTATE_VERSION} ${NMSTATE_SOURCE_INSTALL_DIR} ${NMSTATE_E2E_DUMP}
+	hack/download-nmstate-e2e-assets.sh v${NMSTATE_E2E_VERSION} ${NMSTATE_SOURCE_INSTALL_DIR} ${NMSTATE_E2E_DUMP}
 
 ${NMSTATE_SOURCE_INSTALL_DIR}: 
 	mkdir -p ${NMSTATE_SOURCE_INSTALL_DIR}

diff --git a/test/crd/nmstate.io_clusternetworkstate.yaml b/test/crd/nmstate.io_clusternetworkstate.yaml
@@ -2295,7 +2295,6 @@ spec:
                                 headers. Default to True if not defined.
                               type: boolean
                           required:
-                          - base-iface
                           - id
                           type: object
                         vrf:

diff --git a/v2/zz_generated.deepcopy.go b/v2/zz_generated.deepcopy.go
diff --git a/v2/zz_generated.types.go b/v2/zz_generated.types.go
@@ -1751,8 +1751,8 @@ type VlanInterface struct {
 
 // +k8s:deepcopy-gen=true
 type VlanConfig struct {
-	BaseIface string `json:"base-iface"`
-	ID        uint16 `json:"id"`
+	BaseIface *string `json:"base-iface,omitempty"`
+	ID        uint16  `json:"id"`
 	// Protocol  Could be `802.1q` or `802.1ad`. Default to `802.1q` if not defined.
 	Protocol *VlanProtocol `json:"protocol,omitempty"`
 	// RegistrationProtocol  Could be `gvrp`, `mvrp` or `none`. Default to none if not defined.