merging master commits

ztp/kube-compare-reference/default_value.yaml

@@ -26,11 +26,19 @@ optional_ptp_config_PtpConfigBoundary:
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigBoundaryForEvent:
 - spec:
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigDualCardGmWpc:
 - spec:
     profile:
@@ -50,37 +58,57 @@ optional_ptp_config_PtpConfigDualCardGmWpc:
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigForHA:
 - spec:
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    domainNumber: 24
 optional_ptp_config_PtpConfigForHAForEvent:
 - spec:
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    domainNumber: 24
 optional_ptp_config_PtpConfigMaster:
 - spec:
     profile:
     - interface: $interface
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigMasterForEvent:
 - spec:
     profile:
     - interface: $interface
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigSlave:
 - spec:
     profile:
     - interface: $interface
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigGmWpc:
 - spec:
     profile:
@@ -95,13 +123,21 @@ optional_ptp_config_PtpConfigGmWpc:
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpConfigSlaveForEvent:
 - spec:
     profile:
     - interface: $interface
     recommend:
     - match:
       - nodeLabel: "node-role.kubernetes.io/$mcp"
+  captureGroup_defaults:
+    priority1: 128
+    priority2: 128
+    domainNumber: 24
 optional_ptp_config_PtpOperatorConfig:
 - spec:
     daemonNodeSelector:

ztp/kube-compare-reference/metadata.yaml

@@ -208,6 +208,8 @@ parts:
           - path: optional/ptp-config/PtpConfigBoundary.yaml
             config:
               perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
                 - pathToKey: spec.profile.0.ptp4lConf
                   inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigGmWpc.yaml
@@ -229,15 +231,49 @@ parts:
                 - pathToKey: spec.profile.0.ptp4lConf
                   inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigForHA.yaml
+            config:
+              perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigMaster.yaml
+            config:
+              perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
+                - pathToKey: spec.profile.0.ptp4lConf
+                  inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigSlave.yaml
+            config:
+              perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
+                - pathToKey: spec.profile.0.ptp4lConf
+                  inlineDiffFunc: capturegroups
           # TODO: If one of these 4 is selected, they should be paired with 'PtpOperatorConfigForEvent.yaml' above
           - path: optional/ptp-config/PtpConfigSlaveForEvent.yaml
+            config:
+              perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
+                - pathToKey: spec.profile.0.ptp4lConf
+                  inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigForHAForEvent.yaml
+            config:
+              perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigMasterForEvent.yaml
+            config:
+              perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
+                - pathToKey: spec.profile.0.ptp4lConf
+                  inlineDiffFunc: capturegroups
           - path: optional/ptp-config/PtpConfigBoundaryForEvent.yaml
             config:
               perField:
+                - pathToKey: spec.profile.0.phc2sysOpts
+                  inlineDiffFunc: capturegroups
                 - pathToKey: spec.profile.0.ptp4lConf
                   inlineDiffFunc: capturegroups
   - name: optional-console-disable

ztp/kube-compare-reference/optional/ptp-config/PtpConfigBoundary.yaml

@@ -9,7 +9,7 @@ spec:
   profile:
   - name: "boundary"
     ptp4lOpts: "-2"
-    phc2sysOpts: "-a -r -n 24"
+    phc2sysOpts: "-a -r -n (?<domainNumber>[0-9]+)"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -30,9 +30,9 @@ spec:
       #
       twoStepFlag 1
       slaveOnly 0
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 248
       clockAccuracy 0xFE

ztp/kube-compare-reference/optional/ptp-config/PtpConfigBoundaryForEvent.yaml

@@ -9,7 +9,7 @@ spec:
   profile:
   - name: "boundary"
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: "-a -r -m -n 24 -N 8 -R 16"
+    phc2sysOpts: "-a -r -m -n (?<domainNumber>[0-9]+) -N 8 -R 16"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -30,9 +30,9 @@ spec:
       #
       twoStepFlag 1
       slaveOnly 0
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 248
       clockAccuracy 0xFE

ztp/kube-compare-reference/optional/ptp-config/PtpConfigDualCardGmWpc.yaml

@@ -14,7 +14,7 @@ spec:
   {{- range .spec.profile }}
   - name: "grandmaster"
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: -r -u 0 -m -w -N 8 -R 16 -s (?<iface_timeTx1>[[:alnum:]]+) -n 24
+    phc2sysOpts: -r -u 0 -m -N 8 -R 16 -s (?<iface_timeTx1>[[:alnum:]]+) -n (?<domainNumber>[0-9]+)
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -137,9 +137,9 @@ spec:
       # Default Data Set
       #
       twoStepFlag 1
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 6
       clockAccuracy 0x27

ztp/kube-compare-reference/optional/ptp-config/PtpConfigForHA.yaml

@@ -9,7 +9,7 @@ spec:
   profile:
     - name: "boundary-ha"
       ptp4lOpts: ""
-      phc2sysOpts: "-a -r -n 24"
+      phc2sysOpts: "-a -r -n (?<domainNumber>[0-9]+)"
       ptpSchedulingPolicy: SCHED_FIFO
       ptpSchedulingPriority: 10
       ptpSettings:

ztp/kube-compare-reference/optional/ptp-config/PtpConfigForHAForEvent.yaml

@@ -9,7 +9,7 @@ spec:
   profile:
     - name: "boundary-ha"
       ptp4lOpts: ""
-      phc2sysOpts: "-a -r -m -n 24 -N 8 -R 16"
+      phc2sysOpts: "-a -r -m -n (?<domainNumber>[0-9]+) -N 8 -R 16"
       ptpSchedulingPolicy: SCHED_FIFO
       ptpSchedulingPriority: 10
       ptpSettings:

ztp/kube-compare-reference/optional/ptp-config/PtpConfigGmWpc.yaml

@@ -12,7 +12,7 @@ spec:
   {{- range .spec.profile }}
   - name: "grandmaster"
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: -r -u 0 -m -w -N 8 -R 16 -s (?<iface_timeTx>[[:alnum:]]+) -n 24
+    phc2sysOpts: -r -u 0 -m -N 8 -R 16 -s (?<iface_timeTx>[[:alnum:]]+) -n (?<domainNumber>[0-9]+)
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -122,9 +122,9 @@ spec:
       # Default Data Set
       #
       twoStepFlag 1
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 6
       clockAccuracy 0x27

ztp/kube-compare-reference/optional/ptp-config/PtpConfigMaster.yaml

@@ -14,7 +14,7 @@ spec:
     # The interface name is hardware-specific
     interface: {{ .interface }}
     ptp4lOpts: "-2"
-    phc2sysOpts: "-a -r -r -n 24"
+    phc2sysOpts: "-a -r -r -n (?<domainNumber>[0-9]+)"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -26,9 +26,9 @@ spec:
       #
       twoStepFlag 1
       slaveOnly 0
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 255
       clockAccuracy 0xFE

ztp/kube-compare-reference/optional/ptp-config/PtpConfigMasterForEvent.yaml

@@ -14,7 +14,7 @@ spec:
     # The interface name is hardware-specific
     interface: {{ .interface }}
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: "-a -r -m -n 24 -N 8 -R 16"
+    phc2sysOpts: "-a -r -m -n (?<domainNumber>[0-9]+) -N 8 -R 16"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -26,9 +26,9 @@ spec:
       #
       twoStepFlag 1
       slaveOnly 0
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 255
       clockAccuracy 0xFE

ztp/kube-compare-reference/optional/ptp-config/PtpConfigSlave.yaml

@@ -12,7 +12,7 @@ spec:
     # The interface name is hardware-specific
     interface: {{ .interface }}
     ptp4lOpts: "-2 -s"
-    phc2sysOpts: "-a -r -n 24"
+    phc2sysOpts: "-a -r -n (?<domainNumber>[0-9]+)"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -24,9 +24,9 @@ spec:
       #
       twoStepFlag 1
       slaveOnly 1
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 255
       clockAccuracy 0xFE

ztp/kube-compare-reference/optional/ptp-config/PtpConfigSlaveForEvent.yaml

@@ -12,7 +12,7 @@ spec:
     # The interface name is hardware-specific
     interface: {{ .interface }}
     ptp4lOpts: "-2 -s --summary_interval -4"
-    phc2sysOpts: "-a -r -m -n 24 -N 8 -R 16"
+    phc2sysOpts: "-a -r -m -n (?<domainNumber>[0-9]+) -N 8 -R 16"
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings:
@@ -24,9 +24,9 @@ spec:
       #
       twoStepFlag 1
       slaveOnly 1
-      priority1 128
-      priority2 128
-      domainNumber 24
+      priority1 (?<priority1>[0-9]+)
+      priority2 (?<priority2>[0-9]+)
+      domainNumber (?<domainNumber>[0-9]+)
       #utc_offset 37
       clockClass 255
       clockAccuracy 0xFE

ztp/kube-compare-reference/required/cluster-logging/ClusterLogNS.yaml

@@ -5,3 +5,5 @@ metadata:
   annotations:
     workload.openshift.io/allowed: management
     ran.openshift.io/ztp-deploy-wave: "2"
+  labels:
+    openshift.io/cluster-monitoring: "true"

ztp/resource-generator/Containerfile

@@ -1,5 +1,7 @@
+ARG ZTP_BUILD_IMAGE=registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18
+ARG ZTP_RUNTIME_IMAGE=ubi8-minimal
 # Builder
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18 as builder
+FROM ${ZTP_BUILD_IMAGE} as builder
 ARG IMAGE_REF
 USER root
 ENV PKG_ROOT=cnf-features-deploy
@@ -22,7 +24,7 @@ RUN make build
 RUN make build-pgt-plugin
 
 # Container image
-FROM ubi8-minimal
+FROM ${ZTP_RUNTIME_IMAGE}
 USER root
 ENV BUILDER_ZTP=/go/src/cnf-features-deploy/ztp
 ENV ZTP_HOME=/home/ztp

ztp/source-crs/ClusterLogNS.yaml

@@ -5,3 +5,5 @@ metadata:
   annotations:
     workload.openshift.io/allowed: management
     ran.openshift.io/ztp-deploy-wave: "2"
+  labels:
+    openshift.io/cluster-monitoring: "true"

ztp/source-crs/PtpConfigDualCardGmWpc.yaml

@@ -13,7 +13,7 @@ spec:
   profile:
   - name: "grandmaster"
     ptp4lOpts: "-2 --summary_interval -4"
-    phc2sysOpts: -r -u 0 -m -w -N 8 -R 16 -s (?<iface_timeTx1>[[:alnum:]]+) -n 24
+    phc2sysOpts: -r -u 0 -m -N 8 -R 16 -s (?<iface_timeTx1>[[:alnum:]]+) -n 24
     ptpSchedulingPolicy: SCHED_FIFO
     ptpSchedulingPriority: 10
     ptpSettings: