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

Add enforceQuota to resource editor #374

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 16 additions & 1 deletion apis/core/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion apis/management/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion apis/meta/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion apis/shared/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions apis/shared/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ type UIParameters struct {
}

type UIParameterTemplate struct {
Options *releasesapi.ChartSourceRef `json:"options,omitempty"`
Editor *releasesapi.ChartSourceRef `json:"editor,omitempty"`
Options *releasesapi.ChartSourceRef `json:"options,omitempty"`
Editor *releasesapi.ChartSourceRef `json:"editor,omitempty"`
EnforceQuota bool `json:"enforceQuota"`
// +optional
Actions []*ActionTemplateGroup `json:"actions,omitempty"`
// app.kubernetes.io/instance label must be updated at these paths when refilling metadata
Expand Down Expand Up @@ -136,6 +137,7 @@ type ActionTemplate struct {
Flow string `json:"flow"`
DisabledTemplate string `json:"disabledTemplate,omitempty"`
Editor *releasesapi.ChartSourceRef `json:"editor,omitempty"`
EnforceQuota bool `json:"enforceQuota"`
}

type ActionInfo struct {
Expand Down
34 changes: 32 additions & 2 deletions apis/ui/v1alpha1/openapi_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions apis/ui/v1alpha1/resourceeditor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,9 @@ type ResourceEditorSpec struct {
}

type UIParameters struct {
Options *releasesapi.ChartSourceRef `json:"options,omitempty"`
Editor *releasesapi.ChartSourceRef `json:"editor,omitempty"`
Options *releasesapi.ChartSourceRef `json:"options,omitempty"`
Editor *releasesapi.ChartSourceRef `json:"editor,omitempty"`
EnforceQuota bool `json:"enforceQuota"`
// app.kubernetes.io/instance label must be updated at these paths when refilling metadata
// +optional
InstanceLabelPaths []string `json:"instanceLabelPaths,omitempty"`
Expand All @@ -82,6 +83,7 @@ type ActionTemplate struct {
Flow string `json:"flow"`
DisabledTemplate string `json:"disabledTemplate,omitempty"`
Editor *releasesapi.ChartSourceRef `json:"editor,omitempty"`
EnforceQuota bool `json:"enforceQuota"`
}

type VariantRef struct {
Expand Down
7 changes: 7 additions & 0 deletions crds/meta.k8s.appscode.com_resourcelayouts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1309,6 +1309,8 @@ spec:
- sourceRef
- version
type: object
enforceQuota:
type: boolean
flow:
type: string
icons:
Expand Down Expand Up @@ -1339,6 +1341,7 @@ spec:
operationId:
type: string
required:
- enforceQuota
- flow
- operationId
type: object
Expand Down Expand Up @@ -1379,6 +1382,8 @@ spec:
- sourceRef
- version
type: object
enforceQuota:
type: boolean
instanceLabelPaths:
description: app.kubernetes.io/instance label must be updated
at these paths when refilling metadata
Expand Down Expand Up @@ -1415,6 +1420,8 @@ spec:
- sourceRef
- version
type: object
required:
- enforceQuota
type: object
required:
- defaultLayout
Expand Down
3 changes: 3 additions & 0 deletions crds/meta.k8s.appscode.com_resourceoutlines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ spec:
- sourceRef
- version
type: object
enforceQuota:
type: boolean
flow:
type: string
icons:
Expand Down Expand Up @@ -106,6 +108,7 @@ spec:
operationId:
type: string
required:
- enforceQuota
- flow
- operationId
type: object
Expand Down
7 changes: 7 additions & 0 deletions crds/ui.k8s.appscode.com_resourceeditors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ spec:
- sourceRef
- version
type: object
enforceQuota:
type: boolean
flow:
type: string
icons:
Expand Down Expand Up @@ -198,6 +200,7 @@ spec:
operationId:
type: string
required:
- enforceQuota
- flow
- operationId
type: object
Expand Down Expand Up @@ -238,6 +241,8 @@ spec:
- sourceRef
- version
type: object
enforceQuota:
type: boolean
instanceLabelPaths:
description: app.kubernetes.io/instance label must be updated
at these paths when refilling metadata
Expand Down Expand Up @@ -274,6 +279,8 @@ spec:
- sourceRef
- version
type: object
required:
- enforceQuota
type: object
variants:
description: Kind == VendorChartPreset | ClusterChartPreset
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
1 change: 1 addition & 0 deletions hub/resourceeditors/acme.cert-manager.io/v1/orders.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ spec:
kind: HelmRepository
name: bytebuilders-ui
version: v0.4.18
enforceQuota: false
Loading
Loading