Skip to content

Commit

Permalink
feat: upgrade official-postgresql to 0.9 api and rename to vanilla-po…
Browse files Browse the repository at this point in the history
…stgresql in release 0.9
  • Loading branch information
kizuna-lek committed Oct 10, 2024
1 parent 40dc40c commit 7d23d6d
Show file tree
Hide file tree
Showing 44 changed files with 497 additions and 430 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-addons-cluster-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:
- nebula-cluster
- neon-cluster
- oceanbase-ce-cluster
- official-postgresql-cluster
- vanilla-postgresql-cluster
- opengauss-cluster
- openldap-cluster
- opensearch-cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ on:
- nebula
- neon
- oceanbase-ce
- official-postgresql
- vanilla-postgresql
- opengauss
- openldap
- opensearch
Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions addons-cluster/official-postgresql-cluster/templates/cluster.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions addons-cluster/vanilla-postgresql-cluster/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dependencies:
- name: kblib
repository: file://../kblib
version: 0.1.0
digest: sha256:6894d645e270bae072e3334549187801abc343630044c9da70e7a22e2ebfc55b
generated: "2024-10-10T11:06:36.796796+08:00"
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: official-postgresql-cluster
name: vanilla-postgresql-cluster
type: application
version: 0.9.0
description: A Official PostgreSQL cluster definition Helm chart for Kubernetes
description: A Vanilla PostgreSQL cluster Helm chart for Kubernetes

dependencies:
- name: kblib
Expand All @@ -21,8 +21,9 @@ keywords:
- database
- sql
- cluster
- vanilla

home: https://github.com/apecloud/kubeblocks/tree/main/deploy/apecloud-postgresql-cluster
home: https://github.com/apecloud/kubeblocks/tree/main/deploy/vanilla-postgresql-cluster
icon: https://kubeblocks.io/img/logo.png

maintainers:
Expand All @@ -31,9 +32,9 @@ maintainers:

sources:
- https://github.com/apecloud/kubeblocks/
- https://github.com/apecloud/kubeblocks/tree/main/deploy/apecloud-postgresql
- https://github.com/apecloud/kubeblocks/tree/main/deploy/vanilla-postgresql

annotations:
kubeblocks.io/clusterVersions: "14.8.0,12.15.0"
kubeblocks.io/clusterVersions: "14.7.0,12.15.0"
kubeblocks.io/multiCV: "true"
category: Database
Binary file not shown.
2 changes: 2 additions & 0 deletions addons-cluster/vanilla-postgresql-cluster/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1. By default, the helm chart will create a Vanilla PostgreSQL cluster with the same version as the Chart appVersion.
2. If you need to create a different version, you need to specify the version through clusterVersionOverride value.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Define replica count.
standalone mode: 1
replication mode: 2
*/}}
{{- define "official-postgresql-cluster.replicaCount" }}
{{- define "vanilla-postgresql-cluster.replicaCount" }}
{{- if eq .Values.mode "standalone" }}
replicas: 1
{{- else if eq .Values.mode "replication" }}
Expand Down
13 changes: 13 additions & 0 deletions addons-cluster/vanilla-postgresql-cluster/templates/cluster.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{- include "kblib.clusterCommon" . }}
clusterDef: vanilla-postgresql
componentSpecs:
- name: postgresql
componentDef: vanilla-postgresql
{{- include "kblib.componentMonitor" . | indent 6 }}
{{- include "vanilla-postgresql-cluster.replicaCount" . | indent 6 }}
serviceAccountName: {{ include "kblib.serviceAccountName" . }}
{{- include "kblib.componentResources" . | indent 6 }}
{{- include "kblib.componentStorages" . | indent 6 }}
enabledLogs:
- running
serviceVersion: {{ .Values.version }}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"title": "Version",
"description": "Cluster version.",
"type": "string",
"default": "official-postgresql-14.7"
"default": "vanilla-postgresql-14.7"
},
"mode": {
"title": "Mode",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Default values for Official PostgreSQL.
# Default values for Vanilla PostgreSQL.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

## @param version Postgresql cluster version
##
version: official-postgresql-14.7
version: 14.7.0

## @param mode postgresql cluster topology mode, standalone, replication
##
Expand Down
79 changes: 0 additions & 79 deletions addons/official-postgresql/templates/_helpers.tpl

This file was deleted.

Loading

0 comments on commit 7d23d6d

Please sign in to comment.