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

hpa: Do not set replicas to 2 when override set to null (PROJQUAY-6474) #943

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

jonathankingfc
Copy link
Collaborator

  • When replicas override is set to null, the deployment should not be edited

- When replicas override is set to null, the deployment should not be edited
@openshift-merge-bot openshift-merge-bot bot merged commit 96819bc into master Aug 26, 2024
11 checks passed
@jonathankingfc
Copy link
Collaborator Author

/cherrypick redhat-3.10

@jonathankingfc
Copy link
Collaborator Author

/cherrypick redhat-3.11

@openshift-cherrypick-robot

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

Applying: hpa: Do not set replicas to 2 when override set to null (PROJQUAY-6474)
Using index info to reconstruct a base tree...
M	apis/quay/v1/quayregistry_types.go
M	pkg/middleware/middleware.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/middleware/middleware.go
CONFLICT (content): Merge conflict in pkg/middleware/middleware.go
Auto-merging 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 hpa: Do not set replicas to 2 when override set to null (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-sigs/prow repository.

@openshift-cherrypick-robot

@jonathankingfc: new pull request created: #952

In response to this:

/cherrypick redhat-3.11

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.

@jonathankingfc
Copy link
Collaborator Author

/cherrypick redhat-3.12

@openshift-cherrypick-robot

@jonathankingfc: new pull request created: #954

In response to this:

/cherrypick redhat-3.12

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.

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.

3 participants