Merge branch 'main' into greenboot-restart-replacement

Author: ggiguash

Makefile.kube_git.var

@@ -1,5 +1,5 @@
 KUBE_GIT_MAJOR=1
 KUBE_GIT_MINOR=34
 KUBE_GIT_VERSION=v1.34.2
-KUBE_GIT_COMMIT=581cfc7ee3313c212378878350aec16236e3f155
+KUBE_GIT_COMMIT=e4a4167c40c9ed543c5a80f2e08cc73696f7a4f6
 KUBE_GIT_TREE_STATE=clean

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-arm64-2026-01-16-012506
+OCP_VERSION := 4.22.0-0.nightly-arm64-2026-01-22-020204

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.22.0-0.nightly-2026-01-14-031657
+OCP_VERSION := 4.22.0-0.nightly-2026-01-21-145520

ansible/roles/setup-microshift-host/defaults/main.yml

@@ -25,5 +25,6 @@ install_packages:
   - tar
   - vnstat
 
-vg_name: rhel
+default_vg_name: microshift
+vg_name: "{{ default_vg_name }}"
 lvm_disk: /dev/xvdb

ansible/roles/setup-microshift-host/tasks/main.yml

@@ -72,9 +72,17 @@
     - lvm_disk_stat is defined
     - not lvm_disk_stat.stat.exists
 
+- name: Check if volume group exists
+  ansible.builtin.command: vgdisplay -s {{ vg_name }}
+  register: vg_exists
+  changed_when: false
+  failed_when: false
+
 - name: Configure TopoLVM storage
   include_tasks: storage.yml
-  when: rhel_vg_present.rc == 0 or (lvm_disk_stat is defined and lvm_disk_stat.stat.exists)
+  when:
+    - vg_name != default_vg_name
+    - vg_exists.rc == 0
 
 - name: upgrade all packages
   ansible.builtin.dnf:

ansible/roles/setup-microshift-host/tasks/storage.yml

@@ -1,29 +1,23 @@
 ---
 # Configure TopoLVM storage for MicroShift
+# Only needed when using a non-default volume group name.
+# MicroShift auto-detects a VG named "microshift" without explicit config.
 
-- name: Detect largest volume group for TopoLVM
-  ansible.builtin.shell: |
-    vgs --noheadings --units g -o vg_name,vg_size --sort -vg_size | head -1 | awk '{print $1}'
-  register: largest_vg
-  changed_when: false
-  failed_when: false
+- name: Ensure /etc/microshift directory exists
+  ansible.builtin.file:
+    path: /etc/microshift
+    state: directory
+    owner: root
+    group: root
+    mode: '0755'
 
-- name: Configure TopoLVM with detected volume group
-  when: 
-    - largest_vg.rc == 0
-    - largest_vg.stdout | length > 0
-  block:
-    - name: Display detected volume group
-      ansible.builtin.debug:
-        msg: "Configuring TopoLVM to use volume group: {{ largest_vg.stdout }}"
-
-    - name: Deploy lvmd.yaml configuration
-      ansible.builtin.template:
-        src: lvmd.yaml.j2
-        dest: /etc/microshift/lvmd.yaml
-        owner: root
-        group: root
-        mode: '0644'
-        backup: yes
-      vars:
-        topolvm_vg: "{{ largest_vg.stdout }}"
+- name: Deploy lvmd.yaml configuration
+  ansible.builtin.template:
+    src: lvmd.yaml.j2
+    dest: /etc/microshift/lvmd.yaml
+    owner: root
+    group: root
+    mode: '0644'
+    backup: yes
+  vars:
+    topolvm_vg: "{{ vg_name }}"

assets/components/multus/kustomization.aarch64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:6cc8354ae22397bc2d52f3fc35bea7ed49392184a6bfb4ef522f98e71a184251
+    digest: sha256:b9a0e4963b1a4e5002bae98109bf15ccb3fcb8280d0a5dde94726083acce1cc0
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:43802f3ee739768c8f40ac924cb3df15fbfbfca21c8ab6005ddc65800e7fe3b0
+    digest: sha256:34c187d2223ed134a67df3be0c24eaed5a85cb2fedab0e5e0ef92df6fe65d4d3

assets/components/multus/kustomization.x86_64.yaml

@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:c13ad07fc7ce0dbc3feac025968f7293d847be375e04a68661c758dffd69fd27
+    digest: sha256:cb82081243f679964417f9a2c76f60c76ad3f0cdadc7c3bd450de656f40bec8b
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:f51abd304c94265dea2a6850e737ef74d022a565781c794c05deff9b2655e9c2
+    digest: sha256:68bef2d5f6425add35ef68ec143e7df47686216273bacf6cad53d9630c4bce1f

assets/components/multus/release-multus-aarch64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-01-16-012506"
+    "base": "4.22.0-0.nightly-arm64-2026-01-22-020204"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cc8354ae22397bc2d52f3fc35bea7ed49392184a6bfb4ef522f98e71a184251",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43802f3ee739768c8f40ac924cb3df15fbfbfca21c8ab6005ddc65800e7fe3b0"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9a0e4963b1a4e5002bae98109bf15ccb3fcb8280d0a5dde94726083acce1cc0",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34c187d2223ed134a67df3be0c24eaed5a85cb2fedab0e5e0ef92df6fe65d4d3"
   }
 }

assets/components/multus/release-multus-x86_64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-01-14-031657"
+    "base": "4.22.0-0.nightly-2026-01-21-145520"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c13ad07fc7ce0dbc3feac025968f7293d847be375e04a68661c758dffd69fd27",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f51abd304c94265dea2a6850e737ef74d022a565781c794c05deff9b2655e9c2"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb82081243f679964417f9a2c76f60c76ad3f0cdadc7c3bd450de656f40bec8b",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68bef2d5f6425add35ef68ec143e7df47686216273bacf6cad53d9630c4bce1f"
   }
 }