must-gather: add helper pod yaml with compatible secret for <4.6 #977
Conversation
|
Can you please update the commit message and description of the PR with some more context, you can write about why you're making this change, the reason being it will help me understand the code even better and more logically. |
| if [[ oc get csv -n "${ns}" --no-headers | awk '{print $5}' -gt 4.5.0 ]]; then | ||
| apply_latest_helper_pod "$ns" "$operatorImage" | ||
| else | ||
| apply_helper_pod "$ns" "$operatorImage" |
There was a problem hiding this comment.
just a naming suggestion and I feel it might be subjective but, instead of naming apply_helper_pod, change it to apply_standard_helper_pod since latest means when OCS version is > 4.5.0 and standard means the usual pod when the OCS version is <= 4.5.0.
What do you think?,
There was a problem hiding this comment.
yes naming has to be correct. How about we keep the latest for 4.5.0> and standard for 4.6.0<.
crombus
force-pushed
the
backward_compatibility
branch
3 times, most recently
from
3831215
to
5644da6
Compare
| @@ -107,7 +113,11 @@ for ns in $namespaces; do | |||
| if [ "${operatorImage}" = "" ]; then | |||
| echo "not able to find the rook's operator image. Skipping collection of ceph command output" | tee -a "${BASE_COLLECTION_PATH}"/gather-debug.log | |||
| elif [[ $cephClusterCount -gt 0 ]]; then | |||
| apply_helper_pod "$ns" "$operatorImage" | |||
| if [[ $(oc get csv -n "${ns}" --no-headers | awk '{print $5}') -gt 4.5.0 ]]; then | |||
There was a problem hiding this comment.
What about 4.5.z (e.g. 4.5.1/4.5.2)? Will this condition cover that too?
crombus
force-pushed
the
backward_compatibility
branch
from
5644da6
to
0ec2626
Compare
add helper pod yaml with compatible secret for version <4.6 and change naming of templates according to the versions >=4.6 will be latest and <4.6 will be standard. Signed-off-by: crombus <pkundra@redhat.com>
crombus
force-pushed
the
backward_compatibility
branch
from
0ec2626
to
4038a7a
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: agarwal-mudit, iamniting, rajatsing The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
/retest |
|
@crombus: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/cherry-pick release-4.7 |
1 similar comment
|
/cherry-pick release-4.7 |
|
@crombus: new pull request created: #996 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/cherry-pick release-4.6 |
|
@crombus: new pull request created: #997 In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
toolbox has secrets updated for 4.6. ROOK_CEPH_USERNAME and ROOK_CEPH_SECRET replacing ROOK_ADMIN_SECRET. So when must-gather creates helper pod with updated secrets it cannot used for version before 4.6. To make must-gather compatible with all existing and upcoming version two yamls has to maintained one with ROOK_ADMIN_SECRET secret and one which is latest. based on the version must-gather will deploy helper pod.
Signed-off-by: crombus pkundra@redhat.com