Skip to content

Commit 9a79eda

Browse files
committed
DBAAS-831: update DBaaSConnection status to conform to the Provisioned Service ducktype defined in the Service Binding Specification for Kubernetes
1 parent b145fde commit 9a79eda

File tree

7 files changed

+268
-288
lines changed

7 files changed

+268
-288
lines changed

bundle/manifests/dbaas.redhat.com_mongodbatlasconnections.yaml

+10-18
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ spec:
6262
status:
6363
description: DBaaSConnectionStatus defines the observed state of DBaaSConnection
6464
properties:
65+
binding:
66+
description: 'Binding exposes a secret containing the binding information
67+
for the instance. It implements the service binding Provisioned
68+
Service duck type. See: https://github.com/servicebinding/spec#provisioned-service'
69+
properties:
70+
name:
71+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
72+
TODO: Add other useful fields. apiVersion, kind, uid?'
73+
type: string
74+
type: object
6575
conditions:
6676
items:
6777
description: "Condition contains details for one aspect of the current
@@ -131,24 +141,6 @@ spec:
131141
- type
132142
type: object
133143
type: array
134-
connectionInfoRef:
135-
description: A ConfigMap holding non-sensitive information needed
136-
for connecting to the DB instance
137-
properties:
138-
name:
139-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
140-
TODO: Add other useful fields. apiVersion, kind, uid?'
141-
type: string
142-
type: object
143-
credentialsRef:
144-
description: Secret holding the credentials needed for accessing the
145-
DB instance
146-
properties:
147-
name:
148-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
149-
TODO: Add other useful fields. apiVersion, kind, uid?'
150-
type: string
151-
type: object
152144
type: object
153145
type: object
154146
served: true

config/crd/bases/dbaas.redhat.com_mongodbatlasconnections.yaml

+10-18
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ spec:
6060
status:
6161
description: DBaaSConnectionStatus defines the observed state of DBaaSConnection
6262
properties:
63+
binding:
64+
description: 'Binding exposes a secret containing the binding information
65+
for the instance. It implements the service binding Provisioned
66+
Service duck type. See: https://github.com/servicebinding/spec#provisioned-service'
67+
properties:
68+
name:
69+
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
70+
TODO: Add other useful fields. apiVersion, kind, uid?'
71+
type: string
72+
type: object
6373
conditions:
6474
items:
6575
description: "Condition contains details for one aspect of the current
@@ -129,24 +139,6 @@ spec:
129139
- type
130140
type: object
131141
type: array
132-
connectionInfoRef:
133-
description: A ConfigMap holding non-sensitive information needed
134-
for connecting to the DB instance
135-
properties:
136-
name:
137-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
138-
TODO: Add other useful fields. apiVersion, kind, uid?'
139-
type: string
140-
type: object
141-
credentialsRef:
142-
description: Secret holding the credentials needed for accessing the
143-
DB instance
144-
properties:
145-
name:
146-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
147-
TODO: Add other useful fields. apiVersion, kind, uid?'
148-
type: string
149-
type: object
150142
type: object
151143
type: object
152144
served: true

go.mod

+4-10
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ require (
1313
github.com/fgrosse/zaptest v1.1.0
1414
github.com/go-logr/zapr v1.2.3
1515
github.com/google/go-cmp v0.5.7
16+
github.com/google/uuid v1.3.0
1617
github.com/gorilla/mux v1.8.0
1718
github.com/hashicorp/go-multierror v1.1.1
1819
github.com/mongodb-forks/digest v1.0.4
19-
github.com/mxschmitt/playwright-go v0.1400.0
2020
github.com/onsi/ginkgo/v2 v2.1.4
2121
github.com/onsi/gomega v1.19.0
2222
github.com/pborman/uuid v1.2.1
@@ -25,6 +25,7 @@ require (
2525
go.mongodb.org/atlas v0.16.0
2626
go.mongodb.org/mongo-driver v1.8.3
2727
go.uber.org/zap v1.21.0
28+
golang.org/x/text v0.3.7
2829
google.golang.org/api v0.70.0
2930
gopkg.in/yaml.v3 v3.0.1
3031
k8s.io/api v0.23.5
@@ -45,7 +46,6 @@ require (
4546
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
4647
github.com/beorn7/perks v1.0.1 // indirect
4748
github.com/cespare/xxhash/v2 v2.1.2 // indirect
48-
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
4949
github.com/davecgh/go-spew v1.1.1 // indirect
5050
github.com/dimchansky/utfbom v1.1.1 // indirect
5151
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
@@ -59,10 +59,7 @@ require (
5959
github.com/golang/snappy v0.0.4 // indirect
6060
github.com/google/go-querystring v1.1.0 // indirect
6161
github.com/google/gofuzz v1.2.0 // indirect
62-
github.com/google/uuid v1.3.0 // indirect
63-
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
6462
github.com/googleapis/gnostic v0.5.5 // indirect
65-
github.com/gorilla/websocket v1.5.0 // indirect
6663
github.com/hashicorp/errwrap v1.0.0 // indirect
6764
github.com/imdario/mergo v0.3.12 // indirect
6865
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -84,7 +81,6 @@ require (
8481
github.com/xdg-go/scram v1.1.0 // indirect
8582
github.com/xdg-go/stringprep v1.0.2 // indirect
8683
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
87-
go.opencensus.io v0.23.0 // indirect
8884
go.uber.org/atomic v1.9.0 // indirect
8985
go.uber.org/multierr v1.7.0 // indirect
9086
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
@@ -93,17 +89,13 @@ require (
9389
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
9490
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
9591
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
96-
golang.org/x/text v0.3.7 // indirect
9792
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
9893
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
9994
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
10095
google.golang.org/appengine v1.6.7 // indirect
101-
google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect
102-
google.golang.org/grpc v1.44.0 // indirect
10396
google.golang.org/protobuf v1.27.1 // indirect
10497
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
10598
gopkg.in/inf.v0 v0.9.1 // indirect
106-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
10799
gopkg.in/yaml.v2 v2.4.0 // indirect
108100
k8s.io/apiextensions-apiserver v0.23.5 // indirect
109101
k8s.io/component-base v0.23.5 // indirect
@@ -113,3 +105,5 @@ require (
113105
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
114106
sigs.k8s.io/yaml v1.3.0 // indirect
115107
)
108+
109+
replace github.com/RHEcosystemAppEng/dbaas-operator => github.com/xieshenzh/dbaas-operator v1.0.1-0.20220907182015-12def45fad1d

0 commit comments

Comments
 (0)