Skip to content

Commit d6be7dd

Browse files
OCPBUGS-72511: Explicitly set the name of BSL
This commit explicitly sets the name of backupstoragelocation in DataProtectionApplication, and no longer rely only on the default behaviour. Also we make sure the backupstoragelocation status policy has a bigger ztp wave annotation number. This is because the status policy creates an empty backupstoragelocation, and with recent changes in oadp we are not allowed to set the default value for a backupstoragelocation after it has been already created. Signed-off-by: Saeid Askari <[email protected]>
1 parent 03002f4 commit d6be7dd

8 files changed

Lines changed: 17 additions & 12 deletions

File tree

telco-ran/configuration/argocd/example/acmpolicygenerator/acm-example-sno-site.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ policies:
8383
# patches:
8484
# - spec:
8585
# backupLocations:
86-
# - velero:
86+
# - name: dataprotectionapplication-1
87+
# velero:
8788
# provider: aws
8889
# default: true
8990
# credential:
@@ -98,5 +99,4 @@ policies:
9899
# objectStorage:
99100
# bucket: ibu
100101
# prefix: '{{hub .ManagedClusterName hub}}'
101-
# - path: source-crs/data-protection/OadpBackupStorageLocationStatus.yaml
102102
# --- END of source CRs needed for configuring OADP operator for SNO Image Based Upgrade ---

telco-ran/configuration/argocd/example/acmpolicygenerator/acm-group-du-sno-validator-ranGen.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ policies:
4040
ran.openshift.io/ztp-deploy-wave: "10000"
4141
manifests:
4242
- path: source-crs/validatorCRs/informDuValidatorMaster.yaml
43+
# source CR needed for configuring OADP operator for SNO Image Based Upgrade
44+
# - path: source-crs/data-protection/OadpBackupStorageLocationStatus.yaml

telco-ran/configuration/argocd/example/acmpolicygenerator/hub-side-templating/acm-group-du-sno-ranGen-templated.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ policies:
268268
# patches:
269269
# - spec:
270270
# backupLocations:
271-
# - velero:
271+
# - name: dataprotectionapplication-1
272+
# velero:
272273
# provider: aws
273274
# default: true
274275
# credential:
@@ -283,5 +284,4 @@ policies:
283284
# objectStorage:
284285
# bucket: ibu
285286
# prefix: '{{hub .ManagedClusterName hub}}'
286-
# - path: source-crs/data-protection/OadpBackupStorageLocationStatus.yaml
287287
# --- END of source CRs needed for configuring OADP operator for SNO Image Based Upgrade ---

telco-ran/configuration/argocd/example/policygentemplates/example-sno-site.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ spec:
5757
# policyName: "config-policy"
5858
# spec:
5959
# backupLocations:
60-
# - velero:
60+
# - name: dataprotectionapplication-1
61+
# velero:
6162
# provider: aws
6263
# default: true
6364
# credential:
@@ -72,6 +73,4 @@ spec:
7273
# objectStorage:
7374
# bucket: ibu
7475
# prefix: '{{hub .ManagedClusterName hub}}'
75-
# - fileName: data-protection/OadpBackupStorageLocationStatus.yaml
76-
# policyName: "config-policy"
7776
# --- END of source CRs needed for configuring OADP operator for SNO Image Based Upgrade ---

telco-ran/configuration/argocd/example/policygentemplates/group-du-sno-validator-ranGen.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ spec:
2626
# using a bindingExcludeRules entry with ztp-done
2727
evaluationInterval:
2828
compliant: 5s
29+
# source CRs needed for configuring OADP operator for SNO Image Based Upgrade
30+
31+
# - fileName: data-protection/OadpBackupStorageLocationStatus.yaml
32+
# policyName: "du-policy"

telco-ran/configuration/argocd/example/policygentemplates/hub-side-templating/group-du-sno-ranGen-templated.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ spec:
245245
# policyName: "oadp-config-policy"
246246
# spec:
247247
# backupLocations:
248-
# - velero:
248+
# - name: dataprotectionapplication-1
249+
# velero:
249250
# provider: aws
250251
# default: true
251252
# credential:
@@ -260,6 +261,4 @@ spec:
260261
# objectStorage:
261262
# bucket: ibu
262263
# prefix: '{{hub .ManagedClusterName hub}}'
263-
# - fileName: data-protection/OadpBackupStorageLocationStatus.yaml # wave 100
264-
# policyName: "oadp-config-policy"
265264
# --- END of source CRs needed for configuring OADP operator for SNO Image Based Upgrade ---

telco-ran/configuration/source-crs/data-protection/OadpBackupStorageLocationStatus.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ metadata:
1212
name: dataprotectionapplication-1
1313
namespace: openshift-adp
1414
annotations:
15-
ran.openshift.io/ztp-deploy-wave: "100"
15+
ran.openshift.io/ztp-deploy-wave: "10000"
1616
status:
1717
phase: Available

telco-ran/configuration/source-crs/data-protection/OadpDataProtectionApplication.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ spec:
1919
resourceTimeout: 10m
2020
# User needs to configure the following backupLocations through PGT overlay
2121
# backupLocations:
22-
# - velero:
22+
# - name: dataprotectionapplication-1
23+
# velero:
2324
# provider: aws
2425
# default: true
2526
# credential:

0 commit comments

Comments
 (0)