Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add petset, sidekick, supervisor charts to kubedb #847

Merged
merged 1 commit into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions apis/installer/v1alpha1/kubedb_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down Expand Up @@ -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"`
Expand Down
51 changes: 51 additions & 0 deletions apis/installer/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions charts/kubedb/Chart.lock
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
12 changes: 12 additions & 0 deletions charts/kubedb/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions charts/kubedb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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> |
Expand Down
13 changes: 13 additions & 0 deletions charts/kubedb/ci/ci-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,16 @@ kubedb-webhook-server:
securityContext:
seccompProfile:
type: RuntimeDefault
petset:
operator:
securityContext:
seccompProfile:
type: RuntimeDefault
rbacproxy:
securityContext:
seccompProfile:
type: RuntimeDefault
cleaner:
securityContext:
seccompProfile:
type: RuntimeDefault
14 changes: 14 additions & 0 deletions charts/kubedb/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/}}
Expand Down
21 changes: 21 additions & 0 deletions charts/kubedb/values.openapiv3_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions charts/kubedb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading