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

overrides: Allow nullable replicas (PROJQUAY-6474) #896

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

jonathankingfc
Copy link
Collaborator

  • Allow user to set overrides for replicas to null in order to completely remove default value
  • This prevents conflicts with HPA in the event that a user wants to use an unmanaged HPA

- Allow user to set overrides for replicas to null in order to completely remove default value
- This prevents conflicts with HPA in the event that a user wants to use an unmanaged HPA
@jonathankingfc jonathankingfc merged commit f78a28f into master Feb 29, 2024
9 of 11 checks passed
@jonathankingfc
Copy link
Collaborator Author

/cherrypick redhat-3.9

@jonathankingfc
Copy link
Collaborator Author

/cherrypick redhat-3.10

@openshift-cherrypick-robot

@jonathankingfc: #896 failed to apply on top of branch "redhat-3.9":

Applying: overrides: Allow nullable replicas (PROJQUAY-6474)
Using index info to reconstruct a base tree...
M	apis/quay/v1/quayregistry_types.go
M	bundle/manifests/quayregistries.crd.yaml
M	config/crd/bases/quay.redhat.com_quayregistries.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/crd/bases/quay.redhat.com_quayregistries.yaml
Auto-merging bundle/manifests/quayregistries.crd.yaml
Auto-merging apis/quay/v1/quayregistry_types.go
CONFLICT (content): Merge conflict in apis/quay/v1/quayregistry_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 overrides: Allow nullable replicas (PROJQUAY-6474)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick redhat-3.9

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/test-infra repository.

@openshift-cherrypick-robot

@jonathankingfc: #896 failed to apply on top of branch "redhat-3.10":

Applying: overrides: Allow nullable replicas (PROJQUAY-6474)
Using index info to reconstruct a base tree...
M	apis/quay/v1/quayregistry_types.go
M	bundle/manifests/quayregistries.crd.yaml
M	config/crd/bases/quay.redhat.com_quayregistries.yaml
Falling back to patching base and 3-way merge...
Auto-merging config/crd/bases/quay.redhat.com_quayregistries.yaml
Auto-merging bundle/manifests/quayregistries.crd.yaml
Auto-merging apis/quay/v1/quayregistry_types.go
CONFLICT (content): Merge conflict in apis/quay/v1/quayregistry_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 overrides: Allow nullable replicas (PROJQUAY-6474)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick redhat-3.10

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/test-infra repository.

@jonathankingfc
Copy link
Collaborator Author

Manual cherry picks

3.9 -> #909
3.10 -> #910

@gizzi-rh
Copy link

I do not see the issue fix with Quay 3.11

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants