Skip to content
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

Cleanup labels on siteconfigs and manifests for ACM Scale Testing #544

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Cleanup labels on siteconfigs and manifests for ACM Scale Testing #544

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
8 changes: 5 additions & 3 deletions ansible/roles/hv-vm-manifests-compact/templates/manifest.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,13 @@ kind: ManagedCluster
metadata:
name: compact-{{ '%05d' | format(item) }}
labels:
common: 'true'
common-mno: 'true'
group-du-3node: ''
name: compact-{{ '%05d' | format(item) }}
vendor: OpenShift
observability: disabled
common: "true"
group-du-3node: ""
sites: compact-{{ '%05d' | format(item) }}
vendor: OpenShift
spec:
hubAcceptsClient: true
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/hv-vm-manifests-compact/templates/siteconfig.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ spec:
common-mno: 'true'
group-du-3node: ''
name: compact-{{ '%05d' | format(item) }}
sites: compact-{{ '%05d' | format(item) }}
vendor: OpenShift
{% if siteconfig_observability %}
observability: enabled
{% else %}
observability: disabled
{% endif %}
sites: compact-{{ '%05d' | format(item) }}
vendor: OpenShift
clusterNetwork:
- cidr: {{ "fd01::/48" if hostvars[groups['hv_vm'][((item - 1) * compact_cluster_node_count)]]['hv_ip'] | ansible.utils.ipv6 else "10.128.0.0/14" }}
hostPrefix: {{ compact_cluster_network_host_prefix }}
Expand Down
9 changes: 5 additions & 4 deletions ansible/roles/hv-vm-manifests-jumbo/templates/manifest.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,13 @@ kind: ManagedCluster
metadata:
name: jumbocluster00
labels:
# common: 'true'
# common-mno: 'true'
# group-du-standard: ''
name: jumbocluster00
vendor: OpenShift
observability: disabled
# common: "true"
# group-du-sno: ""
# group-sno-du: "true"
sites: jumbocluster00
vendor: OpenShift
spec:
hubAcceptsClient: true
{% endif %}
Expand Down
8 changes: 4 additions & 4 deletions ansible/roles/hv-vm-manifests-sno/templates/manifest.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ kind: ManagedCluster
metadata:
name: {{ inventory_hostname }}
labels:
common: 'true'
group-du-sno: ''
name: {{ inventory_hostname }}
vendor: OpenShift
observability: disabled
common: "true"
group-du-sno: ""
group-sno-du: "true"
sites: {{ inventory_hostname }}
vendor: OpenShift
spec:
hubAcceptsClient: true
{% endif %}
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/hv-vm-manifests-sno/templates/siteconfig.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,18 @@ spec:
{% endif %}
clusterLabels:
common: 'true'
group-du-sno: ''
{% if siteconfig_sno_du_profile in ["4.12", "4.13", "4.14", "4.15", "4.16"] %}
du-profile: "{{ siteconfig_sno_du_profile }}"
{% endif %}
group-du-sno: ''
name: {{ inventory_hostname }}
sites: {{ inventory_hostname }}
vendor: OpenShift
{% if siteconfig_observability %}
observability: enabled
{% else %}
observability: disabled
{% endif %}
sites: {{ inventory_hostname }}
vendor: OpenShift
clusterNetwork:
- cidr: {{ "fd01::/48" if hostvars[inventory_hostname]['ip'] | ansible.utils.ipv6 else "10.128.0.0/14" }}
hostPrefix: {{ sno_cluster_network_host_prefix }}
Expand Down
8 changes: 5 additions & 3 deletions ansible/roles/hv-vm-manifests-standard/templates/manifest.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,17 @@ kind: ManagedCluster
metadata:
name: standard-{{ '%05d' | format(item) }}
labels:
common: 'true'
common-mno: 'true'
group-du-standard: ''
name: standard-{{ '%05d' | format(item) }}
vendor: OpenShift
{% if manifest_observability %}
observability: enabled
{% else %}
observability: disabled
{% endif %}
common: "true"
group-du-standard: ""
sites: standard-{{ '%05d' | format(item) }}
vendor: OpenShift
spec:
hubAcceptsClient: true
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/hv-vm-manifests-standard/templates/siteconfig.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ spec:
common-mno: 'true'
group-du-standard: ''
name: standard-{{ '%05d' | format(item) }}
sites: standard-{{ '%05d' | format(item) }}
vendor: OpenShift
{% if siteconfig_observability %}
observability: enabled
{% else %}
observability: disabled
{% endif %}
sites: standard-{{ '%05d' | format(item) }}
vendor: OpenShift
clusterNetwork:
- cidr: {{ "fd01::/48" if hostvars[groups['hv_vm'][((item - 1) * standard_cluster_node_count)]]['hv_ip'] | ansible.utils.ipv6 else "10.128.0.0/14" }}
hostPrefix: {{ standard_cluster_network_host_prefix }}
Expand Down