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(insights): optionally deploy a proxy for Insights (backport #670) #673

Merged
merged 2 commits into from
Nov 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 7, 2023

This is an automatic backport of pull request #670 done by Mergify.
Cherry-pick of d719e43 has failed:

On branch mergify/bp/cryostat-v2.4/pr-670
Your branch is up to date with 'origin/cryostat-v2.4'.

You are currently cherry-picking commit d719e43.
  (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:   Makefile
	new file:   config/insights/insights_patch.yaml
	new file:   config/insights/kustomization.yaml
	modified:   config/manager/manager.yaml
	modified:   config/rbac/role.yaml
	new file:   hack/insights_patch.yaml.in
	modified:   internal/controllers/clustercryostat_controller.go
	modified:   internal/controllers/clustercryostat_controller_test.go
	modified:   internal/controllers/common/common_utils.go
	modified:   internal/controllers/common/resource_definitions/resource_definitions.go
	modified:   internal/controllers/common/tls.go
	modified:   internal/controllers/constants/constants.go
	modified:   internal/controllers/cryostat_controller.go
	modified:   internal/controllers/cryostat_controller_test.go
	new file:   internal/controllers/insights/apicast.go
	new file:   internal/controllers/insights/insights.go
	new file:   internal/controllers/insights/insights_controller.go
	new file:   internal/controllers/insights/insights_controller_test.go
	new file:   internal/controllers/insights/insights_controller_unit_test.go
	new file:   internal/controllers/insights/insights_suite_test.go
	new file:   internal/controllers/insights/setup.go
	new file:   internal/controllers/insights/setup_test.go
	new file:   internal/controllers/insights/test/manager.go
	new file:   internal/controllers/insights/test/resources.go
	new file:   internal/controllers/insights/test/utils.go
	modified:   internal/controllers/openshift.go
	modified:   internal/controllers/pvc.go
	modified:   internal/controllers/rbac.go
	modified:   internal/controllers/reconciler.go
	modified:   internal/controllers/reconciler_test.go
	new file:   internal/controllers/reconciler_unit_test.go
	modified:   internal/main.go
	new file:   internal/test/expect.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* feat(insights): mount Insights token in Cryostat container

Signed-off-by: Elliott Baron <ebaron@redhat.com>

* Use 0440 mode for mounted token

* Envtest based tests for controller watch changes

* Fix hardcoded OpenShift module version

* clean up test

* Create HTTP proxy for communicating with Insights

* Handle deletion case, add tests

* Set INSIGHTS_PROXY, additional testing

* cleanup

* Convert filter test to unit test

* Move setup to its own test file

* cleanup

* Add resource requirements and more tests

* Fix license

* Check the rest of the deployment too

* Update log message

* Add Bearer to Authentication header

* Fix AllNamespaces install mode handling

* Regenerate bundle

---------

Signed-off-by: Elliott Baron <ebaron@redhat.com>
(cherry picked from commit d719e43)

# Conflicts:
#	bundle/manifests/cryostat-operator.clusterserviceversion.yaml
@mergify mergify bot added the conflicts label Nov 7, 2023
@mergify mergify bot assigned ebaron Nov 7, 2023
@ebaron ebaron added feat New feature or request and removed conflicts labels Nov 7, 2023
@ebaron
Copy link
Member

ebaron commented Nov 7, 2023

/build_test

@ebaron ebaron merged commit 4afebeb into cryostat-v2.4 Nov 7, 2023
5 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v2.4/pr-670 branch November 7, 2023 22:12
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