Skip to content

Commit 000a796

Browse files
authored
fix(chart): update crd's (#42)
* fix(chart): update crd's * fix: update controller-gen to v0.12.0
1 parent 1aeef58 commit 000a796

11 files changed

+224
-99
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ help: ## Display this help.
4242
.PHONY: manifests
4343
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
4444
$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/base/crd/bases
45+
cp config/base/crd/bases/* chart/k8sdb-controller/crds/
4546

4647
.PHONY: generate
4748
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -132,7 +133,7 @@ kind-test: docker-build ## Deploy including test
132133
CONTROLLER_GEN = $(GOBIN)/controller-gen
133134
.PHONY: controller-gen
134135
controller-gen: ## Download controller-gen locally if necessary.
135-
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0)
136+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.0)
136137

137138
GOLANGCI_LINT = $(GOBIN)/golangci-lint
138139
.PHONY: golangci-lint

chart/k8sdb-controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ keywords:
1212
name: k8sdb-controller
1313
sources:
1414
- https://github.com/DoodleScheduling/k8sdb-controller
15-
version: 0.3.0
15+
version: 0.3.1

chart/k8sdb-controller/crds/dbprovisioning.infra.doodle.com_mongodbdatabases.yaml

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.12.0
97
name: mongodbdatabases.dbprovisioning.infra.doodle.com
108
spec:
119
group: dbprovisioning.infra.doodle.com
@@ -34,10 +32,14 @@ spec:
3432
description: MongoDBDatabase is the Schema for the mongodbs API
3533
properties:
3634
apiVersion:
37-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
35+
description: 'APIVersion defines the versioned schema of this representation
36+
of an object. Servers should convert recognized schemas to the latest
37+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
3838
type: string
3939
kind:
40-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
40+
description: 'Kind is a string value representing the REST resource this
41+
object represents. Servers may infer this from the endpoint the client
42+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
4143
type: string
4244
metadata:
4345
type: object
@@ -53,10 +55,12 @@ spec:
5355
description: DatabaseName is by default the same as metata.name
5456
type: string
5557
rootSecret:
56-
description: Contains a credentials set of a user with enough permission to manage databases and user accounts
58+
description: Contains a credentials set of a user with enough permission
59+
to manage databases and user accounts
5760
properties:
5861
name:
59-
description: Name referrs to the name of the secret, must be located whithin the same namespace
62+
description: Name referrs to the name of the secret, must be located
63+
whithin the same namespace
6064
type: string
6165
namespace:
6266
description: Namespace, by default the same namespace is used.
@@ -74,28 +78,50 @@ spec:
7478
- rootSecret
7579
type: object
7680
status:
77-
description: 'MongoDBDatabaseStatus defines the observed state of MongoDBDatabase IMPORTANT: Run "make" to regenerate code after modifying this file'
81+
description: 'MongoDBDatabaseStatus defines the observed state of MongoDBDatabase
82+
IMPORTANT: Run "make" to regenerate code after modifying this file'
7883
properties:
7984
conditions:
8085
description: Conditions holds the conditions for the MongoDBDatabase.
8186
items:
82-
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
87+
description: "Condition contains details for one aspect of the current
88+
state of this API Resource. --- This struct is intended for direct
89+
use as an array at the field path .status.conditions. For example,
90+
\n type FooStatus struct{ // Represents the observations of a
91+
foo's current state. // Known .status.conditions.type are: \"Available\",
92+
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
93+
// +listType=map // +listMapKey=type Conditions []metav1.Condition
94+
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
95+
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
8396
properties:
8497
lastTransitionTime:
85-
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
98+
description: lastTransitionTime is the last time the condition
99+
transitioned from one status to another. This should be when
100+
the underlying condition changed. If that is not known, then
101+
using the time when the API field changed is acceptable.
86102
format: date-time
87103
type: string
88104
message:
89-
description: message is a human readable message indicating details about the transition. This may be an empty string.
105+
description: message is a human readable message indicating
106+
details about the transition. This may be an empty string.
90107
maxLength: 32768
91108
type: string
92109
observedGeneration:
93-
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
110+
description: observedGeneration represents the .metadata.generation
111+
that the condition was set based upon. For instance, if .metadata.generation
112+
is currently 12, but the .status.conditions[x].observedGeneration
113+
is 9, the condition is out of date with respect to the current
114+
state of the instance.
94115
format: int64
95116
minimum: 0
96117
type: integer
97118
reason:
98-
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
119+
description: reason contains a programmatic identifier indicating
120+
the reason for the condition's last transition. Producers
121+
of specific condition types may define expected values and
122+
meanings for this field, and whether the values are considered
123+
a guaranteed API. The value should be a CamelCase string.
124+
This field may not be empty.
99125
maxLength: 1024
100126
minLength: 1
101127
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
@@ -108,7 +134,11 @@ spec:
108134
- Unknown
109135
type: string
110136
type:
111-
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
137+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
138+
--- Many .condition.type values are consistent across resources
139+
like Available, but because arbitrary conditions can be useful
140+
(see .node.status.conditions), the ability to deconflict is
141+
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
112142
maxLength: 316
113143
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
114144
type: string
@@ -121,7 +151,8 @@ spec:
121151
type: object
122152
type: array
123153
observedGeneration:
124-
description: ObservedGeneration is the last generation reconciled by the controller
154+
description: ObservedGeneration is the last generation reconciled
155+
by the controller
125156
format: int64
126157
type: integer
127158
type: object
@@ -130,9 +161,3 @@ spec:
130161
storage: true
131162
subresources:
132163
status: {}
133-
status:
134-
acceptedNames:
135-
kind: ""
136-
plural: ""
137-
conditions: []
138-
storedVersions: []

0 commit comments

Comments
 (0)