Skip to content

Commit cfe6efb

Browse files
committed
Updated comparision
Signed-off-by: kunal-511 <yoyokvunal@gmail.com>
1 parent 09e3aed commit cfe6efb

File tree

6 files changed

+37
-10
lines changed

6 files changed

+37
-10
lines changed

manifests/v1beta1/installs/katib-cert-manager/katib-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: config.kubeflow.org/v1beta1
23
kind: KatibConfig
34
init:

manifests/v1beta1/installs/katib-external-db/katib-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: config.kubeflow.org/v1beta1
23
kind: KatibConfig
34
init:

manifests/v1beta1/installs/katib-leader-election/katib-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: config.kubeflow.org/v1beta1
23
kind: KatibConfig
34
init:

manifests/v1beta1/installs/katib-openshift/katib-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: config.kubeflow.org/v1beta1
23
kind: KatibConfig
34
init:

manifests/v1beta1/installs/katib-standalone-postgres/katib-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: config.kubeflow.org/v1beta1
23
kind: KatibConfig
34
init:

scripts/compare_manifests.py

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,22 @@ def load_manifests(file_path: str) -> List[Dict]:
1515
content = f.read()
1616

1717
docs = []
18-
for doc_str in content.split('---'):
19-
doc_str = doc_str.strip()
20-
if doc_str:
21-
try:
22-
doc = yaml.safe_load(doc_str)
23-
if doc:
24-
docs.append(doc)
25-
except yaml.YAMLError as e:
26-
print(f"Error parsing YAML: {e}")
27-
continue
18+
try:
19+
for doc in yaml.safe_load_all(content):
20+
if doc:
21+
docs.append(doc)
22+
except yaml.YAMLError as e:
23+
print(f"Error parsing YAML: {e}")
24+
for doc_str in content.split('---'):
25+
doc_str = doc_str.strip()
26+
if doc_str:
27+
try:
28+
doc = yaml.safe_load(doc_str)
29+
if doc:
30+
docs.append(doc)
31+
except yaml.YAMLError as e:
32+
print(f"Error parsing YAML document: {e}")
33+
continue
2834

2935
return docs
3036

@@ -99,6 +105,22 @@ def normalize_manifest(manifest: Dict) -> Dict:
99105

100106
# Normalize Kustomize hash references
101107
normalized = normalize_kustomize_refs(normalized)
108+
109+
# Handle ConfigMap data normalization
110+
if normalized.get('kind') == 'ConfigMap' and 'data' in normalized:
111+
data = normalized['data']
112+
normalized_data = {}
113+
for key, value in data.items():
114+
if isinstance(value, str):
115+
# Remove leading/trailing whitespace and normalize YAML content
116+
normalized_value = value.strip()
117+
# Remove leading --- if present (common in ConfigMap YAML data)
118+
if normalized_value.startswith('---'):
119+
normalized_value = normalized_value[3:].strip()
120+
normalized_data[key] = normalized_value
121+
else:
122+
normalized_data[key] = value
123+
normalized['data'] = normalized_data
102124

103125
if 'metadata' in normalized and 'name' in normalized['metadata']:
104126
kind = normalized.get('kind', '')

0 commit comments

Comments
 (0)