Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api): add ExternalHost property for routes (backport #877) #878

Merged
merged 2 commits into from
Jun 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2024

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits: git commit -S -m "YOUR_COMMIT_MESSAGE"

Fixes: #726

Description of the change:

  • Adds spec.networkOptions.coreConfig.externalHost to the Cryostat v1beta2 CRD.
  • Route spec.host is immutable once created. I had considered some logic to recreate the route if the user attempts to change the host in the CR, but this is further complicated due to OpenShift modifying the spec.host field in the default case where it dynamically assigns a hostname. I think trying to accommodate this is too risky for 3.0.

Motivation for the change:

  • Allows users to specify a custom hostname for the Cryostat route on OpenShift

How to manually test:

  1. Create a Cryostat CR with spec.networkOptions.coreConfig.externalHost defined to a custom value.

This is an automatic backport of pull request #877 done by [Mergify](https://mergify.com).

* feat(api): add ExternalHost property for routes

* Handle reverting hostname to default

* Host is immutable after creation

(cherry picked from commit 2fc2faa)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@mergify mergify bot added the conflicts label Jun 7, 2024
@mergify mergify bot assigned ebaron Jun 7, 2024
Copy link
Contributor Author

mergify bot commented Jun 7, 2024

Cherry-pick of 2fc2faa has failed:

On branch mergify/bp/cryostat-v3.0/pr-877
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit 2fc2faa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   api/v1beta2/cryostat_types.go
	modified:   api/v1beta2/zz_generated.deepcopy.go
	modified:   bundle/manifests/operator.cryostat.io_cryostats.yaml
	modified:   config/crd/bases/operator.cryostat.io_cryostats.yaml
	modified:   config/manifests/bases/cryostat-operator.clusterserviceversion.yaml
	modified:   internal/controllers/reconciler_test.go
	modified:   internal/controllers/routes.go
	modified:   internal/test/resources.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bundle/manifests/cryostat-operator.clusterserviceversion.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ebaron
Copy link
Member

ebaron commented Jun 7, 2024

/build_test

@ebaron ebaron added feat New feature or request and removed conflicts labels Jun 7, 2024
Copy link

github-actions bot commented Jun 7, 2024

/build_test completed successfully ✅.
View Actions Run.

@ebaron ebaron merged commit 1c85ed6 into cryostat-v3.0 Jun 7, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-877 branch June 7, 2024 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feat New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant