From 5ae3924234f9ffaa2ffda7e9fc52c2b3518a85e2 Mon Sep 17 00:00:00 2001
From: opswill <will@nixops.org>
Date: Tue, 17 Jun 2025 23:02:07 +0800
Subject: container: T7473: fix show/monitor container log failed when
 log-driver is journald

---
 interface-definitions/container.xml.in             | 43 ++++++++++++----------
 .../include/version/container-version.xml.i        |  2 +-
 2 files changed, 25 insertions(+), 20 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in
index 434bf7528..f20fd7690 100644
--- a/interface-definitions/container.xml.in
+++ b/interface-definitions/container.xml.in
@@ -532,6 +532,30 @@
               </leafNode>
             </children>
           </tagNode>
+          <leafNode name="log-driver">
+            <properties>
+              <help>Configure container log driver</help>
+              <completionHelp>
+                <list>k8s-file journald none</list>
+              </completionHelp>
+              <valueHelp>
+                <format>k8s-file</format>
+                <description>Logs to plain-text file</description>
+              </valueHelp>
+              <valueHelp>
+                <format>journald</format>
+                <description>Logs to systemd's journal</description>
+              </valueHelp>
+                <valueHelp>
+                <format>none</format>
+                <description>Disable logging for the container</description>
+              </valueHelp>
+              <constraint>
+                <regex>(k8s-file|journald|none)</regex>
+              </constraint>
+            </properties>
+             <defaultValue>journald</defaultValue>
+          </leafNode>
         </children>
       </tagNode>
       <tagNode name="network">
@@ -627,25 +651,6 @@
           </node>
         </children>
       </tagNode>
-      <leafNode name="log-driver">
-        <properties>
-          <help>Configure container log driver</help>
-          <completionHelp>
-            <list>k8s-file journald</list>
-          </completionHelp>
-          <valueHelp>
-            <format>k8s-file</format>
-            <description>Logs to plain-text json file</description>
-          </valueHelp>
-          <valueHelp>
-            <format>journald</format>
-            <description>Logs to systemd's journal</description>
-          </valueHelp>
-          <constraint>
-            <regex>(k8s-file|journald)</regex>
-          </constraint>
-        </properties>
-      </leafNode>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/interface-definitions/include/version/container-version.xml.i b/interface-definitions/include/version/container-version.xml.i
index ed6e942cd..046bacfdc 100644
--- a/interface-definitions/include/version/container-version.xml.i
+++ b/interface-definitions/include/version/container-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/container-version.xml.i -->
-<syntaxVersion component='container' version='2'></syntaxVersion>
+<syntaxVersion component='container' version='3'></syntaxVersion>
 <!-- include end -->
-- 
cgit v1.2.3