Skip to content

Align with cluster-compare v4.19.0 diff #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

sferlin
Copy link

@sferlin sferlin commented Jul 2, 2025

cluster-compare (v4.19.0) is accusing a diff from this manifest, which also seems to have a typo (with the wrong ignition config version) in the reference:

Cluster CR: machineconfiguration.openshift.io/v1_MachineConfig_load-sctp-module
Reference File: optional/other/sctp_module_mc.yaml
Description:
  https://docs.openshift.com/container-platform/4.17/scalability_and_performance/telco_ref_design_specs/core/telco-core-ref-crs.html#node-configuration-crs_ran-core-ref-design-crs
Diff Output: diff -u -N /tmp/MERGED-675760767/machineconfiguration-openshift-io-v1_machineconfig_load-sctp-module /tmp/LIVE-38140128/machineconfiguration-openshift-io-v1_machineconfig_load-sctp-module
--- /tmp/MERGED-675760767/machineconfiguration-openshift-io-v1_machineconfig_load-sctp-module	2025-07-02 07:49:01.583315484 +0000
+++ /tmp/LIVE-38140128/machineconfiguration-openshift-io-v1_machineconfig_load-sctp-module	2025-07-02 07:49:01.583315484 +0000
@@ -7,16 +7,16 @@
 spec:
   config:
     ignition:
-      version: 3.2.0
+      version: 2.2.0
     storage:
       files:
       - contents:
           source: data:,
+          verification: {}
+        filesystem: root
         mode: 420
-        overwrite: true
         path: /etc/modprobe.d/sctp-blacklist.conf
       - contents:
           source: data:,sctp
         mode: 420
-        overwrite: true
         path: /etc/modules-load.d/sctp-load.conf

CC: @imiller0

@akrzos
Copy link
Member

akrzos commented Jul 8, 2025

I ended up with the following diff in the last rebuild:

$ git diff ansible/roles/telco-core-manifests/templates/extra-manifests/sctp_module_mc.yaml
diff --git a/ansible/roles/telco-core-manifests/templates/extra-manifests/sctp_module_mc.yaml b/ansible/roles/telco-core-manifests/templates/extra-manifests/sctp_module_mc.yaml
index 17b1e0b..fa4969a 100644
--- a/ansible/roles/telco-core-manifests/templates/extra-manifests/sctp_module_mc.yaml
+++ b/ansible/roles/telco-core-manifests/templates/extra-manifests/sctp_module_mc.yaml
@@ -10,17 +10,16 @@ metadata:
 spec:
   config:
     ignition:
-      version: 2.2.0
+      version: 3.2.0
     storage:
       files:
-        - contents:
-            source: data:,
-            verification: {}
-          filesystem: root
-          mode: 420
-          path: /etc/modprobe.d/sctp-blacklist.conf
-        - contents:
-            source: data:text/plain;charset=utf-8;base64,c2N0cA==
-          filesystem: root
-          mode: 420
-          path: /etc/modules-load.d/sctp-load.conf
+      - path: /etc/modprobe.d/sctp-blacklist.conf
+        mode: 420
+        overwrite: true
+        contents:
+          source: data:,
+      - path: /etc/modules-load.d/sctp-load.conf
+        mode: 420
+        overwrite: true
+        contents:
+          source: data:text/plain;charset=utf-8;base64,c2N0cA==

Let me know if cluster-compare was happy with it and if you need help adjusting this PR to match.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants