Add petset,sidekick,superisor charts to kubedb

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Feb 7, 2024 · 1772006 · 1772006
1 parent d9ec7e2
commit 1772006
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 2 deletions.
diff --git a/apis/installer/v1alpha1/kubedb_types.go b/apis/installer/v1alpha1/kubedb_types.go
@@ -43,6 +43,13 @@ type Kubedb struct {
 type KubedbSpec struct {
 	Global GlobalValues `json:"global"`
 
+	//+optional
+	Petset PetsetValues `json:"petset"`
+	//+optional
+	Sidekick SidekickValues `json:"sidekick"`
+	//+optional
+	Supervisor SupervisorValues `json:"supervisor"`
+
 	//+optional
 	KubedbCrdManager KubedbCrdManagerValues `json:"kubedb-crd-manager"`
 
@@ -71,6 +78,18 @@ type KubedbSpec struct {
 	KubedbMetrics KubedbMetricsValues `json:"kubedb-metrics"`
 }
 
+type PetsetValues struct {
+	Enabled bool `json:"enabled"`
+}
+
+type SidekickValues struct {
+	Enabled bool `json:"enabled"`
+}
+
+type SupervisorValues struct {
+	Enabled bool `json:"enabled"`
+}
+
 type KubedbCrdManagerValues struct {
 	Enabled               *bool `json:"enabled"`
 	*KubedbCrdManagerSpec `json:",inline,omitempty"`

diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/kubedb/Chart.lock b/charts/kubedb/Chart.lock
@@ -1,4 +1,13 @@
 dependencies:
+- name: petset
+  repository: oci://ghcr.io/appscode-charts
+  version: v0.0.1
+- name: sidekick
+  repository: oci://ghcr.io/appscode-charts
+  version: v2024.2.6
+- name: supervisor
+  repository: oci://ghcr.io/appscode-charts
+  version: v2024.2.6
 - name: kubedb-crd-manager
   repository: file://../kubedb-crd-manager
   version: v0.0.4
@@ -26,5 +35,5 @@ dependencies:
 - name: kubedb-kubestash-catalog
   repository: file://../kubedb-kubestash-catalog
   version: v2024.1.31
-digest: sha256:b817553303178bd22bbf044e0ef78f700015aa275f8d6f8607b024c31c438d04
-generated: "2024-02-02T03:23:18.689980961Z"
+digest: sha256:6b8546db94a95c1dd3320e7ed84376aa02941852d7b4c9d933dfc7c4d068f406
+generated: "2024-02-07T01:21:45.653134-08:00"
diff --git a/charts/kubedb/Chart.yaml b/charts/kubedb/Chart.yaml
@@ -12,6 +12,18 @@ maintainers:
 - name: appscode
   email: [email protected]
 dependencies:
+- name: petset
+  repository: oci://ghcr.io/appscode-charts
+  condition: petset.enabled
+  version: v0.0.1
+- name: sidekick
+  repository: oci://ghcr.io/appscode-charts
+  condition: sidekick.enabled
+  version: v2024.2.6
+- name: supervisor
+  repository: oci://ghcr.io/appscode-charts
+  condition: supervisor.enabled
+  version: v2024.2.6
 - name: kubedb-crd-manager
   repository: file://../kubedb-crd-manager
   condition: kubedb-crd-manager.enabled

diff --git a/charts/kubedb/README.md b/charts/kubedb/README.md
@@ -74,6 +74,9 @@ The following table lists the configurable parameters of the `kubedb` chart and
 | global.featureGates.ZooKeeper           |                                                                                                                                                                                                                                                                                                                                                                       | <code>false</code>                                         |
 | global.monitoring.agent                 | Name of monitoring agent (one of "prometheus.io", "prometheus.io/operator", "prometheus.io/builtin")                                                                                                                                                                                                                                                                  | <code>""</code>                                            |
 | global.monitoring.serviceMonitor.labels | Specify the labels for ServiceMonitor. Prometheus crd will select ServiceMonitor using these labels. Only usable when monitoring agent is `prometheus.io/operator`.                                                                                                                                                                                                   | <code>{"monitoring.appscode.com/prometheus":"auto"}</code> |
+| petset.enabled                          | If enabled, installs the petset chart                                                                                                                                                                                                                                                                                                                                 | <code>true</code>                                          |
+| sidekick.enabled                        | If enabled, installs the sidekick chart                                                                                                                                                                                                                                                                                                                               | <code>true</code>                                          |
+| supervisor.enabled                      | If enabled, installs the supervisor chart                                                                                                                                                                                                                                                                                                                             | <code>true</code>                                          |
 | kubedb-crd-manager.enabled              | If enabled, installs the kubedb-crd-manager chart                                                                                                                                                                                                                                                                                                                     | <code>true</code>                                          |
 | kubedb-provisioner.enabled              | If enabled, installs the kubedb-provisioner chart                                                                                                                                                                                                                                                                                                                     | <code>true</code>                                          |
 | kubedb-webhook-server.enabled           | If enabled, installs the kubedb-webhook-server chart                                                                                                                                                                                                                                                                                                                  | <code>true</code>                                          |

diff --git a/charts/kubedb/templates/_helpers.tpl b/charts/kubedb/templates/_helpers.tpl
@@ -102,6 +102,20 @@ Returns the registry used for cleaner docker image
 {{- list (default .Values.registryFQDN .Values.global.registryFQDN) (default .Values.cleaner.registry .Values.global.registry) | compact | join "/" }}
 {{- end }}
 
+{{/*
+Returns the registry used for image docker image
+*/}}
+{{- define "image.registry" -}}
+{{- list (default .Values.registryFQDN .Values.global.registryFQDN) (default .Values.image.registry .Values.global.registry) | compact | join "/" }}
+{{- end }}
+
+{{/*
+Returns the registry used for rbacproxy docker rbacproxy
+*/}}
+{{- define "rbacproxy.registry" -}}
+{{- list (default .Values.registryFQDN .Values.global.registryFQDN) (default .Values.rbacproxy.registry .Values.global.registry) | compact | join "/" }}
+{{- end }}
+
 {{/*
 Returns the appscode image pull secrets
 */}}

diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml
@@ -9029,6 +9029,27 @@ properties:
     - server
     - serviceAccount
     type: object
+  petset:
+    properties:
+      enabled:
+        type: boolean
+    required:
+    - enabled
+    type: object
+  sidekick:
+    properties:
+      enabled:
+        type: boolean
+    required:
+    - enabled
+    type: object
+  supervisor:
+    properties:
+      enabled:
+        type: boolean
+    required:
+    - enabled
+    type: object
 required:
 - global
 type: object
diff --git a/charts/kubedb/values.yaml b/charts/kubedb/values.yaml
@@ -71,6 +71,15 @@ global:
       labels: # +doc-gen:break
         monitoring.appscode.com/prometheus: auto
 
+petset:
+  # If enabled, installs the petset chart
+  enabled: true
+sidekick:
+  # If enabled, installs the sidekick chart
+  enabled: true
+supervisor:
+  # If enabled, installs the supervisor chart
+  enabled: true
 kubedb-crd-manager:
   # If enabled, installs the kubedb-crd-manager chart
   enabled: true