Move crossplane and kubedb-provider-* features to a separate folder (#…

…285) Signed-off-by: Masudur Rahman <[email protected]> Signed-off-by: Tamal Saha <[email protected]> Co-authored-by: Tamal Saha <[email protected]>
appscode-cloud · Dec 22, 2023 · 7f77352 · 7f77352
1 parent a79190d
commit 7f77352
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 319 deletions.
diff --git a/charts/ace/README.md b/charts/ace/README.md
@@ -107,7 +107,7 @@ The following table lists the configurable parameters of the `ace` chart and the
 | global.infra.invoice.bucket                          |                                                                                                                                                                                                                                                | <code>gs://invoice-storage-demo</code>                         |
 | global.infra.invoice.prefix                          |                                                                                                                                                                                                                                                | <code>""</code>                                                |
 | global.infra.invoice.trackerEmail                    |                                                                                                                                                                                                                                                | <code>[email protected]</code>                      |
-| settings.db.version                                  |                                                                                                                                                                                                                                                | <code>"15.3"</code>                                            |
+| settings.db.version                                  |                                                                                                                                                                                                                                                | <code>"15.5"</code>                                            |
 | settings.db.databaseName                             |                                                                                                                                                                                                                                                | <code>bb</code>                                                |
 | settings.db.terminationPolicy                        |                                                                                                                                                                                                                                                | <code>Delete</code>                                            |
 | settings.db.persistence.size                         |                                                                                                                                                                                                                                                | <code>10Gi</code>                                              |

diff --git a/...es/featuresets/dbaas-capa/crossplane.yaml → ...es/featuresets/crossplane/crossplane.yaml b/...es/featuresets/dbaas-capa/crossplane.yaml → ...es/featuresets/crossplane/crossplane.yaml
@@ -1,5 +1,3 @@
-{{- if eq .Values.capi.provider "capa" }}
-
 {{ $overrides := printf `
 image:
   repository: %s
@@ -13,15 +11,15 @@ kind: Feature
 metadata:
   name: crossplane
   labels:
-    app.kubernetes.io/part-of: dbaas-capa
+    app.kubernetes.io/part-of: crossplane
 spec:
   title: Crossplane
   description: |
     The cloud native control plane framework
   icons:
     - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
       type: image/svg+xml
-  featureSet: dbaas-capa
+  featureSet: crossplane
   featureBlock: crossplane
   recommended: true
   readinessChecks:
@@ -43,5 +41,3 @@ spec:
 {{- with $vals }}
   {{- dict "values" . | toYaml | nindent 2 }}
 {{- end }}
-
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/crossplane/featureset.yaml b/charts/opscenter-features/templates/featuresets/crossplane/featureset.yaml
@@ -0,0 +1,31 @@
+{{- $capiFeatures := dict
+  "capa" "aws"
+  "capz" "azure"
+  "capg" "gcp"
+-}}
+
+apiVersion: ui.k8s.appscode.com/v1alpha1
+kind: FeatureSet
+metadata:
+  name: crossplane
+spec:
+  title: Crossplane
+  description: |
+    The cloud native control plane framework
+  icons:
+    - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
+      type: image/svg+xml
+  {{- if ne .Values.capi.provider "" }}
+  recommended: true
+  requiredFeatures:
+    - crossplane
+    - kubedb-provider-{{ index $capiFeatures .Values.capi.provider }}
+  {{- end }}
+  chart:
+    name: uik8sappscodecom-featureset-dbaas-capa-editor
+    version: {{ .Chart.AppVersion }}
+    sourceRef:
+      apiGroup: source.toolkit.fluxcd.io
+      kind: HelmRepository
+      name: appscode-charts-oci
+      namespace: {{ .Release.Namespace }}
diff --git a/...esets/dbaas-capa/kubedb-provider-aws.yaml → ...esets/crossplane/kubedb-provider-aws.yaml b/...esets/dbaas-capa/kubedb-provider-aws.yaml → ...esets/crossplane/kubedb-provider-aws.yaml
@@ -1,5 +1,3 @@
-{{- if eq .Values.capi.provider "capa" }}
-
 {{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }}
 
 {{ $vals := dict }}
@@ -10,17 +8,17 @@ kind: Feature
 metadata:
   name: kubedb-provider-aws
   labels:
-    app.kubernetes.io/part-of: dbaas-capa
+    app.kubernetes.io/part-of: crossplane
 spec:
   title: KubeDB AWS Provider
   description: |
     KubeDB AWS Provider for Crossplane
   icons:
     - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
       type: image/svg+xml
-  featureSet: dbaas-capa
+  featureSet: crossplane
   featureBlock: crossplane
-  recommended: true
+  recommended: {{ eq .Values.capi.provider "capa" }}
   requirements:
     features:
       - crossplane
@@ -34,7 +32,7 @@ spec:
           app.kubernetes.io/managed-by: Helm
   chart:
     name: kubedb-provider-aws
-    namespace: kubedb
+    namespace: crossplane-system
     version: {{ dig "kubedb-provider-aws" "version" "" $.Values.helm.releases }}
     sourceRef:
       kind: HelmRepository
@@ -43,5 +41,3 @@ spec:
 {{- with $vals }}
   {{- dict "values" . | toYaml | nindent 2 }}
 {{- end }}
-
-{{- end }}
diff --git a/...ets/dbaas-capz/kubedb-provider-azure.yaml → ...ets/crossplane/kubedb-provider-azure.yaml b/...ets/dbaas-capz/kubedb-provider-azure.yaml → ...ets/crossplane/kubedb-provider-azure.yaml
@@ -1,5 +1,3 @@
-{{- if eq .Values.capi.provider "capz" }}
-
 {{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }}
 
 {{ $vals := dict }}
@@ -10,17 +8,17 @@ kind: Feature
 metadata:
   name: kubedb-provider-azure
   labels:
-    app.kubernetes.io/part-of: dbaas-capz
+    app.kubernetes.io/part-of: crossplane
 spec:
   title: KubeDB Azure Provider
   description: |
     KubeDB Azure Provider for Crossplane
   icons:
     - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
       type: image/svg+xml
-  featureSet: dbaas-capz
+  featureSet: crossplane
   featureBlock: crossplane
-  recommended: true
+  recommended: {{ eq .Values.capi.provider "capz" }}
   requirements:
     features:
       - crossplane
@@ -34,7 +32,7 @@ spec:
           app.kubernetes.io/managed-by: Helm
   chart:
     name: kubedb-provider-azure
-    namespace: kubedb
+    namespace: crossplane-system
     version: {{ dig "kubedb-provider-azure" "version" "" $.Values.helm.releases }}
     sourceRef:
       kind: HelmRepository
@@ -43,5 +41,3 @@ spec:
 {{- with $vals }}
   {{- dict "values" . | toYaml | nindent 2 }}
 {{- end }}
-
-{{- end }}
diff --git a/...esets/dbaas-capg/kubedb-provider-gcp.yaml → ...esets/crossplane/kubedb-provider-gcp.yaml b/...esets/dbaas-capg/kubedb-provider-gcp.yaml → ...esets/crossplane/kubedb-provider-gcp.yaml
@@ -1,5 +1,3 @@
-{{- if eq .Values.capi.provider "capg" }}
-
 {{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }}
 
 {{ $vals := dict }}
@@ -10,17 +8,17 @@ kind: Feature
 metadata:
   name: kubedb-provider-gcp
   labels:
-    app.kubernetes.io/part-of: dbaas-capg
+    app.kubernetes.io/part-of: crossplane
 spec:
   title: KubeDB GCP Provider
   description: |
     KubeDB GCP Provider for Crossplane
   icons:
     - src: https://cdn.appscode.com/k8s/icons/menu/cluster.svg
       type: image/svg+xml
-  featureSet: dbaas-capg
+  featureSet: crossplane
   featureBlock: crossplane
-  recommended: true
+  recommended: {{ eq .Values.capi.provider "capg" }}
   requirements:
     features:
       - crossplane
@@ -34,7 +32,7 @@ spec:
           app.kubernetes.io/managed-by: Helm
   chart:
     name: kubedb-provider-gcp
-    namespace: kubedb
+    namespace: crossplane-system
     version: {{ dig "kubedb-provider-gcp" "version" "" $.Values.helm.releases }}
     sourceRef:
       kind: HelmRepository
@@ -43,5 +41,3 @@ spec:
 {{- with $vals }}
   {{- dict "values" . | toYaml | nindent 2 }}
 {{- end }}
-
-{{- end }}
diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capa/featureset.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capa/featureset.yaml
@@ -17,8 +17,6 @@ spec:
     - capa-vpc-peering-operator
     - capi-cluster-presets
     - cluster-autoscaler
-    - crossplane
-    - kubedb-provider-aws
   chart:
     name: uik8sappscodecom-featureset-dbaas-capa-editor
     version: {{ .Chart.AppVersion }}

diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml
diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capg/featureset.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capg/featureset.yaml
@@ -14,8 +14,6 @@ spec:
   recommended: true
   requiredFeatures:
     - capi-cluster-presets
-    - crossplane
-    - kubedb-provider-gcp
   chart:
     name: uik8sappscodecom-featureset-dbaas-capg-editor
     version: {{ .Chart.AppVersion }}

diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml
diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capz/featureset.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capz/featureset.yaml
@@ -14,8 +14,6 @@ spec:
   recommended: true
   requiredFeatures:
     - capi-cluster-presets
-    - crossplane
-    - kubedb-provider-azure
   chart:
     name: uik8sappscodecom-featureset-dbaas-capz-editor
     version: {{ .Chart.AppVersion }}

diff --git a/...s/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/crossplane.yaml b/...s/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/crossplane.yaml