Skip to content

[skmo] Follow-up refactoring: replace remaining shell tasks with k8s.core#3826

Merged
openshift-merge-bot[bot] merged 2 commits intoopenstack-k8s-operators:mainfrom
vakwetu:skmo-followup-refactor
Apr 9, 2026
Merged

[skmo] Follow-up refactoring: replace remaining shell tasks with k8s.core#3826
openshift-merge-bot[bot] merged 2 commits intoopenstack-k8s-operators:mainfrom
vakwetu:skmo-followup-refactor

Conversation

@vakwetu
Copy link
Copy Markdown
Contributor

@vakwetu vakwetu commented Apr 1, 2026

Address non-blocking review suggestions from evallesp and fultonj on ci-framework PR #3766.

In hooks/playbooks/skmo/prepare-leaf.yaml:

  • Replace the 'Ensure leaf osp-secret exists' and 'Read leaf admin password' shell tasks with a single set_fact that parses the osp-secrets.env file directly using regex_findall. Pre-creating the secret in the leaf namespace is unnecessary because kustomize already creates it there during stage 6; the hook only ever needed the password value itself.
  • Replace the 'Create TransportURL CR' and 'Wait for TransportURL' shell tasks with kubernetes.core.k8s (idempotent apply) and kubernetes.core.k8s_info with retries/until (condition polling).

In roles/federation/tasks/hook_controlplane_config.yml:

  • Remove the redundant trailing | default('custom-ca-certs', true) from the _federation_ca_bundle_secret_name fact. The preceding cifmw_custom_ca_certs_secret_name | default('custom-ca-certs', true) already guarantees a non-empty value, making the outer default a no-op.

@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/aacfe7e6fbcd456ba53e88590b750d46

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 12m 53s
podified-multinode-edpm-deployment-crc FAILURE in 35m 46s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 36m 16s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 1h 58m 07s
✔️ cifmw-pod-zuul-files SUCCESS in 5m 56s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 11m 06s
✔️ cifmw-pod-pre-commit SUCCESS in 9m 50s
✔️ cifmw-molecule-federation SUCCESS in 2m 13s

@fultonj
Copy link
Copy Markdown
Contributor

fultonj commented Apr 6, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Apr 6, 2026
@vakwetu vakwetu force-pushed the skmo-followup-refactor branch from 9c9fbda to abf4a2d Compare April 6, 2026 18:33
@openshift-ci openshift-ci bot removed the lgtm label Apr 6, 2026
@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/4a3cc92f29754dfe89181effa3a20f1e

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 19s
podified-multinode-edpm-deployment-crc FAILURE in 23m 10s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 34m 52s
✔️ cifmw-crc-podified-edpm-baremetal-minor-update SUCCESS in 2h 01m 51s
✔️ cifmw-pod-zuul-files SUCCESS in 5m 08s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 08s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 53s
✔️ cifmw-molecule-federation SUCCESS in 1m 33s

@evallesp
Copy link
Copy Markdown
Contributor

evallesp commented Apr 7, 2026

recheck

evallesp
evallesp previously approved these changes Apr 7, 2026
Copy link
Copy Markdown
Contributor

@evallesp evallesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. There's a minor thing that I'm unsure how important is.

Comment thread hooks/playbooks/skmo/prepare-leaf.yaml
Copy link
Copy Markdown
Contributor

@michburk michburk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the follow-up changes! One small readability nit to consider, lgtm otherwise.

Comment thread roles/federation/tasks/hook_controlplane_config.yml Outdated
danpawlik
danpawlik previously approved these changes Apr 8, 2026
Copy link
Copy Markdown
Contributor

@danpawlik danpawlik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks fine.
if you want to fix nit(s), ping me :)

vakwetu and others added 2 commits April 8, 2026 20:26
Address non-blocking review suggestions from evallesp and fultonj on
ci-framework PR openstack-k8s-operators#3766.

- Replace the 'Ensure leaf osp-secret exists' and 'Read leaf admin
  password' shell tasks with a single set_fact that parses the
  osp-secrets.env file directly using regex_findall. Pre-creating the
  secret in the leaf namespace is unnecessary because kustomize already
  creates it there during stage 6; the hook only ever needed the
  password value itself.
- Replace the 'Create TransportURL CR' and 'Wait for TransportURL'
  shell tasks with kubernetes.core.k8s (idempotent apply) and
  kubernetes.core.k8s_info with retries/until (condition polling).

Signed-off-by: Ade Lee <alee@redhat.com>
Co-Authored-By: Claude <noreply@anthropic.com>
…trolplane_config

Address non-blocking review suggestions from evallesp and michburk on
ci-framework PR openstack-k8s-operators#3766.

Refactor _federation_ca_bundle_secret_name to use chained | default()
filters instead of nesting them. This removes the redundant trailing
| default('custom-ca-certs', true) and flattens the remaining nested
default into a more readable two-step chain:

  | default(cifmw_custom_ca_certs_secret_name, true)
  | default('custom-ca-certs', true)

Signed-off-by: Ade Lee <alee@redhat.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@vakwetu vakwetu dismissed stale reviews from danpawlik and evallesp via 62cd06b April 8, 2026 20:30
@vakwetu vakwetu force-pushed the skmo-followup-refactor branch from abf4a2d to 62cd06b Compare April 8, 2026 20:30
@softwarefactory-project-zuul
Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/7ab0d26d2b7548c8981f9305572a31c2

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 49m 59s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 22m 18s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 36m 21s
cifmw-crc-podified-edpm-baremetal-minor-update RETRY_LIMIT in 27m 32s
✔️ cifmw-pod-zuul-files SUCCESS in 4m 35s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 37s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 55s
✔️ cifmw-molecule-federation SUCCESS in 1m 37s

@vakwetu
Copy link
Copy Markdown
Contributor Author

vakwetu commented Apr 9, 2026

@evallesp @danpawlik @michburk - hi all, nits fixed. please merge!

@vakwetu
Copy link
Copy Markdown
Contributor Author

vakwetu commented Apr 9, 2026

recheck

Copy link
Copy Markdown
Contributor

@evallesp evallesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Copy link
Copy Markdown
Contributor

@michburk michburk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: michburk

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved label Apr 9, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit d4ae12d into openstack-k8s-operators:main Apr 9, 2026
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants