Skip to content

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

Open
vakwetu wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
vakwetu:skmo-followup-refactor
Open

[skmo] Follow-up refactoring: replace remaining shell tasks with k8s.core#3826
vakwetu wants to merge 1 commit 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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 1, 2026

[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 danpawlik 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

…kubernetes.core

Address non-blocking review suggestions from evallesp and fultonj on
ci-framework PR openstack-k8s-operators#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.

Signed-off-by: Ade Lee <alee@redhat.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@vakwetu vakwetu force-pushed the skmo-followup-refactor branch from 6387588 to 545500b Compare April 1, 2026 19:22
@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

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.

1 participant