Skip to content

Conversation

@eurijon
Copy link
Contributor

@eurijon eurijon commented Dec 27, 2024

For being able to resolve shift-on-stack apps endpoints (routes) hostnames from RHOSO pods it's required to add the DNS record entry in then dnsmasq service running on the hypervisor.

i.e.:

# cat /etc/cifmw-dnsmasq.d/addresses.conf 
address=/apps.ocp.openstack.lab/x.y.z.v
address=/apps.ostest.shiftstack.local/x.y.z.s      <<-----

It needs to be done after shift-on-stack cluster is installed as the installer is creating the floating IP for the apps endpoints, and the FIP is not known in advance.

For that purpose the cifmw_shiftstack_hypervisor param is passed so the playbook running on the shiftstackclient pod is able to reach the hypervisor.

The PR also adds the cifmw_shiftstack_shiftstackclient_incluster_kubeconfig_dir param to the shiftstack-qa playbook execution so it's able to find the RHOSO kubeconfig location.

This PR depends on: #2620

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 27, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@softwarefactory-project-zuul
Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/ci-framework for 2626,63abc8fc4ea820ac8a7f84508f6ef9c8190997a3

@softwarefactory-project-zuul
Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/ci-framework for 2626,b875b3409fa8dcb132a445dcb0abf40b2bffb4d6

@softwarefactory-project-zuul
Copy link

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/d146909601c5464095bc146e4964e874

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 38m 32s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 11s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 27m 24s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 07s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 02s
✔️ build-push-container-cifmw-client SUCCESS in 20m 45s
cifmw-molecule-shiftstack FAILURE in 14m 46s

@softwarefactory-project-zuul
Copy link

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/1a964b20bcbb41d8a19fcd79f024b377

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 38m 18s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 08s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 26m 48s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 42s
cifmw-pod-pre-commit FAILURE in 7m 42s
✔️ build-push-container-cifmw-client SUCCESS in 35m 59s
cifmw-molecule-shiftstack FAILURE in 15m 39s

@eurijon eurijon force-pushed the hypervisor-param branch 5 times, most recently from 1bf8556 to cdcd1c3 Compare December 30, 2024 16:29
@softwarefactory-project-zuul
Copy link

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/5114043cc42740c3bb98c72e8d96353c

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 52m 59s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 53s
cifmw-crc-podified-edpm-baremetal FAILURE in 1h 40m 46s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 32s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 05s
✔️ build-push-container-cifmw-client SUCCESS in 36m 54s
✔️ cifmw-molecule-shiftstack SUCCESS in 12m 41s

@eurijon
Copy link
Contributor Author

eurijon commented Dec 31, 2024

recheck

@eurijon eurijon marked this pull request as ready for review December 31, 2024 10:17
@eurijon eurijon requested a review from rlobillo as a code owner December 31, 2024 10:17
@softwarefactory-project-zuul
Copy link

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/ea028ac29fff478697304da0accad1f3

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 49m 29s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 20m 20s
cifmw-crc-podified-edpm-baremetal FAILURE in 1h 37m 31s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 19s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 53s
✔️ build-push-container-cifmw-client SUCCESS in 36m 46s
✔️ cifmw-molecule-shiftstack SUCCESS in 13m 47s

@eurijon
Copy link
Contributor Author

eurijon commented Jan 9, 2025

recheck

@softwarefactory-project-zuul
Copy link

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/1959cb648eac4a9e82426a3269d50e5d

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 33m 36s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 17m 35s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 20m 54s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 55s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 32s
✔️ build-push-container-cifmw-client SUCCESS in 37m 25s
cifmw-molecule-shiftstack FAILURE in 12m 48s

@softwarefactory-project-zuul
Copy link

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/4c335784df61411f8727d3e10a52bba2

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 34m 04s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 22s
cifmw-crc-podified-edpm-baremetal FAILURE in 49m 16s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 09s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 52s
✔️ build-push-container-cifmw-client SUCCESS in 37m 31s
✔️ cifmw-molecule-shiftstack SUCCESS in 14m 23s

For being able to resolve shift-on-stack apps endpoints (routes)
hostnames from RHOSO pods it's required to add the DNS record entry
in then dnsmasq service running on the hypervisor.

It needs to be done after shift-on-stack cluster is installed as
the installer is creating the floating IP for the apps endpoints,
and the FIP is not known in advance.

For that purpose the cifmw_shiftstack_hypervisor param is passed so
the playbook running on the shiftstackclient pod is able to reach
the hypervisor.

This commit also adds the
cifmw_shiftstack_shiftstackclient_incluster_kubeconfig_dir param to
the shiftstack-qa playbook execution so it's able to find the RHOSO
kubeconfig location.
@softwarefactory-project-zuul
Copy link

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/211e81376d004d5089ea54fd697e00b0

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 57m 08s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 19m 26s
cifmw-crc-podified-edpm-baremetal FAILURE in 1h 43m 44s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 57s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 21s
✔️ build-push-container-cifmw-client SUCCESS in 37m 37s
✔️ cifmw-molecule-shiftstack SUCCESS in 14m 38s

@eurijon
Copy link
Contributor Author

eurijon commented Jan 10, 2025

recheck

@eurijon eurijon requested a review from a team January 10, 2025 08:45
@rlobillo
Copy link
Contributor

/lgtm

Great work!

@pablintino
Copy link
Contributor

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino

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-merge-bot openshift-merge-bot bot merged commit bdf4ec8 into openstack-k8s-operators:main Jan 10, 2025
5 checks passed
@eurijon eurijon deleted the hypervisor-param branch January 10, 2025 15:04
@eurijon
Copy link
Contributor Author

eurijon commented Jan 17, 2025

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@eurijon: #2626 failed to apply on top of branch "18.0-fr1":

Applying: Add hypervisor param to shiftstack playbook execution
Using index info to reconstruct a base tree...
M	roles/shiftstack/README.md
M	roles/shiftstack/defaults/main.yml
M	roles/shiftstack/tasks/test_config.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/shiftstack/tasks/test_config.yml
Auto-merging roles/shiftstack/defaults/main.yml
CONFLICT (content): Merge conflict in roles/shiftstack/defaults/main.yml
Auto-merging roles/shiftstack/README.md
CONFLICT (content): Merge conflict in roles/shiftstack/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add hypervisor param to shiftstack playbook execution

Details

In response to this:

/cherry-pick 18.0-fr1

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-sigs/prow repository.

@eurijon
Copy link
Contributor Author

eurijon commented Jan 20, 2025

/cherry-pick 18.0-fr1

@openshift-cherrypick-robot

@eurijon: new pull request created: #2669

Details

In response to this:

/cherry-pick 18.0-fr1

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-sigs/prow repository.

rlobillo added a commit to shiftstack/shiftstack-qa that referenced this pull request Feb 18, 2025
This implementation is taking advantage of the work done by Jon & Itzik in:

- openstack-k8s-operators/ci-framework#2645
- openstack-k8s-operators/ci-framework#2626

Thanks to above, we can trigger tasks in the hypervisor from the
shiftstack-qa, which is much more easier for us in terms of
maintenability and support.

The new playbook is configuring squid in the hypervisor with
user/password credentials tha are stored in the secret.yaml.

This playbook is also creating an user inside the hypervisor where a
kubeconfig with the proxy configured inside can be found.

Thanks to that, other system with the proper private key can
gather this kubeconfig and access the underlying OCP.

Change-Id: Id2c563926345e6b36ac28fdd51f5e3fc36d5c592
Reviewed-on: https://review.gerrithub.io/c/shiftstack/shiftstack-qa/+/1207485
Tested-by: Ramón Lobillo <rlobillo@redhat.com>
Tested-by: rhosqeauto <aopincar+rhosqeauto@redhat.com>
Reviewed-by: Jon Uriarte <juriarte@redhat.com>
Reviewed-by: Itzik Brown <itzikb@redhat.com>
rlobillo pushed a commit to shiftstack/shiftstack-qa that referenced this pull request Feb 26, 2025
https://issues.redhat.com/browse/SOSQE-2301

The env vars:
 - RHOSO_KUBECONFIG
 - SHIFTSTACK_PASS_FILE
are required for the observability test [1] in openstack-test.

RHOSO kubeconfig is needed in order to access RHOSO's OCP from
openstack-test. The telemetry test needs to create a scrapeConfig
object in RHOSO's OCP cluster.

This change depends on
openstack-k8s-operators/ci-framework#2626,
which actually adds the rhoso_kubeconfig param to the shiftstack-qa
playbook execution.

SHIFTSTACK_PASS_FILE points to the shift-on-stack kubeadmin-password
file so the test is able to login as kubeadmin and retrieve a token
that is required in the test.

[1] openshift/openstack-test#223

Change-Id: I0ba2bd762854d228d083ed3ca0a205d05eb97a26
Reviewed-on: https://review.gerrithub.io/c/shiftstack/shiftstack-qa/+/1206509
Reviewed-by: Ramón Lobillo <rlobillo@redhat.com>
Tested-by: rhosqeauto <aopincar+rhosqeauto@redhat.com>
Reviewed-by: Itzik Brown <itzikb@redhat.com>
Reviewed-by: Itay Matza <imatza@redhat.com>
rlobillo pushed a commit to shiftstack/shiftstack-qa that referenced this pull request Mar 10, 2025
https://issues.redhat.com/browse/SOSQE-2281

For being able to resolve shift-on-stack apps endpoints (routes) hostnames
from RHOSO pods it's required to add the DNS record entry in then dnsmasq
service running on the hypervisor.

This commit adds the tools_cifmw_dnsmasq tools role so it's easily reusable when
it's needed to add DNS entries to the `/etc/cifmw-dnsmasq.d/addresses.conf` file
in the cifmw-dnsmasq service running in the hypervisor.

For more info about the tools_cifmw_dnsmasq role, visit the role's README file.

Requires openstack-k8s-operators/ci-framework#2626

Change-Id: Iabde163a4ef03a863d35267a3f6c8d15d830e82b
Reviewed-on: https://review.gerrithub.io/c/shiftstack/shiftstack-qa/+/1205660
Reviewed-by: Ramón Lobillo <rlobillo@redhat.com>
Tested-by: rhosqeauto <aopincar+rhosqeauto@redhat.com>
Reviewed-by: Itzik Brown <itzikb@redhat.com>
Reviewed-by: Itay Matza <imatza@redhat.com>
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