Skip to content

acm import cleanups #214

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.

Sign up for GitHub

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

Merged
mbaldessari merged 1 commit into from
Nov 26, 2025
Merged

acm import cleanups #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acm_import/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion acm_import/roles/acm_import/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
clustergroup: group-one
clustergroup_label: group-one
ocm_iam_policy_controller: true
ocm_search_controller: true
ocm_policy_controller: true
Expand Down
2 changes: 1 addition & 1 deletion acm_import/roles/acm_import/templates/klusterletaddonconfig.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion acm_import/roles/acm_import/templates/managedcluster.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down