Skip to content
This repository has been archived by the owner on Jun 26, 2024. It is now read-only.

cherry-pick(release-v1.3.x): Fix Percona MongoDB operator support #1290

Merged
merged 1 commit into from
Oct 25, 2022
Merged

cherry-pick(release-v1.3.x): Fix Percona MongoDB operator support #1290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ currently fall in this category are:
services
* [Percona
MongoDB](https://operatorhub.io/operator/percona-server-mongodb-operator):
bindable with `PerconaServerMongoDB.psmdb.percona.com/v1-9-0` and `v1-10-0`
bindable with `PerconaServerMongoDB.psmdb.percona.com/v1-9-0`, `v1-10-0` and `v1`
services
* NOTE: Provides administrative access to the cluster by default
* [RabbitMQ Cluster](https://github.com/rabbitmq/cluster-operator): bindable
Expand Down
8 changes: 8 additions & 0 deletions pkg/binding/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ func New() Registry {
"service.binding/password": "path={.spec.secrets.users},objectType=Secret,sourceKey=MONGODB_USER_ADMIN_PASSWORD",
"service.binding/host": "path={.status.host}",
},
schema.GroupVersionKind{Group: "psmdb.percona.com", Version: "v1", Kind: "PerconaServerMongoDB"}: {
"service.binding/type": "mongodb",
"service.binding/provider": "percona",
"service.binding": "path={.spec.secrets.users},objectType=Secret",
"service.binding/username": "path={.spec.secrets.users},objectType=Secret,sourceKey=MONGODB_USER_ADMIN_USER",
"service.binding/password": "path={.spec.secrets.users},objectType=Secret,sourceKey=MONGODB_USER_ADMIN_PASSWORD",
"service.binding/host": "path={.status.host}",
},
schema.GroupVersionKind{Group: "postgresql.k8s.enterprisedb.io", Version: "v1", Kind: "Cluster"}: {
"service.binding/type": "postgresql",
"service.binding/host": "path={.status.writeService}",
Expand Down
84 changes: 74 additions & 10 deletions test/acceptance/features/supportExistingOperatorBackedServices.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,22 +445,25 @@ Feature: Support a number of existing operator-backed services out of the box
"""
And File "/bindings/$scenario_id/password" exists in application pod

@crdv1beta1
Scenario: Bind test application to MongoDB provisioned by Percona's MongoDB operator
@disable-openshift-4.9
@disable-openshift-4.10
@disable-openshift-4.11
@disable-openshift-4.12
Scenario: Bind test application to MongoDB provisioned by Percona's MongoDB operator on Kubernetes
Given Percona MongoDB operator is running
* Generic test application is running
* The Custom Resource is present
"""
apiVersion: psmdb.percona.com/v1-9-0
apiVersion: psmdb.percona.com/v1
kind: PerconaServerMongoDB
metadata:
name: mongo-cluster
spec:
crVersion: 1.9.0
image: percona/percona-server-mongodb:4.4.8-9
crVersion: 1.13.0
image: percona/percona-server-mongodb:4.4.9-10
allowUnsafeConfigurations: true
upgradeOptions:
apply: 4.4-recommended
apply: disabled
schedule: "0 2 * * *"
secrets:
users: mongo-cluster-secrets
Expand All @@ -472,8 +475,6 @@ Feature: Support a number of existing operator-backed services out of the box
resources:
requests:
storage: 1Gi
sharding:
enabled: false
"""
When Service Binding is applied
"""
Expand All @@ -484,7 +485,7 @@ Feature: Support a number of existing operator-backed services out of the box
spec:
services:
- group: psmdb.percona.com
version: v1-9-0
version: v1
kind: PerconaServerMongoDB
name: mongo-cluster
application:
Expand All @@ -494,7 +495,7 @@ Feature: Support a number of existing operator-backed services out of the box
resource: deployments
"""
Then Service Binding is ready
And Kind PerconaServerMongoDB with apiVersion psmdb.percona.com/v1-9-0 is listed in bindable kinds
And Kind PerconaServerMongoDB with apiVersion psmdb.percona.com/v1 is listed in bindable kinds
And Content of file "/bindings/$scenario_id/type" in application pod is
"""
mongodb
Expand All @@ -508,3 +509,66 @@ Feature: Support a number of existing operator-backed services out of the box
"""
mongo-cluster-rs0.$NAMESPACE.svc.cluster.local
"""

@disable-github-actions
Scenario: Bind test application to MongoDB provisioned by Percona's MongoDB operator on OpenShift
Given Percona MongoDB operator is running
* Generic test application is running
* The Custom Resource is present
"""
apiVersion: psmdb.percona.com/v1
kind: PerconaServerMongoDB
metadata:
name: mongo-cluster
spec:
platform: openshift
crVersion: 1.13.0
image: percona/percona-server-mongodb:4.4.9-10
allowUnsafeConfigurations: true
upgradeOptions:
apply: disabled
schedule: "0 2 * * *"
secrets:
users: mongo-cluster-secrets
replsets:
- name: rs0
size: 1
volumeSpec:
persistentVolumeClaim:
resources:
requests:
storage: 1Gi
"""
When Service Binding is applied
"""
apiVersion: binding.operators.coreos.com/v1alpha1
kind: ServiceBinding
metadata:
name: $scenario_id
spec:
services:
- group: psmdb.percona.com
version: v1
kind: PerconaServerMongoDB
name: mongo-cluster
application:
name: $scenario_id
group: apps
version: v1
resource: deployments
"""
Then Service Binding is ready
And Kind PerconaServerMongoDB with apiVersion psmdb.percona.com/v1 is listed in bindable kinds
And Content of file "/bindings/$scenario_id/type" in application pod is
"""
mongodb
"""
And Content of file "/bindings/$scenario_id/username" in application pod is
"""
userAdmin
"""
And File "/bindings/$scenario_id/password" exists in application pod
And Content of file "/bindings/$scenario_id/host" in application pod is
"""
mongo-cluster-rs0.$NAMESPACE.svc.cluster.local
"""