-
Notifications
You must be signed in to change notification settings - Fork 63
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
✨ Configurable QoS resources for cluster-manager and klusterlet operators and their managed containers #400
Merged
openshift-merge-bot
merged 1 commit into
open-cluster-management-io:main
from
dongbeiqing91:dev/qos
Feb 8, 2024
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Copyright Contributors to the Open Cluster Management project | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| metadata: | ||
| labels: | ||
| a: b | ||
| name: fake-deployment | ||
| namespace: fake-namespace | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| a: b | ||
| template: | ||
| metadata: | ||
| labels: | ||
| a: b | ||
| spec: | ||
| containers: | ||
| - name: my-container | ||
| image: nginx | ||
| {{- if or (eq .ResourceRequirement.Type "Default") (eq .ResourceRequirement.Type "") }} | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| memory: 128Mi | ||
| {{- end }} | ||
| {{- if eq .ResourceRequirement.Type "BestEffort" }} | ||
| resources: {} | ||
| {{- end }} | ||
| {{- if eq .ResourceRequirement.Type "ResourceRequirement" }} | ||
| resources: | ||
| {{ .ResourceRequirement.ResourceRequirements | indent 10 }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| // Copyright Contributors to the Open Cluster Management project | ||
|
|
||
| package resourcerequirement | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/ghodss/yaml" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| operatorv1 "open-cluster-management.io/api/operator/v1" | ||
| ) | ||
|
|
||
| // ResourceRequirement is for templating resource requirement | ||
| type ResourceRequirement struct { | ||
| Type string | ||
| ResourceRequirements []byte | ||
| } | ||
|
|
||
| func NewResourceRequirement(resourceType string, limits, requests map[string]string) (*ResourceRequirement, error) { | ||
| if len(limits)+len(requests) == 0 { | ||
| if resourceType == string(operatorv1.ResourceQosClassResourceRequirement) { | ||
| return nil, fmt.Errorf("resource type is %s but both limits and requests are not set", resourceType) | ||
| } | ||
| return &ResourceRequirement{ | ||
| Type: resourceType, | ||
| }, nil | ||
| } | ||
| if resourceType == "" { | ||
| resourceType = string(operatorv1.ResourceQosClassResourceRequirement) | ||
| } else if resourceType != string(operatorv1.ResourceQosClassResourceRequirement) { | ||
| return nil, fmt.Errorf("resource type must be %s when resource limits or requests are set", string(operatorv1.ResourceQosClassResourceRequirement)) | ||
| } | ||
| rr := &corev1.ResourceRequirements{ | ||
| Limits: corev1.ResourceList{}, | ||
| Requests: corev1.ResourceList{}, | ||
| } | ||
| for rsc, quantityStr := range limits { | ||
| quantity, err := resource.ParseQuantity(quantityStr) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| rr.Limits[corev1.ResourceName(rsc)] = quantity | ||
| } | ||
| for rsc, quantityStr := range requests { | ||
| quantity, err := resource.ParseQuantity(quantityStr) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| rr.Requests[corev1.ResourceName(rsc)] = quantity | ||
| } | ||
| if err := ensureQuantity(rr); err != nil { | ||
| return nil, err | ||
| } | ||
| marshal, err := yaml.Marshal(rr) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &ResourceRequirement{ | ||
| Type: resourceType, | ||
| ResourceRequirements: marshal, | ||
| }, nil | ||
| } | ||
|
|
||
| func ensureQuantity(r *corev1.ResourceRequirements) error { | ||
| for rsc, limitsQuantity := range r.Limits { | ||
| requestsQuantity, ok := r.Requests[rsc] | ||
| if !ok { | ||
| continue | ||
| } | ||
| if requestsQuantity.Cmp(limitsQuantity) <= 0 { | ||
| continue | ||
| } | ||
| return fmt.Errorf("requests %s must be less than or equal to limits %s", | ||
| requestsQuantity.String(), limitsQuantity.String()) | ||
| } | ||
| return nil | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure if it is necessary to add some checks to ensure that the requirements <= limits?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sure, updated