refactor(ci): update job handlers and cluster scripts to use namespaced functions - #4133
Merged
openshift-merge-bot[bot] merged 3 commits intoJan 30, 2026
Merged
Conversation
- ocp-operator.sh: yq_merge_value_files → helm::merge_values (2 occurrences) - upgrade.sh: get_chart_version → helm::get_chart_version Closes: RHIDP-11011 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
gustavolira
changed the title
…ions - AKS/EKS/GKE helm-deployment: uninstall_helmchart → helm::uninstall - AKS/EKS/GKE helm-deployment: yq_merge_value_files → helm::merge_values - AKS/EKS/GKE operator-deployment: yq_merge_value_files → helm::merge_values Closes: RHIDP-11012 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
gustavolira
force-pushed
the
RHIDP-11011
branch
from
January 30, 2026 15:56
ee9c125 to
b0e50c3
Compare
- Remove 6 helm function aliases from lib/helm.sh - Remove k8s-wait function shims from utils.sh - Remove unused oc_login and get_previous_release_version shims - Migrate 17 internal utils.sh usages to namespaced functions - Keep sed_inplace shim (still used internally) Closes: RHIDP-11015 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
|
Member
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: albarbaro The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
Author
|
/test ? |
Member
Author
|
/test e2e-ocp-helm-nightly |
Contributor
|
The image is available at: |
openshift-merge-bot
Bot
merged commit Jan 30, 2026
55b050d
into
redhat-developer:main
19 of 20 checks passed
gustavolira
added a commit
to gustavolira/rhdh
that referenced
this pull request
Jan 30, 2026
Fix command not found error by migrating missed function calls: - wait_for_job_completion → k8s_wait::job - wait_for_deployment → k8s_wait::deployment (2 calls) - wait_for_endpoint → k8s_wait::endpoint (2 calls) These were missed in PR redhat-developer#4133 when k8s-wait shims were removed. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
4 tasks
gustavolira
added a commit
that referenced
this pull request
Jan 30, 2026
* refactor(ci): clean install-methods using lib functions - Replace custom polling loops with common::poll_until in operator.sh - Extract debug info collection to _operator_debug_info helper - Remove unused install-methods/helm.sh (empty file) - Reduce deploy_rhdh_operator from ~80 to ~50 lines Closes: RHIDP-11013 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(ci): implement lib/config.sh module - Create lib/config.sh with 5 configuration functions: - config::create_app_config_map - config::select_config_map_file - config::create_dynamic_plugins_config - config::create_conditional_policies_operator - config::prepare_operator_app_config - Migrate all callers to use config:: prefix (no backward compatibility) - Remove config function shims from utils.sh - Migrate sed_inplace to common::sed_inplace - Update lib/README.md documentation Closes: RHIDP-11712 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(ci): migrate remaining k8s-wait function calls Fix command not found error by migrating missed function calls: - wait_for_job_completion → k8s_wait::job - wait_for_deployment → k8s_wait::deployment (2 calls) - wait_for_endpoint → k8s_wait::endpoint (2 calls) These were missed in PR #4133 when k8s-wait shims were removed. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This was referenced Apr 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Update job handler, cluster provider, and main entry point scripts to use namespaced module functions. Remove backward compatibility shims now that all callers have been migrated.
RHIDP-11011: Job Handlers
ocp-operator.shyq_merge_value_files(2x)helm::merge_valuesupgrade.shget_chart_versionhelm::get_chart_versionRHIDP-11012: Cluster Provider Scripts + Entry Point
openshift-ci-tests.shget_chart_versionhelm::get_chart_versionaks-helm-deployment.shuninstall_helmchart(2x)helm::uninstallaks-helm-deployment.shyq_merge_value_files(2x)helm::merge_valuesaks-operator-deployment.shyq_merge_value_files(2x)helm::merge_valuesgke-helm-deployment.shuninstall_helmchart(2x)helm::uninstallgke-helm-deployment.shyq_merge_value_files(2x)helm::merge_valuesgke-operator-deployment.shyq_merge_value_files(2x)helm::merge_valueseks-helm-deployment.shuninstall_helmchart(2x)helm::uninstalleks-helm-deployment.shyq_merge_value_files(2x)helm::merge_valueseks-operator-deployment.shyq_merge_value_files(2x)helm::merge_valuesRHIDP-11015: Remove Shims
lib/helm.shyq_merge_value_files,uninstall_helmchart, etc.)utils.shwait_for_deployment,wait_for_job_completion, etc.)utils.shoc_login,get_previous_release_version)utils.shTotal: 11 files, 22 function migrations, 12 shims removed
Test plan
bash -nsyntax check passed for all modified filesshellcheck --severity=warningpassed (no new warnings in modified files)Closes: RHIDP-11011, RHIDP-11012, RHIDP-11015
🤖 Generated with Claude Code