-
Notifications
You must be signed in to change notification settings - Fork 51
Implement Limit controller #868
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
Open
chenwng
wants to merge
12
commits into
k-orc:main
Choose a base branch
from
chenwng:limit-controller
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
35aae67
Scaffolding for the Limit controller
chenwng 6fa31b6
Generate resource for Limit controller
chenwng 04aba64
Implement scaffolded TODO for Limit controller
chenwng baf4495
Update fields for Limit type and fix openstack apis for Limit os client
chenwng 8025b90
Implement limit actuator and status writer
chenwng e535421
Add api validation and acutator test cases and fix field rules for Li…
chenwng 03e4d2c
Add e2e test cases for Limit controller
chenwng 13d4d9a
Add description field in LimitFilter to align with RegisteredLimit
chenwng 9695342
Add limit controller in README
chenwng 7d4b66f
Fix warnings from golint and kubeapilinter
chenwng 9b0a8e9
Address PR review comments
chenwng 60bb5b3
Skip limit import tests on older OpenStack versions in e2e tests due …
chenwng 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,121 @@ | ||
| /* | ||
| Copyright The ORC Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha1 | ||
|
|
||
| // LimitResourceSpec contains the desired state of the resource. | ||
| // +kubebuilder:validation:XValidation:rule="has(self.projectRef) || has(self.domainRef)",message="either projectRef or domainRef must be specified" | ||
| // +kubebuilder:validation:XValidation:rule="!(has(self.projectRef) && has(self.domainRef))",message="projectRef and domainRef are mutually exclusive" | ||
| type LimitResourceSpec struct { | ||
| // description is a human-readable description for the resource. | ||
| // +kubebuilder:validation:MinLength:=1 | ||
| // +kubebuilder:validation:MaxLength:=255 | ||
| // +optional | ||
| Description *string `json:"description,omitempty"` | ||
|
|
||
| // serviceRef is a reference to the ORC Service which this resource is associated with. | ||
| // +required | ||
| // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="serviceRef is immutable" | ||
| ServiceRef KubernetesNameRef `json:"serviceRef,omitempty"` | ||
|
|
||
| // projectRef is a reference to the ORC Project which this resource is associated with. | ||
| // Either Domain ID or Project ID must be provided. | ||
| // https://opendev.org/openstack/keystone/src/commit/30ef2ffa65a3486ef882f00538e20f2253c57d4c/keystone/limit/schema.py#L323-L340 | ||
| // +optional | ||
| // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="projectRef is immutable" | ||
| ProjectRef *KubernetesNameRef `json:"projectRef,omitempty"` | ||
|
|
||
| // domainRef is a reference to the ORC Domain which this resource is associated with. | ||
| // Either Domain ID or Project ID must be provided. | ||
| // https://opendev.org/openstack/keystone/src/commit/30ef2ffa65a3486ef882f00538e20f2253c57d4c/keystone/limit/schema.py#L323-L340 | ||
| // +optional | ||
| // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="domainRef is immutable" | ||
| DomainRef *KubernetesNameRef `json:"domainRef,omitempty"` | ||
|
|
||
| // resourceName is the name of the resource this limit is associated with. | ||
| // +kubebuilder:validation:MinLength:=1 | ||
| // +kubebuilder:validation:MaxLength:=255 | ||
| // +kubebuilder:validation:Pattern=`^[\S]+$` | ||
| // +required | ||
| // +kubebuilder:validation:XValidation:rule="self == oldSelf",message="resourceName is immutable" | ||
| ResourceName string `json:"resourceName,omitempty"` | ||
|
|
||
| // resourceLimit is the override value of the limit. | ||
| // +kubebuilder:validation:Minimum=-1 | ||
| // +required | ||
| ResourceLimit int32 `json:"resourceLimit"` | ||
| } | ||
|
|
||
| // LimitFilter defines an existing resource by its properties | ||
| // +kubebuilder:validation:MinProperties:=1 | ||
| type LimitFilter struct { | ||
| // description of the existing resource | ||
| // +kubebuilder:validation:MinLength:=1 | ||
| // +kubebuilder:validation:MaxLength:=255 | ||
| // +optional | ||
| Description *string `json:"description,omitempty"` | ||
|
|
||
| // serviceRef is a reference to the ORC Service which this resource is associated with. | ||
| // +optional | ||
| ServiceRef *KubernetesNameRef `json:"serviceRef,omitempty"` | ||
|
|
||
| // projectRef is a reference to the ORC Project which this resource is associated with. | ||
| // +optional | ||
| ProjectRef *KubernetesNameRef `json:"projectRef,omitempty"` | ||
|
|
||
| // domainRef is a reference to the ORC Domain which this resource is associated with. | ||
| // +optional | ||
| DomainRef *KubernetesNameRef `json:"domainRef,omitempty"` | ||
|
|
||
| // resourceName is the name of the resource this limit is associated with. | ||
| // +kubebuilder:validation:MinLength:=1 | ||
| // +kubebuilder:validation:MaxLength:=255 | ||
| // +kubebuilder:validation:Pattern=`^[\S]+$` | ||
| // +optional | ||
| ResourceName string `json:"resourceName,omitempty"` | ||
| } | ||
|
|
||
| // LimitResourceStatus represents the observed state of the resource. | ||
| type LimitResourceStatus struct { | ||
| // description is a human-readable description for the resource. | ||
| // +kubebuilder:validation:MaxLength=1024 | ||
| // +optional | ||
| Description string `json:"description,omitempty"` | ||
|
|
||
| // serviceID is the ID of the Service to which the resource is associated. | ||
| // +kubebuilder:validation:MaxLength=1024 | ||
| // +optional | ||
| ServiceID string `json:"serviceID,omitempty"` | ||
|
|
||
| // projectID is the ID of the Project to which the resource is associated. | ||
| // +kubebuilder:validation:MaxLength=1024 | ||
| // +optional | ||
| ProjectID string `json:"projectID,omitempty"` | ||
|
|
||
| // domainID is the ID of the Domain to which the resource is associated. | ||
| // +kubebuilder:validation:MaxLength=1024 | ||
| // +optional | ||
| DomainID string `json:"domainID,omitempty"` | ||
|
|
||
| // resourceLimit is the override value of the limit. | ||
| // +optional | ||
| ResourceLimit int32 `json:"resourceLimit,omitempty"` | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this should be a pointer. If the |
||
|
|
||
| // resourceName is the name of the resource this limit is associated with. | ||
| // +kubebuilder:validation:MaxLength=1024 | ||
| // +optional | ||
| ResourceName string `json:"resourceName,omitempty"` | ||
| } | ||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
When we have RegionRef on this controller, I believe we will be pretty much done.