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

fix(configmaps): skip creating configmap for Alpha Configurations when used with OCP Proxy (backport #181) #182

Merged
merged 1 commit into from
Aug 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2024

What's changed

  • Added a condition to only create alpha-config ConfigMap when openshift authentication is not enabled (i.e. with OAuth2-Proxy).
  • Added common labels to the generated ConfigMap. Just good practice for easy querying :D

Motivations

I think it's a good to determine and create only necessary resources. This would be helpful in case the namespace has resource quota.

Related to #127


This is an automatic backport of pull request #181 done by Mergify.

…n used with OCP Proxy (#181)

Signed-off-by: Thuan Vo <[email protected]>
(cherry picked from commit 208b142)

# Conflicts:
#	charts/cryostat/tests/alpha_config_test.yaml
@mergify mergify bot added the conflicts label Aug 8, 2024
@mergify mergify bot assigned tthvo Aug 8, 2024
Copy link
Contributor Author

mergify bot commented Aug 8, 2024

Cherry-pick of 208b142 has failed:

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

You are currently cherry-picking commit 208b142.
  (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:   charts/cryostat/templates/alpha_config.yaml
	modified:   charts/cryostat/templates/deployment.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   charts/cryostat/tests/alpha_config_test.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

@andrewazores andrewazores merged commit d020ce8 into cryostat-v3.0 Aug 8, 2024
10 of 12 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-181 branch August 8, 2024 19:17
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.

2 participants