Skip to content
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;16
// +kubebuilder:validation:Enum:=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: 0 additions & 1 deletion config/crd/bases/cloud.redhat.com_clowdapps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ spec:
description: Defines the Version of the PostGreSQL database, defaults
to 12.
enum:
- 10
- 12
- 13
- 14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ func init() {
14: provutils.DefaultImageDatabasePG14,
13: provutils.DefaultImageDatabasePG13,
12: provutils.DefaultImageDatabasePG12,
10: provutils.DefaultImageDatabasePG10,
}
}

Expand Down
1 change: 0 additions & 1 deletion controllers/cloud.redhat.com/providers/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ var DefaultImageMocktitlements = "quay.io/cloudservices/mocktitlements:2d55a98"
var DefaultKeyCloakVersion = "23.0.1"
var DefaultImageCaddyProxy = "quay.io/cloudservices/caddy-ubi:latest"
var DefaultImageKeyCloak = fmt.Sprintf("quay.io/keycloak/keycloak:%s", DefaultKeyCloakVersion)
var DefaultImageDatabasePG10 = "quay.io/cloudservices/postgresql-rds:10-99c8c27"
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"
Expand Down
1 change: 0 additions & 1 deletion deploy-mutate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ objects:
description: Defines the Version of the PostGreSQL database,
defaults to 12.
enum:
- 10
- 12
- 13
- 14
Expand Down
1 change: 0 additions & 1 deletion deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ objects:
description: Defines the Version of the PostGreSQL database,
defaults to 12.
enum:
- 10
- 12
- 13
- 14
Expand Down
8 changes: 4 additions & 4 deletions tests/kuttl/test-multi-app-interface-db/01-pods.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ spec:
image: quay.io/psav/clowder-hello
database:
name: app-default-ca
version: 10
version: 13
---
apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdApp
Expand All @@ -161,7 +161,7 @@ spec:
image: quay.io/psav/clowder-hello
database:
name: app-b
version: 10
version: 13
---
apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdApp
Expand All @@ -176,7 +176,7 @@ spec:
image: quay.io/psav/clowder-hello
database:
sharedDbAppName: app-b
version: 10
version: 13
dependencies:
- app-b
---
Expand All @@ -193,7 +193,7 @@ spec:
image: quay.io/psav/clowder-hello
database:
name: app-d
version: 10
version: 13
---
apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdApp
Expand Down
6 changes: 3 additions & 3 deletions tests/kuttl/test-multi-db-shared/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ spec:
apiVersion: apps/v1
kind: Deployment
metadata:
name: test-multi-db-shared-db-v10
name: test-multi-db-shared-db-v13
namespace: test-multi-db-shared
spec:
template:
spec:
containers:
- image: quay.io/cloudservices/postgresql-rds:cyndi-10-99c8c27
- image: quay.io/cloudservices/postgresql-rds:cyndi-13-2318dee
---
apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdEnvironment
Expand Down Expand Up @@ -117,7 +117,7 @@ spec:
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: test-multi-db-shared-db-v10
name: test-multi-db-shared-db-v13
namespace: test-multi-db-shared
spec:
accessModes:
Expand Down
4 changes: 2 additions & 2 deletions tests/kuttl/test-multi-db-shared/01-pods.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
image: quay.io/psav/clowder-hello
database:
name: app-b
version: 10
version: 13
dbVolumeSize: large
---
apiVersion: cloud.redhat.com/v1alpha1
Expand All @@ -79,6 +79,6 @@ spec:
image: quay.io/psav/clowder-hello
database:
sharedDbAppName: app-b
version: 10
version: 13
dependencies:
- app-b
2 changes: 1 addition & 1 deletion tests/kuttl/test-multi-db-shared/02-json-asserts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ commands:
- script: kubectl get secret --namespace=test-multi-db-shared app-c -o json > /tmp/test-multi-db-shared
- script: jq -r '.data["cdappconfig.json"]' < /tmp/test-multi-db-shared | base64 -d > /tmp/test-multi-db-shared-json

- script: jq -r '.database.hostname == "test-multi-db-shared-db-v10.test-multi-db-shared.svc"' -e < /tmp/test-multi-db-shared-json
- script: jq -r '.database.hostname == "test-multi-db-shared-db-v13.test-multi-db-shared.svc"' -e < /tmp/test-multi-db-shared-json
- script: jq -r '.database.sslMode == "disable"' -e < /tmp/test-multi-db-shared-json

- script: kubectl get secret --namespace=test-multi-db-shared app-a -o json > /tmp/test-multi-db-shared-a
Expand Down
2 changes: 1 addition & 1 deletion tests/kuttl/test-multi-db/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ spec:
template:
spec:
containers:
- image: quay.io/cloudservices/postgresql-rds:10-99c8c27
- image: quay.io/cloudservices/postgresql-rds:13-2318dee
4 changes: 2 additions & 2 deletions tests/kuttl/test-multi-db/01-pods.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
image: quay.io/psav/clowder-hello
database:
name: app-b
version: 10
version: 13
---
apiVersion: cloud.redhat.com/v1alpha1
kind: ClowdApp
Expand All @@ -76,6 +76,6 @@ spec:
image: quay.io/psav/clowder-hello
database:
sharedDbAppName: app-b
version: 10
version: 13
dependencies:
- app-b