Merge branch 'main' into split-image-mode-doc

Author: ggiguash

.golangci.yaml

@@ -1,7 +1,13 @@
+version: "2"
+
 run:
   timeout: 5m
   modules-download-mode: vendor
 
+exclusions:
+  rules:
+    - path: deps/
+
 linters:
   # https://golangci-lint.run/usage/linters/
   # Extra linters on top of default

.snyk

@@ -1,6 +1,7 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
 exclude:
   global:
+    - deps/**
     - origin/**
     - vendor/**
     - etcd/vendor/**

Makefile

@@ -2,6 +2,7 @@
 export SHELL := $(shell which bash)
 
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+GO_FILES ?=$(shell find . -name '*.go' -not -path '*/vendor/*' -not -path '*/_output/*' -not -path '*/deps/*' -print)
 
 # Include openshift build-machinery-go libraries
 include $(PROJECT_DIR)/vendor/github.com/openshift/build-machinery-go/make/golang.mk
@@ -30,6 +31,7 @@ PATCH := $(shell echo $(SOURCE_GIT_TAG) | awk -F'[._~-]' '{print $$3}')
 SRC_ROOT :=$(shell pwd)
 
 WITH_FLANNEL ?= 0
+WITH_TOPOLVM ?= 0
 OUTPUT_DIR :=_output
 RPM_BUILD_DIR :=$(OUTPUT_DIR)/rpmbuild
 CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin
@@ -268,6 +270,7 @@ rpm:
 	SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
 	SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
 	WITH_FLANNEL=${WITH_FLANNEL} \
+	WITH_TOPOLVM=${WITH_TOPOLVM} \
 	./packaging/rpm/make-rpm.sh rpm local
 .PHONY: rpm
 
@@ -278,6 +281,7 @@ srpm:
 	SOURCE_GIT_COMMIT=${SOURCE_GIT_COMMIT} \
 	SOURCE_GIT_TREE_STATE=${SOURCE_GIT_TREE_STATE} \
 	WITH_FLANNEL=${WITH_FLANNEL} \
+	WITH_TOPOLVM=${WITH_TOPOLVM} \
 	./packaging/rpm/make-rpm.sh srpm local
 .PHONY: srpm
 
@@ -295,6 +299,7 @@ rpm-podman:
 		--volume $$(pwd):/opt/microshift:z \
 		--env TARGET_ARCH=$(TARGET_ARCH) \
 		--env WITH_FLANNEL=$(WITH_FLANNEL) \
+		--env WITH_TOPOLVM=$(WITH_TOPOLVM) \
 		microshift-builder:$(RPM_BUILDER_IMAGE_TAG) \
 		bash -ilc 'cd /opt/microshift && make rpm & pid=$$! ; \
 				   trap "echo Killing make PID $${pid}; kill $${pid}" INT ; \
@@ -309,12 +314,15 @@ clean:
 	if [ -d '$(OUTPUT_DIR)' ]; then rm -rf '$(OUTPUT_DIR)'; fi
 .PHONY: clean
 
-vendor:
-	go mod vendor
+patch-deps:
 	for p in $(sort $(wildcard scripts/auto-rebase/rebase_patches/*.patch)); do \
 		echo "Applying patch $$p"; \
 		git mailinfo /dev/null /dev/stderr 2<&1- < $$p | git apply --reject || exit 1; \
 	done
+.PHONY: patch-deps
+
+vendor:
+	go mod vendor
 .PHONY: vendor
 
 # Update the etcd dependencies, including especially MicroShift itself.

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=32
-KUBE_GIT_VERSION=v1.32.3
-KUBE_GIT_COMMIT=d365efdad4f566821463becaf0d5551a1a5c322f
+KUBE_GIT_VERSION=v1.32.5
+KUBE_GIT_COMMIT=886f7c90e4bd137f91ebfb7d0cb55d476e719643
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-30-184112
+OCP_VERSION := 4.20.0-0.nightly-arm64-2025-06-03-221556

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.19.0-0.nightly-2025-03-30-191359
+OCP_VERSION := 4.20.0-0.nightly-2025-06-02-175911

README.md

@@ -48,7 +48,7 @@ To build MicroShift from source and contribute to its development, refer to the
 documentation in [contributor](./docs/contributor/README.md) folder.
 
 ## Community
-Community documentation sources are managed at <https://github.com/redhat-et/microshift-documentation> and published on <https://microshift.io>.
+Community build and CI sources managed at <https://github.com/microshift-io/microshift> and documentation sources are managed at <https://github.com/redhat-et/microshift-documentation> and published on <https://microshift.io>.
 
 To get started with MicroShift, please refer to the [Getting Started](https://microshift.io/docs/getting-started/) section of the MicroShift [User Documentation](https://microshift.io/docs/user-documentation/).
 

assets/components/lvms/lvm.topolvm.io_lvmclusters.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   creationTimestamp: null
   name: lvmclusters.lvm.topolvm.io
 spec:
@@ -213,6 +213,26 @@ spec:
                               - Host
                               - Static
                               type: string
+                            metadataSize:
+                              anyOf:
+                              - type: integer
+                              - type: string
+                              description: |-
+                                MetadataSize specifies metadata size for thin pool. It used only when MetadataSizeCalculationPolicy
+                                is set to Static. No MetadataSize with a MetadataSizeCalculationPolicy set to Static will result in
+                                default metadata size of 1Gi. It can be between 2Mi and 16Gi due to the underlying limitations of lvm2.
+                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                              x-kubernetes-int-or-string: true
+                            metadataSizeCalculationPolicy:
+                              default: Host
+                              description: |-
+                                MetadataSizeCalculationPolicy specifies the policy to calculate metadata size for the underlying volume.
+                                When set to Host, the metadata size is calculated based on lvm2 default settings
+                                When set to Static, the metadata size is calculated based on the static size attribute provided within MetadataSize
+                              enum:
+                              - Host
+                              - Static
+                              type: string
                             name:
                               description: Name specifies a name for the thin pool.
                               type: string
@@ -286,16 +306,8 @@ spec:
               conditions:
                 description: Conditions describes the state of the resource.
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -336,12 +348,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
@@ -421,6 +428,8 @@ spec:
                             description: Status tells if the volume group was created
                               on the node
                             type: string
+                        required:
+                        - deviceDiscoveryPolicy
                         type: object
                       type: array
                   type: object

assets/components/lvms/lvm.topolvm.io_lvmvolumegroupnodestatuses.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   creationTimestamp: null
   name: lvmvolumegroupnodestatuses.lvm.topolvm.io
 spec:
@@ -94,6 +94,8 @@ spec:
                       description: Status tells if the volume group was created on
                         the node
                       type: string
+                  required:
+                  - deviceDiscoveryPolicy
                   type: object
                 type: array
             type: object

assets/components/lvms/lvm.topolvm.io_lvmvolumegroups.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.15.0
+    controller-gen.kubebuilder.io/version: v0.16.5
   creationTimestamp: null
   name: lvmvolumegroups.lvm.topolvm.io
 spec:
@@ -176,6 +176,26 @@ spec:
                     - Host
                     - Static
                     type: string
+                  metadataSize:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      MetadataSize specifies metadata size for thin pool. It used only when MetadataSizeCalculationPolicy
+                      is set to Static. No MetadataSize with a MetadataSizeCalculationPolicy set to Static will result in
+                      default metadata size of 1Gi. It can be between 2Mi and 16Gi due to the underlying limitations of lvm2.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  metadataSizeCalculationPolicy:
+                    default: Host
+                    description: |-
+                      MetadataSizeCalculationPolicy specifies the policy to calculate metadata size for the underlying volume.
+                      When set to Host, the metadata size is calculated based on lvm2 default settings
+                      When set to Static, the metadata size is calculated based on the static size attribute provided within MetadataSize
+                    enum:
+                    - Host
+                    - Static
+                    type: string
                   name:
                     description: Name specifies a name for the thin pool.
                     type: string