Skip to content

Add hub side templates for overlay policy #51

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

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

Add hub side templates for overlay policy #51

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
5 changes: 5 additions & 0 deletions ansible/roles/telco-core-ztp/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy-applications/"
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/"
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/"
- "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/"

- name: Create Telco Core ZTP kustomization files in cnf-features-deploy
template:
Expand Down Expand Up @@ -45,6 +46,10 @@
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/"
- src: release-{{ telco_core_profile_version }}/ns.yaml
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/"
- src: release-{{ telco_core_profile_version }}/regional.yaml
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/"
- src: release-{{ telco_core_profile_version }}/hw-types.yaml
dest: "{{ install_directory }}/rhacm-ztp/cnf-features-deploy/ztp/gitops-subscriptions/argocd/policy/telco-core/template-values/"

- name: Copy directory of Telco Core reference CRs into cnf-features-deploy
ansible.builtin.copy:
Expand Down
7 changes: 3 additions & 4 deletions ansible/roles/telco-core-ztp/templates/policy-kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
generators:
- core-baseline.yaml
# Overlay commented out until template-value ConfigMaps completed
# - core-overlay.yaml
- core-overlay.yaml
# - core-upgrade.yaml

resources:
- ns.yaml
# - template-values/regional.yaml
# - template-values/hw-types.yaml
- template-values/regional.yaml
- template-values/hw-types.yaml
22 changes: 22 additions & 0 deletions ansible/roles/telco-core-ztp/templates/release-4.18/hw-types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: hw-types
namespace: ztp-core-policies
data:
role-worker-1-reserved: "0,1,32,33"
role-worker-1-isolated: "2-30,34-62,3-31,35-63"
role-worker-1-hugepg-cnt: "6"

role-worker-2-reserved: "0,1,32,33"
role-worker-2-isolated: "2-30,34-62,3-31,35-63"
role-worker-2-hugepg-cnt: "6"

role-worker-3-reserved: "0,1,32,33"
role-worker-3-isolated: "2-30,34-62,3-31,35-63"
role-worker-3-hugepg-cnt: "6"
Comment on lines +8 to +18
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to decide what this looks like for Telco-Core RDS testing @sferlin and @Noreen21 (Do we want/need 3 different performance profiles for worker nodes, I also saw more than one huge page count on the actual environment so we would want to adjust this and the manifest it is read by to read a 2nd count of huge pages.)


nic-config-type-1-sriov-dev1: ens1f0
nic-config-type-1-sriov-dev2: eno1np0
nic-config-type-1-sriov-numvf: "8"
9 changes: 9 additions & 0 deletions ansible/roles/telco-core-ztp/templates/release-4.18/regional.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
name: regional
namespace: ztp-core-policies
data:
zone-1-log-url: tcp://10.11.12.13:9002/test
zone-2-log-url: "tcp://192.168.100.100:9002/test"