Skip to content

Commit c113f7c

Browse files
qpdpQDaniel-Fan
andauthored
delete storageclass from cs cr (#2334)
* delete storageclass from cs cr Signed-off-by: Allen Li <[email protected]> * reduce duplicated deletion code Signed-off-by: Allen Li <[email protected]> * update file name Signed-off-by: Allen Li <[email protected]> * fix yq errors Signed-off-by: Allen Li <[email protected]> * remove comment Signed-off-by: Allen Li <[email protected]> * update info message Signed-off-by: Allen Li <[email protected]> * typo Signed-off-by: Allen Li <[email protected]> * Update preload_data.sh Co-authored-by: Daniel Fan <[email protected]> Signed-off-by: Allen Li <[email protected]> * Update preload_data.sh Co-authored-by: Daniel Fan <[email protected]> Signed-off-by: Allen Li <[email protected]> --------- Signed-off-by: Allen Li <[email protected]> Co-authored-by: Daniel Fan <[email protected]>
1 parent fb3a70d commit c113f7c

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

preload_data.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,25 +202,31 @@ function copy_resource() {
202202
local newResourceName=${3:-$resourceName}
203203
title " Copying $resourceType $resourceName from $FROM_NAMESPACE to $TO_NAMESPACE "
204204
resource_exists=$(${OC} get $resourceType $resourceName -n $FROM_NAMESPACE || echo "fail")
205+
storageClass_exist=$(${OC} get $resourceType $resourceName -n $FROM_NAMESPACE -o yaml | $YQ '.spec | has("storageClass")')
205206
if [[ $resource_exists != "fail" ]]; then
206-
$OC get $resourceType $resourceName -n $FROM_NAMESPACE -o yaml | \
207-
$YQ '
208-
.metadata.name = "'$newResourceName'" |
207+
$OC get $resourceType $resourceName -n $FROM_NAMESPACE -o yaml > tmp-resource.yaml
208+
$YQ -i '.metadata.name = "'${newResourceName}'" |
209209
del(.metadata.creationTimestamp) |
210210
del(.metadata.resourceVersion) |
211211
del(.metadata.namespace) |
212212
del(.metadata.uid) |
213213
del(.metadata.ownerReferences) |
214214
del(.metadata.managedFields) |
215215
del(.metadata.labels)
216-
' | \
217-
$OC apply -n $TO_NAMESPACE -f - || error "Failed to copy over $resourceType $resourceName."
218-
216+
' tmp-resource.yaml || error "Could not update tmp-resource.yaml"
217+
# delete storageclass field from common-service CR
218+
if [[ $resourceType == "commonservice" && $storageClass_exist == "true" ]]; then
219+
echo "Deleting storageClass field from commonservice CR"
220+
$YQ -i 'del(.spec.storageClass)' tmp-resource.yaml
221+
fi
222+
$OC apply -n $TO_NAMESPACE -f tmp-resource.yaml || error "Failed to copy over $resourceType $resourceName."
219223
# Check if the resource is created in TO_NAMESPACE
220224
check_copied_resource $resourceType $newResourceName $TO_NAMESPACE
221225
else
222226
warning "Resource $resourceType $resourceName not found and not migrated from $FROM_NAMESPACE to $TO_NAMESPACE"
223227
fi
228+
229+
rm tmp-resource.yaml
224230
}
225231

226232
function check_copied_resource() {

0 commit comments

Comments
 (0)