Rename to clustergroup_label

mbaldessari · mbaldessari · commit 90c139192397 · 2025-11-26T17:01:42.000Z
diff --git a/acm_import/Makefile b/acm_import/Makefile
@@ -7,4 +7,4 @@ help:
 
 .PHONY: import
 import: ## Imports SPOKECONFIG into HUBCONFIG defined clusters
-	ansible-playbook -e clustergroup=$(CLUSTERGROUP) post.yml
+	ansible-playbook -e clustergroup_label=$(CLUSTERGROUP) post.yml
diff --git a/acm_import/roles/acm_import/defaults/main.yml b/acm_import/roles/acm_import/defaults/main.yml
@@ -1,4 +1,4 @@
-clustergroup: group-one
+clustergroup_label: group-one
 ocm_iam_policy_controller: true
 ocm_search_controller: true
 ocm_policy_controller: true
diff --git a/acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2 b/acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2
@@ -11,7 +11,7 @@ spec:
     cloud: auto-detect
     name: {{ region_cluster_name }}
     vendor: auto-detect
-    clusterGroup: {{ clustergroup }}
+    clusterGroup: {{ clustergroup_label }}
   iamPolicyController:
     enabled: {{ ocm_iam_policy_controller }}
   searchCollector:
diff --git a/acm_import/roles/acm_import/templates/managedcluster.yml.j2 b/acm_import/roles/acm_import/templates/managedcluster.yml.j2
@@ -7,7 +7,7 @@ metadata:
     name: {{ region_cluster_name }}
     vendor: auto-detect
     cloud: auto-detect
-    clusterGroup: {{ clustergroup }}
+    clusterGroup: {{ clustergroup_label }}
 spec:
   hubAcceptsClient: true
   leaseDurationSeconds: 60

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-clustergroup: group-one`
	`1`	`+clustergroup_label: group-one`
`2`	`2`	`ocm_iam_policy_controller: true`
`3`	`3`	`ocm_search_controller: true`
`4`	`4`	`ocm_policy_controller: true`