From 7f773524f36658419e713763e7d2b91a50fb5f78 Mon Sep 17 00:00:00 2001 From: Masudur Rahman Date: Fri, 22 Dec 2023 11:21:56 +0600 Subject: [PATCH] Move crossplane and kubedb-provider-* features to a separate folder (#285) Signed-off-by: Masudur Rahman Signed-off-by: Tamal Saha Co-authored-by: Tamal Saha --- charts/ace/README.md | 2 +- .../crossplane.yaml | 8 +--- .../featuresets/crossplane/featureset.yaml | 31 ++++++++++++ .../kubedb-provider-aws.yaml | 12 ++--- .../kubedb-provider-azure.yaml | 12 ++--- .../kubedb-provider-gcp.yaml | 12 ++--- .../featuresets/dbaas-capa/featureset.yaml | 2 - .../featuresets/dbaas-capg/crossplane.yaml | 47 ------------------- .../featuresets/dbaas-capg/featureset.yaml | 2 - .../featuresets/dbaas-capz/crossplane.yaml | 47 ------------------- .../featuresets/dbaas-capz/featureset.yaml | 2 - .../crossplane/crossplane.yaml | 47 ------------------- .../crossplane/kubedb-provider-aws.yaml | 47 ------------------- .../crossplane/kubedb-provider-azure.yaml | 47 ------------------- .../crossplane/kubedb-provider-gcp.yaml | 47 ------------------- 15 files changed, 46 insertions(+), 319 deletions(-) rename charts/opscenter-features/templates/featuresets/{dbaas-capa => crossplane}/crossplane.yaml (89%) create mode 100644 charts/opscenter-features/templates/featuresets/crossplane/featureset.yaml rename charts/opscenter-features/templates/featuresets/{dbaas-capa => crossplane}/kubedb-provider-aws.yaml (86%) rename charts/opscenter-features/templates/featuresets/{dbaas-capz => crossplane}/kubedb-provider-azure.yaml (86%) rename charts/opscenter-features/templates/featuresets/{dbaas-capg => crossplane}/kubedb-provider-gcp.yaml (86%) delete mode 100644 charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml delete mode 100644 charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml delete mode 100644 charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/crossplane.yaml delete mode 100644 charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-aws.yaml delete mode 100644 charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-azure.yaml delete mode 100644 charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-gcp.yaml diff --git a/charts/ace/README.md b/charts/ace/README.md index f08460f47..8a2cd7584 100644 --- 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 | | gs://invoice-storage-demo | | global.infra.invoice.prefix | | "" | | global.infra.invoice.trackerEmail | | invoice-tracker@appscode.com | -| settings.db.version | | "15.3" | +| settings.db.version | | "15.5" | | settings.db.databaseName | | bb | | settings.db.terminationPolicy | | Delete | | settings.db.persistence.size | | 10Gi | diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml b/charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml similarity index 89% rename from charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml rename to charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml index eec5ff9dd..8c4608e7f 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capa/crossplane.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/crossplane.yaml @@ -1,5 +1,3 @@ -{{- if eq .Values.capi.provider "capa" }} - {{ $overrides := printf ` image: repository: %s @@ -13,7 +11,7 @@ kind: Feature metadata: name: crossplane labels: - app.kubernetes.io/part-of: dbaas-capa + app.kubernetes.io/part-of: crossplane spec: title: Crossplane description: | @@ -21,7 +19,7 @@ spec: 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 new file mode 100644 index 000000000..47a91030a --- /dev/null +++ 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/charts/opscenter-features/templates/featuresets/dbaas-capa/kubedb-provider-aws.yaml b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml similarity index 86% rename from charts/opscenter-features/templates/featuresets/dbaas-capa/kubedb-provider-aws.yaml rename to charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml index 1eb8ba7b0..ddab17fca 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capa/kubedb-provider-aws.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-aws.yaml @@ -1,5 +1,3 @@ -{{- if eq .Values.capi.provider "capa" }} - {{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }} {{ $vals := dict }} @@ -10,7 +8,7 @@ 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: | @@ -18,9 +16,9 @@ spec: 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/charts/opscenter-features/templates/featuresets/dbaas-capz/kubedb-provider-azure.yaml b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml similarity index 86% rename from charts/opscenter-features/templates/featuresets/dbaas-capz/kubedb-provider-azure.yaml rename to charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml index 221db0ed1..4dd379399 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capz/kubedb-provider-azure.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-azure.yaml @@ -1,5 +1,3 @@ -{{- if eq .Values.capi.provider "capz" }} - {{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }} {{ $vals := dict }} @@ -10,7 +8,7 @@ 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: | @@ -18,9 +16,9 @@ spec: 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/charts/opscenter-features/templates/featuresets/dbaas-capg/kubedb-provider-gcp.yaml b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml similarity index 86% rename from charts/opscenter-features/templates/featuresets/dbaas-capg/kubedb-provider-gcp.yaml rename to charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml index 7764ea6e9..4a5e41b11 100644 --- a/charts/opscenter-features/templates/featuresets/dbaas-capg/kubedb-provider-gcp.yaml +++ b/charts/opscenter-features/templates/featuresets/crossplane/kubedb-provider-gcp.yaml @@ -1,5 +1,3 @@ -{{- if eq .Values.capi.provider "capg" }} - {{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }} {{ $vals := dict }} @@ -10,7 +8,7 @@ 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: | @@ -18,9 +16,9 @@ spec: 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 index 740e9eb17..e07b2b9e8 100644 --- 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 deleted file mode 100644 index b77f5865f..000000000 --- a/charts/opscenter-features/templates/featuresets/dbaas-capg/crossplane.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if eq .Values.capi.provider "capg" }} - -{{ $overrides := printf ` -image: - repository: %s -` (include "image.ghcr" (merge (dict "_repo" "kubedb/crossplane") $)) | fromYaml }} - -{{ $vals := dict }} -{{ $vals = mergeOverwrite $vals $overrides }} - -apiVersion: ui.k8s.appscode.com/v1alpha1 -kind: Feature -metadata: - name: crossplane - labels: - app.kubernetes.io/part-of: dbaas-capg -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-capg - featureBlock: crossplane - recommended: true - readinessChecks: - workloads: - - group: apps - version: v1 - kind: Deployment - selector: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: crossplane - chart: - name: crossplane - namespace: crossplane-system - version: {{ dig "crossplane" "version" "" $.Values.helm.releases }} - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ .Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capg/featureset.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capg/featureset.yaml index 4052a9f1a..53578653c 100644 --- 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 deleted file mode 100644 index 4448b7b31..000000000 --- a/charts/opscenter-features/templates/featuresets/dbaas-capz/crossplane.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if eq .Values.capi.provider "capz" }} - -{{ $overrides := printf ` -image: - repository: %s -` (include "image.ghcr" (merge (dict "_repo" "kubedb/crossplane") $)) | fromYaml }} - -{{ $vals := dict }} -{{ $vals = mergeOverwrite $vals $overrides }} - -apiVersion: ui.k8s.appscode.com/v1alpha1 -kind: Feature -metadata: - name: crossplane - labels: - app.kubernetes.io/part-of: dbaas-capz -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-capz - featureBlock: crossplane - recommended: true - readinessChecks: - workloads: - - group: apps - version: v1 - kind: Deployment - selector: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: crossplane - chart: - name: crossplane - namespace: crossplane-system - version: {{ dig "crossplane" "version" "" $.Values.helm.releases }} - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ .Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} diff --git a/charts/opscenter-features/templates/featuresets/dbaas-capz/featureset.yaml b/charts/opscenter-features/templates/featuresets/dbaas-capz/featureset.yaml index c16e2ea52..7cc349305 100644 --- 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/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/crossplane.yaml b/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/crossplane.yaml deleted file mode 100644 index ea12a6187..000000000 --- a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/crossplane.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if not .Values.capi.provider }} - -{{ $overrides := printf ` -image: - repository: %s -` (include "image.ghcr" (merge (dict "_repo" "kubedb/crossplane") $)) | fromYaml }} - -{{ $vals := dict }} -{{ $vals = mergeOverwrite $vals $overrides }} - -apiVersion: ui.k8s.appscode.com/v1alpha1 -kind: Feature -metadata: - name: crossplane - labels: - app.kubernetes.io/part-of: opscenter-datastore -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: opscenter-datastore - featureBlock: crossplane - recommended: false - readinessChecks: - workloads: - - group: apps - version: v1 - kind: Deployment - selector: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: crossplane - chart: - name: crossplane - namespace: crossplane-system - version: {{ dig "crossplane" "version" "" $.Values.helm.releases }} - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ .Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-aws.yaml b/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-aws.yaml deleted file mode 100644 index b04589577..000000000 --- a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-aws.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if not .Values.capi.provider }} - -{{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }} - -{{ $vals := dict }} -{{ $vals = mergeOverwrite $vals $overrides }} - -apiVersion: ui.k8s.appscode.com/v1alpha1 -kind: Feature -metadata: - name: kubedb-provider-aws - labels: - app.kubernetes.io/part-of: opscenter-datastore -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: opscenter-datastore - featureBlock: crossplane - recommended: false - requirements: - features: - - crossplane - readinessChecks: - workloads: - - group: apps - version: v1 - kind: Deployment - selector: - app.kubernetes.io/name: kubedb-provider-aws - app.kubernetes.io/managed-by: Helm - chart: - name: kubedb-provider-aws - namespace: kubedb - version: {{ dig "kubedb-provider-aws" "version" "" $.Values.helm.releases }} - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ .Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-azure.yaml b/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-azure.yaml deleted file mode 100644 index df94dd753..000000000 --- a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-azure.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if not .Values.capi.provider }} - -{{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }} - -{{ $vals := dict }} -{{ $vals = mergeOverwrite $vals $overrides }} - -apiVersion: ui.k8s.appscode.com/v1alpha1 -kind: Feature -metadata: - name: kubedb-provider-azure - labels: - app.kubernetes.io/part-of: opscenter-datastore -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: opscenter-datastore - featureBlock: crossplane - recommended: false - requirements: - features: - - crossplane - readinessChecks: - workloads: - - group: apps - version: v1 - kind: Deployment - selector: - app.kubernetes.io/name: kubedb-provider-azure - app.kubernetes.io/managed-by: Helm - chart: - name: kubedb-provider-azure - namespace: kubedb - version: {{ dig "kubedb-provider-azure" "version" "" $.Values.helm.releases }} - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ .Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }} diff --git a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-gcp.yaml b/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-gcp.yaml deleted file mode 100644 index dcba6e8e2..000000000 --- a/charts/opscenter-features/templates/featuresets/opscenter-datastore/crossplane/kubedb-provider-gcp.yaml +++ /dev/null @@ -1,47 +0,0 @@ -{{- if not .Values.capi.provider }} - -{{ $overrides := dict "registryFQDN" (include "registry.ghcr" $) }} - -{{ $vals := dict }} -{{ $vals = mergeOverwrite $vals $overrides }} - -apiVersion: ui.k8s.appscode.com/v1alpha1 -kind: Feature -metadata: - name: kubedb-provider-gcp - labels: - app.kubernetes.io/part-of: opscenter-datastore -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: opscenter-datastore - featureBlock: crossplane - recommended: false - requirements: - features: - - crossplane - readinessChecks: - workloads: - - group: apps - version: v1 - kind: Deployment - selector: - app.kubernetes.io/name: kubedb-provider-gcp - app.kubernetes.io/managed-by: Helm - chart: - name: kubedb-provider-gcp - namespace: kubedb - version: {{ dig "kubedb-provider-gcp" "version" "" $.Values.helm.releases }} - sourceRef: - kind: HelmRepository - name: appscode-charts-oci - namespace: {{ .Release.Namespace }} -{{- with $vals }} - {{- dict "values" . | toYaml | nindent 2 }} -{{- end }} - -{{- end }}