diff --git a/apis/installer/v1alpha1/capi_ui_presets_types.go b/apis/installer/v1alpha1/capi_ui_presets_types.go
index adc4f3e11..f5dc07387 100644
--- a/apis/installer/v1alpha1/capi_ui_presets_types.go
+++ b/apis/installer/v1alpha1/capi_ui_presets_types.go
@@ -18,7 +18,6 @@ package v1alpha1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime"
)
const (
@@ -39,9 +38,26 @@ const (
type CapiUiPresets struct {
metav1.TypeMeta `json:",inline,omitempty"`
metav1.ObjectMeta `json:"metadata,omitempty"`
- Spec runtime.RawExtension `json:"spec,omitempty"`
+ Spec CapiUiPresetsSpec `json:"spec,omitempty"`
}
+type CapiUiPresetsSpec struct {
+ // +optional
+ Provider CAPIProvider `json:"provider"`
+ Namespace string `json:"namespace"`
+ ClusterName string `json:"clusterName"`
+}
+
+// +kubebuilder:validation:Enum=capa;capg;capz
+type CAPIProvider string
+
+const (
+ CAPIProviderDisabled CAPIProvider = ""
+ CAPIProviderCAPA CAPIProvider = "capa"
+ CAPIProviderCAPG CAPIProvider = "capg"
+ CAPIProviderCAPZ CAPIProvider = "capz"
+)
+
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// CapiUiPresetsList is a list of CapiUiPresetss
diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
index 9c48195a2..caa42b125 100644
--- a/apis/installer/v1alpha1/zz_generated.deepcopy.go
+++ b/apis/installer/v1alpha1/zz_generated.deepcopy.go
@@ -1780,7 +1780,7 @@ func (in *CapiUiPresets) DeepCopyInto(out *CapiUiPresets) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
- in.Spec.DeepCopyInto(&out.Spec)
+ out.Spec = in.Spec
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CapiUiPresets.
@@ -1833,6 +1833,21 @@ func (in *CapiUiPresetsList) DeepCopyObject() runtime.Object {
return nil
}
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *CapiUiPresetsSpec) DeepCopyInto(out *CapiUiPresetsSpec) {
+ *out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CapiUiPresetsSpec.
+func (in *CapiUiPresetsSpec) DeepCopy() *CapiUiPresetsSpec {
+ if in == nil {
+ return nil
+ }
+ out := new(CapiUiPresetsSpec)
+ in.DeepCopyInto(out)
+ return out
+}
+
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *CertManager) DeepCopyInto(out *CertManager) {
*out = *in
diff --git a/charts/ace/Chart.lock b/charts/ace/Chart.lock
index 926ff1630..e518d4687 100644
--- a/charts/ace/Chart.lock
+++ b/charts/ace/Chart.lock
@@ -20,6 +20,9 @@ dependencies:
- name: platform-api
repository: file://../platform-api
version: v2023.03.23
+- name: platform-links
+ repository: file://../platform-links
+ version: v2023.03.23
- name: billing
repository: file://../billing
version: v2023.03.23
@@ -44,5 +47,5 @@ dependencies:
- name: nats
repository: https://nats-io.github.io/k8s/helm/charts/
version: 0.19.12
-digest: sha256:5c1ead17ecffea3af24f7ee32e4f5904c79b3aa0c541fd34cf6c9220766d7bc4
-generated: "2023-07-07T19:00:09.324582-07:00"
+digest: sha256:b0006c87ed8916d57e6fe79ca492ca2301b4f938d00990f653ca63080cf0ad9c
+generated: "2023-09-06T04:54:29.719092-07:00"
diff --git a/charts/ace/crds/cloud.bytebuilders.dev_credentials.yaml b/charts/ace/crds/cloud.bytebuilders.dev_credentials.yaml
index 5afd80c7b..ae8e82993 100644
--- a/charts/ace/crds/cloud.bytebuilders.dev_credentials.yaml
+++ b/charts/ace/crds/cloud.bytebuilders.dev_credentials.yaml
@@ -15,6 +15,8 @@ spec:
kind: Credential
listKind: CredentialList
plural: credentials
+ shortNames:
+ - cred
singular: credential
scope: Cluster
versions:
@@ -133,6 +135,19 @@ spec:
- apiKey
- projectID
type: object
+ rancher:
+ properties:
+ accessKeyID:
+ type: string
+ endpoint:
+ type: string
+ secretAccessKey:
+ type: string
+ required:
+ - accessKeyID
+ - endpoint
+ - secretAccessKey
+ type: object
scaleway:
properties:
organization:
@@ -175,6 +190,7 @@ spec:
- GoogleOAuth
- Linode
- Packet
+ - Rancher
- Scaleway
- Vultr
type: string
diff --git a/charts/ace/crds/cluster.bytebuilders.dev_clusterauthinfotemplates.yaml b/charts/ace/crds/cluster.bytebuilders.dev_clusterauthinfotemplates.yaml
index 8553dcde0..271ecba73 100644
--- a/charts/ace/crds/cluster.bytebuilders.dev_clusterauthinfotemplates.yaml
+++ b/charts/ace/crds/cluster.bytebuilders.dev_clusterauthinfotemplates.yaml
@@ -15,6 +15,8 @@ spec:
kind: ClusterAuthInfoTemplate
listKind: ClusterAuthInfoTemplateList
plural: clusterauthinfotemplates
+ shortNames:
+ - cauth
singular: clusterauthinfotemplate
scope: Cluster
versions:
diff --git a/charts/ace/crds/cluster.bytebuilders.dev_clusterinfos.yaml b/charts/ace/crds/cluster.bytebuilders.dev_clusterinfos.yaml
index 59f626c00..663befdaf 100644
--- a/charts/ace/crds/cluster.bytebuilders.dev_clusterinfos.yaml
+++ b/charts/ace/crds/cluster.bytebuilders.dev_clusterinfos.yaml
@@ -15,6 +15,8 @@ spec:
kind: ClusterInfo
listKind: ClusterInfoList
plural: clusterinfos
+ shortNames:
+ - cinfo
singular: clusterinfo
scope: Cluster
versions:
diff --git a/charts/ace/crds/cluster.bytebuilders.dev_clusteruserauths.yaml b/charts/ace/crds/cluster.bytebuilders.dev_clusteruserauths.yaml
index 52987f928..d9bb24ebe 100644
--- a/charts/ace/crds/cluster.bytebuilders.dev_clusteruserauths.yaml
+++ b/charts/ace/crds/cluster.bytebuilders.dev_clusteruserauths.yaml
@@ -15,6 +15,8 @@ spec:
kind: ClusterUserAuth
listKind: ClusterUserAuthList
plural: clusteruserauths
+ shortNames:
+ - uauth
singular: clusteruserauth
scope: Cluster
versions:
@@ -92,6 +94,18 @@ spec:
type: string
clusterUID:
type: string
+ credentialName:
+ type: string
+ googleCloud:
+ properties:
+ projectID:
+ type: string
+ serviceAccount:
+ type: string
+ required:
+ - projectID
+ - serviceAccount
+ type: object
googleOAuth:
properties:
accessToken:
diff --git a/charts/capi-ui-presets/Chart.yaml b/charts/capi-ui-presets/Chart.yaml
index aa431bbb4..b5c905599 100644
--- a/charts/capi-ui-presets/Chart.yaml
+++ b/charts/capi-ui-presets/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v2
name: capi-ui-presets
-description: ACE UI Presets for CAPI by AppsCode
+description: ACE UI Presets for CAPI Cluster by AppsCode
type: application
version: v2023.03.23
appVersion: v2023.03.23
diff --git a/charts/capi-ui-presets/README.md b/charts/capi-ui-presets/README.md
index d1d9d9447..f0d291ced 100644
--- a/charts/capi-ui-presets/README.md
+++ b/charts/capi-ui-presets/README.md
@@ -41,4 +41,26 @@ $ helm uninstall capi-ui-presets -n kubeops
The command removes all the Kubernetes components associated with the chart and deletes the release.
+## Configuration
+The following table lists the configurable parameters of the `capi-ui-presets` chart and their default values.
+
+| Parameter | Description | Default |
+|------------------|-------------|-----------------|
+| capi.provider | | "" |
+| capi.namespace | | "" |
+| capi.clusterName | | "" |
+
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
+
+```bash
+$ helm upgrade -i capi-ui-presets appscode/capi-ui-presets -n kubeops --create-namespace --version=v2023.03.23 --set -- generate from values file --
+```
+
+Alternatively, a YAML file that specifies the values for the parameters can be provided while
+installing the chart. For example:
+
+```bash
+$ helm upgrade -i capi-ui-presets appscode/capi-ui-presets -n kubeops --create-namespace --version=v2023.03.23 --values values.yaml
+```
diff --git a/charts/capi-ui-presets/crds/charts.x-helm.dev_chartpresets.yaml b/charts/capi-ui-presets/crds/charts.x-helm.dev_chartpresets.yaml
deleted file mode 100644
index ab6c6f3f4..000000000
--- a/charts/capi-ui-presets/crds/charts.x-helm.dev_chartpresets.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- creationTimestamp: null
- name: chartpresets.charts.x-helm.dev
-spec:
- group: charts.x-helm.dev
- names:
- kind: ChartPreset
- listKind: ChartPresetList
- plural: chartpresets
- singular: chartpreset
- scope: Namespaced
- versions:
- - name: v1alpha1
- schema:
- openAPIV3Schema:
- description: ChartPreset is the Schema for the chartpresets API
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: ClusterChartPresetSpec defines the desired state of ClusterChartPreset
- properties:
- displayName:
- type: string
- usePresets:
- items:
- description: TypedLocalObjectReference contains enough information
- to let you locate the typed referenced object inside the same
- namespace.
- properties:
- apiGroup:
- description: APIGroup is the group for the resource being referenced.
- If APIGroup is not specified, the specified Kind must be in
- the core API group. For any other third-party types, APIGroup
- is required.
- type: string
- kind:
- description: Kind is the type of resource being referenced
- type: string
- name:
- description: Name is the name of resource being referenced
- type: string
- selector:
- description: A label selector is a label query over a set of
- resources. The result of matchLabels and matchExpressions
- are ANDed. An empty label selector matches all objects. A
- null label selector matches no objects.
- properties:
- matchExpressions:
- description: matchExpressions is a list of label selector
- requirements. The requirements are ANDed.
- items:
- description: A label selector requirement is a selector
- that contains values, a key, and an operator that relates
- the key and values.
- properties:
- key:
- description: key is the label key that the selector
- applies to.
- type: string
- operator:
- description: operator represents a key's relationship
- to a set of values. Valid operators are In, NotIn,
- Exists and DoesNotExist.
- type: string
- values:
- description: values is an array of string values.
- If the operator is In or NotIn, the values array
- must be non-empty. If the operator is Exists or
- DoesNotExist, the values array must be empty. This
- array is replaced during a strategic merge patch.
- items:
- type: string
- type: array
- required:
- - key
- - operator
- type: object
- type: array
- matchLabels:
- additionalProperties:
- type: string
- description: matchLabels is a map of {key,value} pairs.
- A single {key,value} in the matchLabels map is equivalent
- to an element of matchExpressions, whose key field is
- "key", the operator is "In", and the values array contains
- only "value". The requirements are ANDed.
- type: object
- type: object
- x-kubernetes-map-type: atomic
- required:
- - kind
- type: object
- x-kubernetes-map-type: atomic
- type: array
- values:
- type: object
- x-kubernetes-preserve-unknown-fields: true
- type: object
- type: object
- served: true
- storage: true
- subresources:
- status: {}
diff --git a/charts/capi-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml b/charts/capi-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml
index 6664e1946..4e7a35892 100644
--- a/charts/capi-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml
+++ b/charts/capi-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml
@@ -33,79 +33,6 @@ spec:
spec:
description: ClusterChartPresetSpec defines the desired state of ClusterChartPreset
properties:
- displayName:
- type: string
- usePresets:
- items:
- description: TypedLocalObjectReference contains enough information
- to let you locate the typed referenced object inside the same
- namespace.
- properties:
- apiGroup:
- description: APIGroup is the group for the resource being referenced.
- If APIGroup is not specified, the specified Kind must be in
- the core API group. For any other third-party types, APIGroup
- is required.
- type: string
- kind:
- description: Kind is the type of resource being referenced
- type: string
- name:
- description: Name is the name of resource being referenced
- type: string
- selector:
- description: A label selector is a label query over a set of
- resources. The result of matchLabels and matchExpressions
- are ANDed. An empty label selector matches all objects. A
- null label selector matches no objects.
- properties:
- matchExpressions:
- description: matchExpressions is a list of label selector
- requirements. The requirements are ANDed.
- items:
- description: A label selector requirement is a selector
- that contains values, a key, and an operator that relates
- the key and values.
- properties:
- key:
- description: key is the label key that the selector
- applies to.
- type: string
- operator:
- description: operator represents a key's relationship
- to a set of values. Valid operators are In, NotIn,
- Exists and DoesNotExist.
- type: string
- values:
- description: values is an array of string values.
- If the operator is In or NotIn, the values array
- must be non-empty. If the operator is Exists or
- DoesNotExist, the values array must be empty. This
- array is replaced during a strategic merge patch.
- items:
- type: string
- type: array
- required:
- - key
- - operator
- type: object
- type: array
- matchLabels:
- additionalProperties:
- type: string
- description: matchLabels is a map of {key,value} pairs.
- A single {key,value} in the matchLabels map is equivalent
- to an element of matchExpressions, whose key field is
- "key", the operator is "In", and the values array contains
- only "value". The requirements are ANDed.
- type: object
- type: object
- x-kubernetes-map-type: atomic
- required:
- - kind
- type: object
- x-kubernetes-map-type: atomic
- type: array
values:
type: object
x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/capi-ui-presets/templates/preset.yaml b/charts/capi-ui-presets/templates/preset.yaml
index 79f32e87d..6b0d52723 100644
--- a/charts/capi-ui-presets/templates/preset.yaml
+++ b/charts/capi-ui-presets/templates/preset.yaml
@@ -1,14 +1,15 @@
-{{- with .Values }}
+{{ $m := .Values.capi }}
+{{- if .Values.global }}
+{{- $m = .Values.global.capi }}
+{{- end }}
apiVersion: charts.x-helm.dev/v1alpha1
kind: ClusterChartPreset
metadata:
- name: capi-preset
+ name: capi-presets
labels:
cluster.x-k8s.io/is-default-preset: "true"
spec:
- displayName: capi-preset
values:
- {{- toYaml . | nindent 4 }}
-
-{{- end }}
\ No newline at end of file
+ form:
+ {{- toYaml .Values | nindent 6 }}
diff --git a/charts/capi-ui-presets/values.openapiv3_schema.yaml b/charts/capi-ui-presets/values.openapiv3_schema.yaml
index 448771298..bec3c2cca 100644
--- a/charts/capi-ui-presets/values.openapiv3_schema.yaml
+++ b/charts/capi-ui-presets/values.openapiv3_schema.yaml
@@ -1,2 +1,15 @@
+properties:
+ clusterName:
+ type: string
+ namespace:
+ type: string
+ provider:
+ enum:
+ - capa
+ - capg
+ - capz
+ type: string
+required:
+- clusterName
+- namespace
type: object
-x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/capi-ui-presets/values.yaml b/charts/capi-ui-presets/values.yaml
index 5f6c5362e..c282dae14 100644
--- a/charts/capi-ui-presets/values.yaml
+++ b/charts/capi-ui-presets/values.yaml
@@ -2,13 +2,7 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
-# spec:
-# managed:
-# k8sVersion: v1.22.0
-# clusterName: capi-aws
-# clusterNamespace: kubedb-managed
-# aws:
-# machinePoolTemplate:
-# name: mongo-machine-pool
-# externalDnsOperator:
-# domainFilter: superm4n.tk
+capi:
+ provider: ""
+ namespace: ""
+ clusterName: ""
diff --git a/charts/monitoring-ui-presets/crds/charts.x-helm.dev_chartpresets.yaml b/charts/monitoring-ui-presets/crds/charts.x-helm.dev_chartpresets.yaml
deleted file mode 100644
index ab6c6f3f4..000000000
--- a/charts/monitoring-ui-presets/crds/charts.x-helm.dev_chartpresets.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- creationTimestamp: null
- name: chartpresets.charts.x-helm.dev
-spec:
- group: charts.x-helm.dev
- names:
- kind: ChartPreset
- listKind: ChartPresetList
- plural: chartpresets
- singular: chartpreset
- scope: Namespaced
- versions:
- - name: v1alpha1
- schema:
- openAPIV3Schema:
- description: ChartPreset is the Schema for the chartpresets API
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: ClusterChartPresetSpec defines the desired state of ClusterChartPreset
- properties:
- displayName:
- type: string
- usePresets:
- items:
- description: TypedLocalObjectReference contains enough information
- to let you locate the typed referenced object inside the same
- namespace.
- properties:
- apiGroup:
- description: APIGroup is the group for the resource being referenced.
- If APIGroup is not specified, the specified Kind must be in
- the core API group. For any other third-party types, APIGroup
- is required.
- type: string
- kind:
- description: Kind is the type of resource being referenced
- type: string
- name:
- description: Name is the name of resource being referenced
- type: string
- selector:
- description: A label selector is a label query over a set of
- resources. The result of matchLabels and matchExpressions
- are ANDed. An empty label selector matches all objects. A
- null label selector matches no objects.
- properties:
- matchExpressions:
- description: matchExpressions is a list of label selector
- requirements. The requirements are ANDed.
- items:
- description: A label selector requirement is a selector
- that contains values, a key, and an operator that relates
- the key and values.
- properties:
- key:
- description: key is the label key that the selector
- applies to.
- type: string
- operator:
- description: operator represents a key's relationship
- to a set of values. Valid operators are In, NotIn,
- Exists and DoesNotExist.
- type: string
- values:
- description: values is an array of string values.
- If the operator is In or NotIn, the values array
- must be non-empty. If the operator is Exists or
- DoesNotExist, the values array must be empty. This
- array is replaced during a strategic merge patch.
- items:
- type: string
- type: array
- required:
- - key
- - operator
- type: object
- type: array
- matchLabels:
- additionalProperties:
- type: string
- description: matchLabels is a map of {key,value} pairs.
- A single {key,value} in the matchLabels map is equivalent
- to an element of matchExpressions, whose key field is
- "key", the operator is "In", and the values array contains
- only "value". The requirements are ANDed.
- type: object
- type: object
- x-kubernetes-map-type: atomic
- required:
- - kind
- type: object
- x-kubernetes-map-type: atomic
- type: array
- values:
- type: object
- x-kubernetes-preserve-unknown-fields: true
- type: object
- type: object
- served: true
- storage: true
- subresources:
- status: {}
diff --git a/charts/monitoring-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml b/charts/monitoring-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml
index 6664e1946..4e7a35892 100644
--- a/charts/monitoring-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml
+++ b/charts/monitoring-ui-presets/crds/charts.x-helm.dev_clusterchartpresets.yaml
@@ -33,79 +33,6 @@ spec:
spec:
description: ClusterChartPresetSpec defines the desired state of ClusterChartPreset
properties:
- displayName:
- type: string
- usePresets:
- items:
- description: TypedLocalObjectReference contains enough information
- to let you locate the typed referenced object inside the same
- namespace.
- properties:
- apiGroup:
- description: APIGroup is the group for the resource being referenced.
- If APIGroup is not specified, the specified Kind must be in
- the core API group. For any other third-party types, APIGroup
- is required.
- type: string
- kind:
- description: Kind is the type of resource being referenced
- type: string
- name:
- description: Name is the name of resource being referenced
- type: string
- selector:
- description: A label selector is a label query over a set of
- resources. The result of matchLabels and matchExpressions
- are ANDed. An empty label selector matches all objects. A
- null label selector matches no objects.
- properties:
- matchExpressions:
- description: matchExpressions is a list of label selector
- requirements. The requirements are ANDed.
- items:
- description: A label selector requirement is a selector
- that contains values, a key, and an operator that relates
- the key and values.
- properties:
- key:
- description: key is the label key that the selector
- applies to.
- type: string
- operator:
- description: operator represents a key's relationship
- to a set of values. Valid operators are In, NotIn,
- Exists and DoesNotExist.
- type: string
- values:
- description: values is an array of string values.
- If the operator is In or NotIn, the values array
- must be non-empty. If the operator is Exists or
- DoesNotExist, the values array must be empty. This
- array is replaced during a strategic merge patch.
- items:
- type: string
- type: array
- required:
- - key
- - operator
- type: object
- type: array
- matchLabels:
- additionalProperties:
- type: string
- description: matchLabels is a map of {key,value} pairs.
- A single {key,value} in the matchLabels map is equivalent
- to an element of matchExpressions, whose key field is
- "key", the operator is "In", and the values array contains
- only "value". The requirements are ANDed.
- type: object
- type: object
- x-kubernetes-map-type: atomic
- required:
- - kind
- type: object
- x-kubernetes-map-type: atomic
- type: array
values:
type: object
x-kubernetes-preserve-unknown-fields: true
diff --git a/charts/monitoring-ui-presets/crds/ui.k8s.appscode.com_resourceeditors.yaml b/charts/monitoring-ui-presets/crds/ui.k8s.appscode.com_resourceeditors.yaml
deleted file mode 100644
index 90d9d1d4f..000000000
--- a/charts/monitoring-ui-presets/crds/ui.k8s.appscode.com_resourceeditors.yaml
+++ /dev/null
@@ -1,200 +0,0 @@
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
- creationTimestamp: null
- name: resourceeditors.ui.k8s.appscode.com
-spec:
- group: ui.k8s.appscode.com
- names:
- kind: ResourceEditor
- listKind: ResourceEditorList
- plural: resourceeditors
- singular: resourceeditor
- scope: Cluster
- versions:
- - additionalPrinterColumns:
- - jsonPath: .status.phase
- name: Status
- type: string
- - jsonPath: .metadata.creationTimestamp
- name: Age
- type: date
- name: v1alpha1
- schema:
- openAPIV3Schema:
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- properties:
- icons:
- description: Icons is an optional list of icons for an application.
- Icon information includes the source, size, and mime type.
- items:
- description: ImageSpec contains information about an image used
- as an icon.
- properties:
- size:
- description: (optional) The size of the image in pixels (e.g.,
- 25x25).
- type: string
- src:
- description: The source for image represented as either an absolute
- URL to the image or a Data URL containing the image. Data
- URLs are defined in RFC 2397.
- type: string
- type:
- description: (optional) The mine type of the image (e.g., "image/png").
- type: string
- required:
- - src
- type: object
- type: array
- installer:
- properties:
- chart:
- description: ChartRepoRef references to a single version of a
- Chart
- properties:
- name:
- type: string
- url:
- type: string
- version:
- type: string
- required:
- - name
- - version
- type: object
- planID:
- type: string
- productID:
- type: string
- type: object
- resource:
- description: ResourceID identifies a resource
- properties:
- group:
- type: string
- kind:
- description: Kind is the serialized kind of the resource. It
- is normally CamelCase and singular.
- type: string
- name:
- description: 'Name is the plural name of the resource to serve. It
- must match the name of the CustomResourceDefinition-registration
- too: plural.group and it must be all lowercase.'
- type: string
- scope:
- description: ResourceScope is an enum defining the different scopes
- available to a custom resource
- type: string
- version:
- type: string
- required:
- - group
- - kind
- - name
- - scope
- - version
- type: object
- ui:
- properties:
- editor:
- description: ChartRepoRef references to a single version of a
- Chart
- properties:
- name:
- type: string
- url:
- type: string
- version:
- type: string
- required:
- - name
- - version
- type: object
- instanceLabelPaths:
- description: app.kubernetes.io/instance label must be updated
- at these paths when refilling metadata
- items:
- type: string
- type: array
- options:
- description: ChartRepoRef references to a single version of a
- Chart
- properties:
- name:
- type: string
- url:
- type: string
- version:
- type: string
- required:
- - name
- - version
- type: object
- type: object
- variants:
- description: Kind == VendorChartPreset | ClusterChartPreset
- items:
- properties:
- apiGroup:
- description: APIGroup is the group for the resource being referenced.
- If APIGroup is not specified, the specified Kind must be in
- the core API group. For any other third-party types, APIGroup
- is required.
- type: string
- icons:
- description: Icons is an optional list of icons for an application.
- Icon information includes the source, size, and mime type.
- items:
- description: ImageSpec contains information about an image
- used as an icon.
- properties:
- size:
- description: (optional) The size of the image in pixels
- (e.g., 25x25).
- type: string
- src:
- description: The source for image represented as either
- an absolute URL to the image or a Data URL containing
- the image. Data URLs are defined in RFC 2397.
- type: string
- type:
- description: (optional) The mine type of the image (e.g.,
- "image/png").
- type: string
- required:
- - src
- type: object
- type: array
- kind:
- description: Kind is the type of resource being referenced
- type: string
- name:
- description: Name is the name of resource being referenced
- type: string
- required:
- - kind
- - name
- type: object
- type: array
- required:
- - resource
- type: object
- type: object
- served: true
- storage: true
- subresources:
- status: {}
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/elasticsearches/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/elasticsearches/editor.yaml
deleted file mode 100644
index 463a1e933..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/elasticsearches/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: Elasticsearch
- k8s.io/resource: elasticsearches
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-elasticsearches
-spec:
- resource:
- group: kubedb.com
- kind: Elasticsearch
- name: elasticsearches
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-elasticsearches
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/elasticsearches/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/elasticsearches/preset.yaml
deleted file mode 100644
index fb62297ef..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/elasticsearches/preset.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-elasticsearches
-spec:
- displayName: Elasticsearch
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- enabled: {{ .Values.monitoring.alert.enabled }}
- {{- with $m.alert.labels }}
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- labels: {}
- {{- end }}
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mariadbs/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mariadbs/editor.yaml
deleted file mode 100644
index 197498d4b..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mariadbs/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: MariaDB
- k8s.io/resource: mariadbs
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-mariadbs
-spec:
- resource:
- group: kubedb.com
- kind: MariaDB
- name: mariadbs
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-mariadbs
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mariadbs/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mariadbs/preset.yaml
deleted file mode 100644
index a5a3f525d..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mariadbs/preset.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-mariadbs
-spec:
- displayName: MariaDB
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- enabled: {{ .Values.monitoring.alert.enabled }}
- {{- with $m.alert.labels }}
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- labels: {}
- {{- end }}
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mongodbs/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mongodbs/editor.yaml
deleted file mode 100644
index 3a058f737..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mongodbs/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: MongoDB
- k8s.io/resource: mongodbs
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-mongodbs
-spec:
- resource:
- group: kubedb.com
- kind: MongoDB
- name: mongodbs
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-mongodbs
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mongodbs/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mongodbs/preset.yaml
deleted file mode 100644
index 41ccc1091..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mongodbs/preset.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-mongodbs
-spec:
- displayName: MongoDB
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- enabled: {{ .Values.monitoring.alert.enabled }}
- {{- with $m.alert.labels }}
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- labels: {}
- {{- end }}
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mysqls/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mysqls/editor.yaml
deleted file mode 100644
index 0b78463d5..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mysqls/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: MySQL
- k8s.io/resource: mysqls
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-mysqls
-spec:
- resource:
- group: kubedb.com
- kind: MySQL
- name: mysqls
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-mysqls
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/pgbouncers/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/pgbouncers/editor.yaml
deleted file mode 100644
index e93342eeb..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/pgbouncers/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: PgBouncer
- k8s.io/resource: pgbouncers
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-pgbouncers
-spec:
- resource:
- group: kubedb.com
- kind: PgBouncer
- name: pgbouncers
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-pgbouncers
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/pgbouncers/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/pgbouncers/preset.yaml
deleted file mode 100644
index 00da9dd33..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/pgbouncers/preset.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-pgbouncers
-spec:
- displayName: PgBouncer
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- # form:
- # alert:
- # {{- with $m.alert.labels }}
- # enabled: true
- # labels:
- # {{- toYaml . | nindent 10 }}
- # {{- else }}
- # enabled: false
- # labels: {}
- # {{- end }}
\ No newline at end of file
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/postgreses/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/postgreses/editor.yaml
deleted file mode 100644
index 803d9512d..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/postgreses/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: Postgres
- k8s.io/resource: postgreses
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-postgreses
-spec:
- resource:
- group: kubedb.com
- kind: Postgres
- name: postgreses
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-postgreses
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/postgreses/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/postgreses/preset.yaml
deleted file mode 100644
index 890620d38..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/postgreses/preset.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-postgreses
-spec:
- displayName: Postgres
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- enabled: {{ .Values.monitoring.alert.enabled }}
- {{- with $m.alert.labels }}
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- labels: {}
- {{- end }}
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/proxysqls/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/proxysqls/editor.yaml
deleted file mode 100644
index 33e7f4d64..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/proxysqls/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: ProxySQL
- k8s.io/resource: proxysqls
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-proxysqls
-spec:
- resource:
- group: kubedb.com
- kind: ProxySQL
- name: proxysqls
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-proxysqls
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/proxysqls/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/proxysqls/preset.yaml
deleted file mode 100644
index 9b5243bc3..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/proxysqls/preset.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-proxysqls
-spec:
- displayName: ProxySQL
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- enabled: {{ .Values.monitoring.alert.enabled }}
- {{- with $m.alert.labels }}
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- labels: {}
- {{- end }}
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/redises/editor.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/redises/editor.yaml
deleted file mode 100644
index 6e33906d4..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/redises/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubedb.com
- k8s.io/kind: Redis
- k8s.io/resource: redises
- k8s.io/version: v1alpha2
- name: kubedb.com-v1alpha2-redises
-spec:
- resource:
- group: kubedb.com
- kind: Redis
- name: redises
- scope: Namespaced
- version: v1alpha2
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubedb.com-v1alpha2-redises
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/redises/preset.yaml b/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/redises/preset.yaml
deleted file mode 100644
index 1a8d12a80..000000000
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/redises/preset.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubedb.com-v1alpha2-redises
-spec:
- displayName: Redis
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- enabled: {{ .Values.monitoring.alert.enabled }}
- {{- with $m.alert.labels }}
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- labels: {}
- {{- end }}
diff --git a/charts/monitoring-ui-presets/templates/kubevault.com/v1alpha1/vaultservers/editor.yaml b/charts/monitoring-ui-presets/templates/kubevault.com/v1alpha1/vaultservers/editor.yaml
deleted file mode 100644
index 6853d149b..000000000
--- a/charts/monitoring-ui-presets/templates/kubevault.com/v1alpha1/vaultservers/editor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: ui.k8s.appscode.com/v1alpha1
-kind: ResourceEditor
-metadata:
- creationTimestamp: null
- labels:
- k8s.io/group: kubevault.com
- k8s.io/kind: VaultServer
- k8s.io/resource: vaultservers
- k8s.io/version: v1alpha1
- name: kubevault.com-v1alpha1-vaultservers
-spec:
- resource:
- group: kubevault.com
- kind: VaultServer
- name: vaultservers
- scope: Namespaced
- version: v1alpha1
- variants:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- name: kubevault.com-v1alpha1-vaultservers
diff --git a/charts/monitoring-ui-presets/templates/kubevault.com/v1alpha1/vaultservers/preset.yaml b/charts/monitoring-ui-presets/templates/kubevault.com/v1alpha1/vaultservers/preset.yaml
deleted file mode 100644
index 4148342de..000000000
--- a/charts/monitoring-ui-presets/templates/kubevault.com/v1alpha1/vaultservers/preset.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-{{ $m := .Values.monitoring }}
-{{- if .Values.global }}
-{{- $m = .Values.global.monitoring }}
-{{- end }}
-
-apiVersion: charts.x-helm.dev/v1alpha1
-kind: ClusterChartPreset
-metadata:
- name: kubevault.com-v1alpha1-vaultservers
-spec:
- displayName: "Vault Server"
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
- values:
- spec:
- monitoring:
- {{- with $m.serviceMonitor.labels }}
- agent: prometheus.io/operator
- serviceMonitor:
- labels:
- {{- toYaml . | nindent 12 }}
- {{- else }}
- agent: ""
- serviceMonitor:
- labels: {}
- {{- end }}
- form:
- alert:
- {{- with $m.alert.labels }}
- enabled: true
- labels:
- {{- toYaml . | nindent 10 }}
- {{- else }}
- enabled: false
- labels: {}
- {{- end }}
\ No newline at end of file
diff --git a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mysqls/preset.yaml b/charts/monitoring-ui-presets/templates/preset.yaml
similarity index 76%
rename from charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mysqls/preset.yaml
rename to charts/monitoring-ui-presets/templates/preset.yaml
index f4e5ea1a6..0b50341f0 100644
--- a/charts/monitoring-ui-presets/templates/kubedb.com/v1alpha2/mysqls/preset.yaml
+++ b/charts/monitoring-ui-presets/templates/preset.yaml
@@ -6,15 +6,10 @@
apiVersion: charts.x-helm.dev/v1alpha1
kind: ClusterChartPreset
metadata:
- name: kubedb.com-v1alpha2-mysqls
+ name: monitoring-presets
+ labels:
+ cluster.x-k8s.io/is-default-preset: "true"
spec:
- displayName: MySQL
- usePresets:
- - apiGroup: charts.x-helm.dev
- kind: ClusterChartPreset
- selector:
- matchLabels:
- cluster.x-k8s.io/is-default-preset: "true"
values:
spec:
monitoring:
diff --git a/charts/opscenter-features/crds/ui.k8s.appscode.com_featuresets.yaml b/charts/opscenter-features/crds/ui.k8s.appscode.com_featuresets.yaml
index 686b02893..66c0392fa 100644
--- a/charts/opscenter-features/crds/ui.k8s.appscode.com_featuresets.yaml
+++ b/charts/opscenter-features/crds/ui.k8s.appscode.com_featuresets.yaml
@@ -121,6 +121,27 @@ spec:
type: object
status:
properties:
+ dependents:
+ description: Dependents specifies the feature sets which depend on
+ this FeatureSet
+ properties:
+ featureSets:
+ description: FeatureSets specifies a list of FeatureSet names
+ that depend on this FeatureSet
+ items:
+ properties:
+ features:
+ description: Features specifies the Feature names of the
+ dependent FeatureSet
+ items:
+ type: string
+ type: array
+ name:
+ description: Name specifies the name of the dependent FeatureSet
+ type: string
+ type: object
+ type: array
+ type: object
enabled:
description: Enabled specifies whether this feature set is enabled
or not.
diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh
index bb9b2bb19..9e94756dd 100755
--- a/hack/scripts/import-crds.sh
+++ b/hack/scripts/import-crds.sh
@@ -55,32 +55,9 @@ KUBEPACK_PRESET_TAG=${KUBEPACK_PRESET_TAG:-v0.0.2}
HELM_X_APIMACHINERY_TAG=${HELM_X_APIMACHINERY_TAG:-master}
crd-importer \
- --input=https://github.com/x-helm/apimachinery/raw/${HELM_X_APIMACHINERY_TAG}/crds/charts.x-helm.dev_chartpresets.yaml \
--input=https://github.com/x-helm/apimachinery/raw/${HELM_X_APIMACHINERY_TAG}/crds/charts.x-helm.dev_clusterchartpresets.yaml \
--out=./charts/capi-ui-presets/crds
crd-importer \
- --input=https://github.com/kmodules/resource-metadata/raw/${KMODULES_RESOURCE_METADATA_TAG}/crds/ui.k8s.appscode.com_resourceeditors.yaml \
- --input=https://github.com/x-helm/apimachinery/raw/${HELM_X_APIMACHINERY_TAG}/crds/charts.x-helm.dev_chartpresets.yaml \
--input=https://github.com/x-helm/apimachinery/raw/${HELM_X_APIMACHINERY_TAG}/crds/charts.x-helm.dev_clusterchartpresets.yaml \
--out=./charts/monitoring-ui-presets/crds
-
-BYTEBUILDERS_APPCATALOG_TAG=${BYTEBUILDERS_APPCATALOG_TAG:-v0.0.1}
-KUBEDB_APIMACHINERY_TAG=${KUBEDB_APIMACHINERY_TAG:-v0.32.0}
-KUBEVAULT_APIMACHINERY_TAG=${KUBEVAULT_APIMACHINERY_TAG:-v0.14.0}
-
-crd-importer \
- --input=https://github.com/bytebuilders/appcatalog/raw/${BYTEBUILDERS_APPCATALOG_TAG}/crds/appcatalog.appscode.com_hostedapps.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_elasticsearches.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_kafkas.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_mariadbs.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_memcacheds.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_mongodbs.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_mysqls.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_perconaxtradbs.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_pgbouncers.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_postgreses.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_proxysqls.yaml \
- --input=https://github.com/kubedb/apimachinery/raw/${KUBEDB_APIMACHINERY_TAG}/crds/kubedb.com_redises.yaml \
- --input=https://github.com/kubevault/apimachinery/raw/${KUBEVAULT_APIMACHINERY_TAG}/crds/kubevault.com_vaultservers.yaml \
- --out=./charts/appcatalog/crds