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

RHCLOUD-31123: Add support for pgsql16 in local db provider #945

Merged
merged 1 commit into from
Feb 28, 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
2 changes: 1 addition & 1 deletion apis/cloud.redhat.com/v1alpha1/clowdapp_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ type InitContainer struct {
// DatabaseSpec is a struct defining a database to be exposed to a ClowdApp.
type DatabaseSpec struct {
// Defines the Version of the PostGreSQL database, defaults to 12.
// +kubebuilder:validation:Enum:=10;12;13;14;15
// +kubebuilder:validation:Enum:=10;12;13;14;15;16
Version *int32 `json:"version,omitempty"`

// Defines the Name of the database used by this app. This will be used as the
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/cloud.redhat.com_clowdapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
- 13
- 14
- 15
- 16
format: int32
type: integer
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func GetDatabase(c *p.Provider) (p.ClowderProvider, error) {
func init() {
p.ProvidersRegistration.Register(GetDatabase, 5, ProvName)
imageList = map[int32]string{
16: provutils.DefaultImageDatabasePG16,
15: provutils.DefaultImageDatabasePG15,
14: provutils.DefaultImageDatabasePG14,
13: provutils.DefaultImageDatabasePG13,
Expand Down
1 change: 1 addition & 0 deletions controllers/cloud.redhat.com/providers/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var DefaultImageDatabasePG12 = "quay.io/cloudservices/postgresql-rds:12-2318dee"
var DefaultImageDatabasePG13 = "quay.io/cloudservices/postgresql-rds:13-2318dee"
var DefaultImageDatabasePG14 = "quay.io/cloudservices/postgresql-rds:14-2318dee"
var DefaultImageDatabasePG15 = "quay.io/cloudservices/postgresql-rds:15-2318dee"
var DefaultImageDatabasePG16 = "quay.io/cloudservices/postgresql-rds:16-f145533"
psav marked this conversation as resolved.
Show resolved Hide resolved

// MakeLocalDB populates the given deployment object with the local DB struct.
func MakeLocalDB(dd *apps.Deployment, nn types.NamespacedName, baseResource obj.ClowdObject, extraLabels *map[string]string, cfg *config.DatabaseConfig, image string, usePVC bool, dbName string, res *core.ResourceRequirements) {
Expand Down
1 change: 1 addition & 0 deletions deploy-mutate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ objects:
- 13
- 14
- 15
- 16
format: int32
type: integer
type: object
Expand Down
1 change: 1 addition & 0 deletions deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ objects:
- 13
- 14
- 15
- 16
format: int32
type: integer
type: object
Expand Down
Loading