Skip to content

Commit 8c4c3f0

Browse files
astefanuttiopenshift-merge-robot
authored andcommitted
Change quota management API group version to v1alpha1
1 parent 0d1a39e commit 8c4c3f0

File tree

43 files changed

+312
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+312
-185
lines changed

Diff for: Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ verify-tag-name: print-global-variables
6969
t=${TAG} && [ $${#t} -le 128 ] || { echo "Target name $$t has 128 or more chars"; false; }
7070
.PHONY: generate-client ## Generate client packages
7171
generate-client: code-generator
72-
rm -rf pkg/client/applyconfiguration pkg/client/clientset/versioned pkg/client/informers/externalversions pkg/client/listers/controller/v1beta1 pkg/client/listers/quotasubtree/v1
72+
rm -rf pkg/client/applyconfiguration pkg/client/clientset/versioned pkg/client/informers/externalversions pkg/client/listers/controller/v1beta1 pkg/client/listers/quotasubtree/v1alpha1
7373
$(APPLYCONFIGURATION_GEN) \
7474
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" \
7575
--go-header-file="hack/boilerplate/boilerplate.go.txt" \
7676
--output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/applyconfiguration" \
7777
--trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
7878
$(CLIENT_GEN) \
7979
--input="pkg/apis/controller/v1beta1" \
80-
--input="pkg/apis/quotaplugins/quotasubtree/v1" \
80+
--input="pkg/apis/quotaplugins/quotasubtree/v1alpha1" \
8181
--input-base="github.com/project-codeflare/multi-cluster-app-dispatcher" \
8282
--go-header-file="hack/boilerplate/boilerplate.go.txt" \
8383
--clientset-name "versioned" \
@@ -86,14 +86,14 @@ generate-client: code-generator
8686
--trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
8787
$(LISTER_GEN) \
8888
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" \
89-
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1" \
89+
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1alpha1" \
9090
--go-header-file="hack/boilerplate/boilerplate.go.txt" \
9191
--output-base="." \
9292
--output-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers" \
9393
--trim-path-prefix "github.com/project-codeflare/multi-cluster-app-dispatcher"
9494
$(INFORMER_GEN) \
9595
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" \
96-
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1" \
96+
--input-dirs="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1alpha1" \
9797
--versioned-clientset-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/versioned" \
9898
--listers-package="github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/listers" \
9999
--go-header-file="hack/boilerplate/boilerplate.go.txt" \

Diff for: config/crd/bases/quota.codeflare.dev_quotasubtrees.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
singular: quotasubtree
1616
scope: Namespaced
1717
versions:
18-
- name: v1
18+
- name: v1alpha1
1919
schema:
2020
openAPIV3Schema:
2121
description: QuotaSubtree is a specification for a quota subtree resource

Diff for: deployment/mcad-controller/crds/quota.codeflare.dev_quotasubtrees.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
singular: quotasubtree
1616
scope: Namespaced
1717
versions:
18-
- name: v1
18+
- name: v1alpha1
1919
schema:
2020
openAPIV3Schema:
2121
description: QuotaSubtree is a specification for a quota subtree resource

Diff for: doc/usage/quota_management/quickstart.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ One of the key features of quota trees is the hardLimit attribute, which determi
1111
from its siblings or not. A sibling is another child node that shares the same parent node. If a quota has hardLimit set
1212
to true, then it can only use the resources defined in its specification. If a quota has hardLimit set to false, then it
1313
can use any unused resources from its siblings, as long as it does not violate the parent node’s limits. However, if an
14-
object is defined which neccesitates borrowing from a sibling node, then if another kubernetes object is created which
14+
object is defined which necessitates borrowing from a sibling node, then if another kubernetes object is created which
1515
uses the borrowees quota (and is within the borrowees limit) then the borrower will be preempted to free these
1616
resources.
1717

@@ -21,7 +21,7 @@ optimize resource utilization, avoid resource starvation, and ensure quality of
2121
## Example QuotaSubtree
2222

2323
```yaml
24-
apiVersion: quota.codeflare.dev/v1
24+
apiVersion: quota.codeflare.dev/v1alpha1
2525
kind: QuotaSubtree
2626
metadata:
2727
name: context-root
@@ -37,7 +37,7 @@ spec:
3737
cpu: 2000m
3838
memory: 8000Mi
3939
---
40-
apiVersion: quota.codeflare.dev/v1
40+
apiVersion: quota.codeflare.dev/v1alpha1
4141
kind: QuotaSubtree
4242
metadata:
4343
name: context-root-children

Diff for: pkg/apis/quotaplugins/quotasubtree/v1/doc.go renamed to pkg/apis/quotaplugins/quotasubtree/v1alpha1/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ limitations under the License.
1818
// +kubebuilder:object:generate=true
1919
// +groupName=quota.codeflare.dev
2020

21-
package v1
21+
package v1alpha1

Diff for: pkg/apis/quotaplugins/quotasubtree/v1/register.go renamed to pkg/apis/quotaplugins/quotasubtree/v1alpha1/register.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package v1
1+
package v1alpha1
22

33
import (
44
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -16,7 +16,7 @@ const (
1616
GroupName = "quota.codeflare.dev"
1717

1818
// GroupVersion is the version of scheduling group
19-
GroupVersion = "v1"
19+
GroupVersion = "v1alpha1"
2020
)
2121

2222
// SchemeGroupVersion is the group version used to register these objects.

Diff for: pkg/apis/quotaplugins/quotasubtree/v1/types.go renamed to pkg/apis/quotaplugins/quotasubtree/v1alpha1/types.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
package v1
1+
package v1alpha1
2+
23
/*
34
Copyright 2022 The Multi-Cluster App Dispatcher Authors.
45
@@ -54,10 +55,10 @@ type QuotaSubtreeSpec struct {
5455

5556
// Child is the spec for a QuotaSubtree resource
5657
type Child struct {
57-
Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"`
58-
Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
59-
Quotas Quota `json:"quotas,omitempty" protobuf:"bytes,4,opt,name=quotas"`
60-
Path string `json:"path,omitempty" protobuf:"bytes,5,opt,name=path"`
58+
Name string `json:"name,omitempty" protobuf:"bytes,1,opt,name=name"`
59+
Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`
60+
Quotas Quota `json:"quotas,omitempty" protobuf:"bytes,4,opt,name=quotas"`
61+
Path string `json:"path,omitempty" protobuf:"bytes,5,opt,name=path"`
6162
}
6263

6364
// Quota is the spec for a QuotaSubtree resource

Diff for: pkg/apis/quotaplugins/quotasubtree/v1/zz_generated.deepcopy.go renamed to pkg/apis/quotaplugins/quotasubtree/v1alpha1/zz_generated.deepcopy.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/client/clientset/versioned/clientset.go

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/client/clientset/versioned/fake/clientset_generated.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/client/clientset/versioned/fake/register.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/client/clientset/versioned/scheme/register.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/client/clientset/versioned/typed/quotasubtree/v1/doc.go renamed to pkg/client/clientset/versioned/typed/quotasubtree/v1alpha1/doc.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/client/clientset/versioned/typed/quotasubtree/v1/fake/fake_quotasubtree.go renamed to pkg/client/clientset/versioned/typed/quotasubtree/v1alpha1/fake/fake_quotasubtree.go

+29-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)