Skip to content

refactor(ci): clean install-methods and implement lib/config.sh - #4134

Merged
gustavolira merged 3 commits into
redhat-developer:mainfrom
gustavolira:RHIDP-11013
Jan 30, 2026
Merged

refactor(ci): clean install-methods and implement lib/config.sh#4134
gustavolira merged 3 commits into
redhat-developer:mainfrom
gustavolira:RHIDP-11013

Conversation

@gustavolira

@gustavolira gustavolira commented Jan 30, 2026

Copy link
Copy Markdown
Member

Summary

Refactor install-methods, implement lib/config.sh module, and fix k8s-wait migration issues.

RHIDP-11013: Clean install-methods

File Action Description
install-methods/operator.sh MODIFIED Replace custom polling loops with common::poll_until
install-methods/helm.sh DELETED Remove unused empty file

RHIDP-11712: Implement lib/config.sh

File Action Description
lib/config.sh CREATED New module with 5 configuration functions
utils.sh MODIFIED Remove shims, migrate internal usages
jobs/ocp-operator.sh MODIFIED Migrate to config:: prefix (9 calls)
cluster/eks/eks-operator-deployment.sh MODIFIED Migrate to config:: prefix (4 calls)
cluster/aks/aks-operator-deployment.sh MODIFIED Migrate to config:: prefix (4 calls)
cluster/gke/gke-operator-deployment.sh MODIFIED Migrate to config:: prefix (4 calls)
lib/README.md MODIFIED Document new module

Bug Fix: k8s-wait migration

Fixes command not found errors from PR #4133 by migrating missed function calls:

  • wait_for_job_completionk8s_wait::job
  • wait_for_deploymentk8s_wait::deployment (2 calls)
  • wait_for_endpointk8s_wait::endpoint (2 calls)

New functions in lib/config.sh:

  • 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

Test plan

  • bash -n syntax check passed for all files
  • shellcheck --severity=warning passed (no warnings)
  • yarn prettier:fix passed
  • No remaining old function names in codebase

Closes: RHIDP-11013, RHIDP-11712

🤖 Generated with Claude Code

- 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>
@openshift-ci

openshift-ci Bot commented Jan 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign rm3l for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gustavolira gustavolira changed the title refactor(ci): clean install-methods using lib functions refactor(ci): clean install-methods and implement lib/config.sh Jan 30, 2026
- 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>
@gustavolira

Copy link
Copy Markdown
Member Author

/test ?

@gustavolira

Copy link
Copy Markdown
Member Author

/test e2e-ocp-helm-nightly

@github-actions

Copy link
Copy Markdown
Contributor

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>
@github-actions

Copy link
Copy Markdown
Contributor

🚫 Image Push Skipped.

The container image push was skipped because the build was skipped (either due to [skip-build] tag or no relevant changes with existing image)

@sonarqubecloud

Copy link
Copy Markdown

@gustavolira

Copy link
Copy Markdown
Member Author

/test e2e-ocp-helm-nightly

@gustavolira
gustavolira merged commit eb641ed into redhat-developer:main Jan 30, 2026
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant