Rename preset to variant

Signed-off-by: Tamal Saha <[email protected]>
kmodules · Sep 29, 2023 · 4d03281 · 4d03281
1 parent 387ea5d
commit 4d03281
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 11 deletions.
diff --git a/apis/management/v1alpha1/openapi_generated.go b/apis/management/v1alpha1/openapi_generated.go
diff --git a/apis/management/v1alpha1/projectquota_types.go b/apis/management/v1alpha1/projectquota_types.go
@@ -65,11 +65,20 @@ type ProjectQuotaStatus struct {
 
 type ResourceQuotaStatus struct {
 	ResourceQuotaSpec `json:",inline"`
+	Result            QuotaResult `json:"result"`
 	// Used is the current observed total usage of the resource in the namespace.
 	// +optional
 	Used core.ResourceList `json:"used,omitempty"`
 }
 
+// +kubebuilder:validation:Enum=Success;Error
+type QuotaResult string
+
+const (
+	ResultSuccess QuotaResult = "Success"
+	ResultError   QuotaResult = "Error"
+)
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 

diff --git a/apis/meta/v1alpha1/openapi_generated.go b/apis/meta/v1alpha1/openapi_generated.go
diff --git a/apis/meta/v1alpha1/ui_menu_types.go b/apis/meta/v1alpha1/ui_menu_types.go
@@ -84,7 +84,7 @@ type MenuItem struct {
 	Icons     []helmshared.ImageSpec       `json:"icons,omitempty"`
 	Installer *shared.DeploymentParameters `json:"installer,omitempty"`
 	// +optional
-	Preset string `json:"preset,omitempty"`
+	Variant string `json:"variant,omitempty"`
 	// +optional
 	AvailableVariants int `json:"availableVariants,omitempty"`
 	// +optional

diff --git a/crds/management.k8s.appscode.com_projectquotas.yaml b/crds/management.k8s.appscode.com_projectquotas.yaml
@@ -81,6 +81,11 @@ spec:
                       type: object
                     kind:
                       type: string
+                    result:
+                      enum:
+                      - Success
+                      - Error
+                      type: string
                     used:
                       additionalProperties:
                         anyOf:
@@ -91,6 +96,8 @@ spec:
                       description: Used is the current observed total usage of the
                         resource in the namespace.
                       type: object
+                  required:
+                  - result
                   type: object
                 type: array
             required:

diff --git a/go.mod b/go.mod
@@ -33,7 +33,7 @@ require (
 	sigs.k8s.io/cli-utils v0.34.0
 	sigs.k8s.io/controller-runtime v0.13.1
 	sigs.k8s.io/yaml v1.3.0
-	x-helm.dev/apimachinery v0.0.11
+	x-helm.dev/apimachinery v0.0.12
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -754,5 +754,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kF
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
-x-helm.dev/apimachinery v0.0.11 h1:tUrxsKeRT84UCw+hHuV7isheWCv9yoS8m8lwWacVkZ4=
-x-helm.dev/apimachinery v0.0.11/go.mod h1:jjkebU6uv/cS/8pQGE8tbgK/rB39yh4ETiAglPbDWZc=
+x-helm.dev/apimachinery v0.0.12 h1:lEuGH5F+6xqL7/uL+SsoOUXeJZFgC8c2OQgtMMj/fQM=
+x-helm.dev/apimachinery v0.0.12/go.mod h1:jjkebU6uv/cS/8pQGE8tbgK/rB39yh4ETiAglPbDWZc=
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -768,7 +768,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.3.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# x-helm.dev/apimachinery v0.0.11
+# x-helm.dev/apimachinery v0.0.12
 ## explicit; go 1.19
 x-helm.dev/apimachinery/apis/charts/v1alpha1
 x-helm.dev/apimachinery/apis/releases/v1alpha1

diff --git a/vendor/x-helm.dev/apimachinery/apis/charts/v1alpha1/interface_types.go b/vendor/x-helm.dev/apimachinery/apis/charts/v1alpha1/interface_types.go
@@ -47,11 +47,11 @@ type ChartPresetFlatRef struct {
 	releasesv1alpha1.ChartSourceFlatRef `json:",inline"`
 
 	// Editor GVR
-	Group      string `json:"group,omitempty"`
-	Resource   string `json:"resource,omitempty"`
-	Kind       string `json:"kind,omitempty"`
-	PresetName string `json:"presetName,omitempty"`
-	Namespace  string `json:"namespace,omitempty"`
+	Group     string `json:"group,omitempty"`
+	Resource  string `json:"resource,omitempty"`
+	Kind      string `json:"kind,omitempty"`
+	Variant   string `json:"variant,omitempty"`
+	Namespace string `json:"namespace,omitempty"`
 }
 
 type ChartPresetValues struct {