Skip to content

OCPBUGS-62684: Move enable-crun manifests out of optional manifests #531

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
sudomakeinstall2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-62684: Move enable-crun manifests out of optional manifests #531

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
1 change: 0 additions & 1 deletion telco-ran/configuration/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ checkSourceCRsAnnotation:
echo -n " $${sourcefile}: "; \
case "$${sourcefile}" in \
*/extra-manifest/* | \
*/optional-extra-manifest/* | \
*/machine-config/* | \
*/validatorCRs/* | \
*/MachineConfig* | \
Expand Down
4 changes: 2 additions & 2 deletions telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-3node-ranGen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,5 @@ policies:
machineconfiguration.openshift.io/role: "master"
priority: 18
profile: ran-du-performance
- path: source-crs/optional-extra-manifest/enable-crun-master.yaml
- path: source-crs/optional-extra-manifest/enable-crun-worker.yaml
- path: source-crs/extra-manifest/enable-crun-master.yaml
- path: source-crs/extra-manifest/enable-crun-worker.yaml
4 changes: 2 additions & 2 deletions telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-ranGen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ policies:
machineconfiguration.openshift.io/role: "master"
priority: 18
profile: ran-du-performance
- path: source-crs/optional-extra-manifest/enable-crun-master.yaml
- path: source-crs/optional-extra-manifest/enable-crun-worker.yaml
- path: source-crs/extra-manifest/enable-crun-master.yaml
- path: source-crs/extra-manifest/enable-crun-worker.yaml
# - path: source-crs/storage-lso/StorageClass.yaml
# patches:
# - metadata:
Expand Down
4 changes: 2 additions & 2 deletions telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-standard-ranGen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ policies:
machineconfiguration.openshift.io/role: "worker"
priority: 18
profile: ran-du-performance
- path: source-crs/optional-extra-manifest/enable-crun-master.yaml
- path: source-crs/optional-extra-manifest/enable-crun-worker.yaml
- path: source-crs/extra-manifest/enable-crun-master.yaml
- path: source-crs/extra-manifest/enable-crun-worker.yaml
4 changes: 2 additions & 2 deletions ...d/example/acmpolicygenerator/hub-side-templating/acm-group-du-3node-ranGen-templated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ policies:
machineconfiguration.openshift.io/role: "master"
priority: 18
profile: ran-du-performance
- path: source-crs/optional-extra-manifest/enable-crun-master.yaml
- path: source-crs/optional-extra-manifest/enable-crun-worker.yaml
- path: source-crs/extra-manifest/enable-crun-master.yaml
- path: source-crs/extra-manifest/enable-crun-worker.yaml
4 changes: 2 additions & 2 deletions ...ocd/example/acmpolicygenerator/hub-side-templating/acm-group-du-sno-ranGen-templated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ policies:
machineconfiguration.openshift.io/role: "master"
priority: 18
profile: ran-du-performance
- path: source-crs/optional-extra-manifest/enable-crun-master.yaml
- path: source-crs/optional-extra-manifest/enable-crun-worker.yaml
- path: source-crs/extra-manifest/enable-crun-master.yaml
- path: source-crs/extra-manifest/enable-crun-worker.yaml
# - path: source-crs/storage-lso/StorageClass.yaml
# patches:
# - metadata:
Expand Down
4 changes: 2 additions & 2 deletions ...xample/acmpolicygenerator/hub-side-templating/acm-group-du-standard-ranGen-templated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ policies:
machineconfiguration.openshift.io/role: "worker"
priority: 18
profile: ran-du-performance
- path: source-crs/optional-extra-manifest/enable-crun-master.yaml
- path: source-crs/optional-extra-manifest/enable-crun-worker.yaml
- path: source-crs/extra-manifest/enable-crun-master.yaml
- path: source-crs/extra-manifest/enable-crun-worker.yaml
6 changes: 3 additions & 3 deletions telco-ran/configuration/argocd/example/policygentemplates/group-du-3node-ranGen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ spec:
# Include these CRs in the group PGT instead of the common PGT to make sure
# they are applied after the operators have been successfully installed,
# however, it's strongly recommended to include these CRs as day-0 extra manifests
# to avoid the risky of an extra reboot.
- fileName: optional-extra-manifest/enable-crun-master.yaml
# to avoid the risk of an extra reboot.
- fileName: extra-manifest/enable-crun-master.yaml
policyName: "config-policy"
- fileName: optional-extra-manifest/enable-crun-worker.yaml
- fileName: extra-manifest/enable-crun-worker.yaml
policyName: "config-policy"
#
# NMState operator is used for IPsec configuration with NMState
Expand Down
4 changes: 2 additions & 2 deletions telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-ranGen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ spec:
# they are applied after the operators have been successfully installed,
# however, it's strongly recommended to include these CRs as day-0 extra manifests
# to avoid the risky of an extra reboot.
- fileName: optional-extra-manifest/enable-crun-master.yaml
- fileName: extra-manifest/enable-crun-master.yaml
policyName: "config-policy"
- fileName: optional-extra-manifest/enable-crun-worker.yaml
- fileName: extra-manifest/enable-crun-worker.yaml
policyName: "config-policy"
# --- sources needed for image registry (check ImageRegistry.md for more details)----
# - fileName: storage-lso/StorageClass.yaml
Expand Down
4 changes: 2 additions & 2 deletions telco-ran/configuration/argocd/example/policygentemplates/group-du-standard-ranGen.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ spec:
# they are applied after the operators have been successfully installed,
# however, it's strongly recommended to include these CRs as day-0 extra manifests
# to avoid an extra reboot of the master nodes.
- fileName: optional-extra-manifest/enable-crun-master.yaml
- fileName: extra-manifest/enable-crun-master.yaml
policyName: "config-policy"
- fileName: optional-extra-manifest/enable-crun-worker.yaml
- fileName: extra-manifest/enable-crun-worker.yaml
policyName: "config-policy"
#
# NMState operator is used for IPsec configuration with NMState
Expand Down
6 changes: 3 additions & 3 deletions ...rgocd/example/policygentemplates/hub-side-templating/group-du-3node-ranGen-templated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ spec:
# Include these CRs in the group PGT instead of the common PGT to make sure
# they are applied after the operators have been successfully installed,
# however, it's strongly recommended to include these CRs as day-0 extra manifests
# to avoid the risky of an extra reboot.
- fileName: optional-extra-manifest/enable-crun-master.yaml
# to avoid the risk of an extra reboot.
- fileName: extra-manifest/enable-crun-master.yaml
policyName: "group-du-3nc-cfg-pc"
- fileName: optional-extra-manifest/enable-crun-worker.yaml
- fileName: extra-manifest/enable-crun-worker.yaml
policyName: "group-du-3nc-cfg-pc"
6 changes: 3 additions & 3 deletions .../argocd/example/policygentemplates/hub-side-templating/group-du-sno-ranGen-templated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ spec:
# Include these CRs in the group PGT instead of the common PGT to make sure
# they are applied after the operators have been successfully installed,
# however, it's strongly recommended to include these CRs as day-0 extra manifests
# to avoid the risky of an extra reboot.
- fileName: optional-extra-manifest/enable-crun-master.yaml
# to avoid the risk of an extra reboot.
- fileName: extra-manifest/enable-crun-master.yaml
policyName: "gr-du-sno-cfg-pc-templated"
- fileName: optional-extra-manifest/enable-crun-worker.yaml
- fileName: extra-manifest/enable-crun-worker.yaml
policyName: "gr-du-sno-cfg-pc-templated"
###
# # ---- START OF source CRs needed for image registry (check ImageRegistry.md for more details) ----
Expand Down
4 changes: 2 additions & 2 deletions ...cd/example/policygentemplates/hub-side-templating/group-du-standard-ranGen-templated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
# Include these CRs in the group PGT instead of the common PGT to make sure they are applied
# after the operators have been successfully installed, however, it's strongly recommended
# to include these CRs as day-0 extra manifests to avoid an extra reboot.
- fileName: optional-extra-manifest/enable-crun-master.yaml
- fileName: extra-manifest/enable-crun-master.yaml
policyName: "group-du-standard-cfg-pc"
- fileName: optional-extra-manifest/enable-crun-worker.yaml
- fileName: extra-manifest/enable-crun-worker.yaml
policyName: "group-du-standard-cfg-pc"
0 ...al-extra-manifest/enable-crun-master.yaml → ...rs/extra-manifest/enable-crun-master.yaml
View file
Open in desktop
File renamed without changes.
0 ...al-extra-manifest/enable-crun-worker.yaml → ...rs/extra-manifest/enable-crun-worker.yaml
View file
Open in desktop
File renamed without changes.