Skip to content

Commit fd95db4

Browse files
JorresJorres
authored
Regenerate crds with new controller-gen (ydb-platform#274)
1 parent cab74c4 commit fd95db4

11 files changed

+13129
-13259
lines changed

‎.changes/unreleased/Fixed-20241129-213809.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
kind: Fixed
2+
body: regenerate CRDs in upload-artifacts workflow (as opposed to manually)
3+
time: 2024-11-29T21:38:09.848071991+01:00

‎.github/workflows/upload-artifacts.yml

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ jobs:
7474
docker push cr.yandex/crpsjg1coh47p81vh2lc/ydb-kubernetes-operator:"$VERSION"
7575
- name: package-and-push-helm-chart
7676
run: |
77+
make manifests
78+
7779
helm package ./deploy/ydb-operator
7880
7981
# Push into internal oci-based registry

‎Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ VERSION ?= 0.1.0
77

88
# Image URL to use all building/pushing image targets
99
IMG ?= cr.yandex/yc/ydb-operator:latest
10-
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
11-
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
1210
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
1311
ENVTEST_K8S_VERSION = 1.26
1412

@@ -46,7 +44,7 @@ help: ## Display this help.
4644
##@ Development
4745

4846
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
49-
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
47+
$(CONTROLLER_GEN) crd rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
5048
cp config/crd/bases/ydb.tech_storages.yaml deploy/ydb-operator/crds/storage.yaml
5149
cp config/crd/bases/ydb.tech_databases.yaml deploy/ydb-operator/crds/database.yaml
5250
cp config/crd/bases/ydb.tech_storagenodesets.yaml deploy/ydb-operator/crds/storagenodeset.yaml

‎deploy/ydb-operator/crds/database.yaml

+2,429-2,474
Large diffs are not rendered by default.

‎deploy/ydb-operator/crds/databasemonitoring.yaml

+29-46
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.6.1
8-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.16.5
97
name: databasemonitorings.ydb.tech
108
spec:
119
group: ydb.tech
@@ -31,14 +29,19 @@ spec:
3129
API
3230
properties:
3331
apiVersion:
34-
description: 'APIVersion defines the versioned schema of this representation
35-
of an object. Servers should convert recognized schemas to the latest
36-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
32+
description: |-
33+
APIVersion defines the versioned schema of this representation of an object.
34+
Servers should convert recognized schemas to the latest internal value, and
35+
may reject unrecognized values.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3737
type: string
3838
kind:
39-
description: 'Kind is a string value representing the REST resource this
40-
object represents. Servers may infer this from the endpoint the client
41-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
39+
description: |-
40+
Kind is a string value representing the REST resource this object represents.
41+
Servers may infer this from the endpoint the client submits requests to.
42+
Cannot be updated.
43+
In CamelCase.
44+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4245
type: string
4346
metadata:
4447
type: object
@@ -73,45 +76,35 @@ spec:
7376
properties:
7477
conditions:
7578
items:
76-
description: "Condition contains details for one aspect of the current
77-
state of this API Resource. --- This struct is intended for direct
78-
use as an array at the field path .status.conditions. For example,
79-
\n \ttype FooStatus struct{ \t // Represents the observations
80-
of a foo's current state. \t // Known .status.conditions.type
81-
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
82-
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
83-
\t // +listMapKey=type \t Conditions []metav1.Condition
84-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
85-
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
86-
\t}"
79+
description: Condition contains details for one aspect of the current
80+
state of this API Resource.
8781
properties:
8882
lastTransitionTime:
89-
description: lastTransitionTime is the last time the condition
90-
transitioned from one status to another. This should be when
91-
the underlying condition changed. If that is not known, then
92-
using the time when the API field changed is acceptable.
83+
description: |-
84+
lastTransitionTime is the last time the condition transitioned from one status to another.
85+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
9386
format: date-time
9487
type: string
9588
message:
96-
description: message is a human readable message indicating
97-
details about the transition. This may be an empty string.
89+
description: |-
90+
message is a human readable message indicating details about the transition.
91+
This may be an empty string.
9892
maxLength: 32768
9993
type: string
10094
observedGeneration:
101-
description: observedGeneration represents the .metadata.generation
102-
that the condition was set based upon. For instance, if .metadata.generation
103-
is currently 12, but the .status.conditions[x].observedGeneration
104-
is 9, the condition is out of date with respect to the current
105-
state of the instance.
95+
description: |-
96+
observedGeneration represents the .metadata.generation that the condition was set based upon.
97+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
98+
with respect to the current state of the instance.
10699
format: int64
107100
minimum: 0
108101
type: integer
109102
reason:
110-
description: reason contains a programmatic identifier indicating
111-
the reason for the condition's last transition. Producers
112-
of specific condition types may define expected values and
113-
meanings for this field, and whether the values are considered
114-
a guaranteed API. The value should be a CamelCase string.
103+
description: |-
104+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
105+
Producers of specific condition types may define expected values and meanings for this field,
106+
and whether the values are considered a guaranteed API.
107+
The value should be a CamelCase string.
115108
This field may not be empty.
116109
maxLength: 1024
117110
minLength: 1
@@ -126,10 +119,6 @@ spec:
126119
type: string
127120
type:
128121
description: type of condition in CamelCase or in foo.example.com/CamelCase.
129-
--- Many .condition.type values are consistent across resources
130-
like Available, but because arbitrary conditions can be useful
131-
(see .node.status.conditions), the ability to deconflict is
132-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
133122
maxLength: 316
134123
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])$
135124
type: string
@@ -151,9 +140,3 @@ spec:
151140
storage: true
152141
subresources:
153142
status: {}
154-
status:
155-
acceptedNames:
156-
kind: ""
157-
plural: ""
158-
conditions: []
159-
storedVersions: []

0 commit comments

Comments
 (0)