Skip to content

Commit d7c744b

Browse files
amoralejamoralej
committed
Bump CONTROLLER_TOOLS_VERSION to 0.14.0
bump controller tools to the version which bumps k8s deps to v0.29.0, which aligns with the version in the operators. We need it for make generate to work fine. Taken from [1]. [1] openstack-k8s-operators/keystone-operator#516
1 parent b552b28 commit d7c744b

11 files changed

+135
-106
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
210210

211211
## Tool Versions
212212
KUSTOMIZE_VERSION ?= v3.8.7
213-
CONTROLLER_TOOLS_VERSION ?= v0.11.1
213+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
214214

215215
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
216216
.PHONY: kustomize

‎api/bases/watcher.openstack.org_watcherapis.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watcherapis.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -21,14 +20,19 @@ spec:
2120
description: WatcherAPI is the Schema for the watcherapis API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object

‎api/bases/watcher.openstack.org_watcherappliers.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watcherappliers.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -21,14 +20,19 @@ spec:
2120
description: WatcherApplier is the Schema for the watcherappliers API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object

‎api/bases/watcher.openstack.org_watcherdecisionengines.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watcherdecisionengines.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -22,14 +21,19 @@ spec:
2221
API
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object

‎api/bases/watcher.openstack.org_watchers.yaml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watchers.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -21,14 +20,19 @@ spec:
2120
description: Watcher is the Schema for the watchers API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
@@ -41,8 +45,9 @@ spec:
4145
DB, defaults to watcher
4246
type: string
4347
databaseInstance:
44-
description: MariaDB instance name Required to use the mariadb-operator
45-
instance to create the DB and user
48+
description: |-
49+
MariaDB instance name
50+
Required to use the mariadb-operator instance to create the DB and user
4651
type: string
4752
passwordSelectors:
4853
default:
@@ -73,10 +78,10 @@ spec:
7378
operational state.
7479
properties:
7580
lastTransitionTime:
76-
description: Last time the condition transitioned from one status
77-
to another. This should be when the underlying condition changed.
78-
If that is not known, then using the time when the API field
79-
changed is acceptable.
81+
description: |-
82+
Last time the condition transitioned from one status to another.
83+
This should be when the underlying condition changed. If that is not known, then using the time when
84+
the API field changed is acceptable.
8085
format: date-time
8186
type: string
8287
message:
@@ -88,14 +93,13 @@ spec:
8893
in CamelCase.
8994
type: string
9095
severity:
91-
description: Severity provides a classification of Reason code,
92-
so the current situation is immediately understandable and
93-
could act accordingly. It is meant for situations where Status=False
94-
and it should be indicated if it is just informational, warning
95-
(next reconciliation might fix it) or an error (e.g. DB create
96-
issue and no actions to automatically resolve the issue can/should
97-
be done). For conditions where Status=Unknown or Status=True
98-
the Severity should be SeverityNone.
96+
description: |-
97+
Severity provides a classification of Reason code, so the current situation is immediately
98+
understandable and could act accordingly.
99+
It is meant for situations where Status=False and it should be indicated if it is just
100+
informational, warning (next reconciliation might fix it) or an error (e.g. DB create issue
101+
and no actions to automatically resolve the issue can/should be done).
102+
For conditions where Status=Unknown or Status=True the Severity should be SeverityNone.
99103
type: string
100104
status:
101105
description: Status of the condition, one of True, False, Unknown.
@@ -110,11 +114,11 @@ spec:
110114
type: object
111115
type: array
112116
observedGeneration:
113-
description: ObservedGeneration - the most recent generation observed
114-
for this service. If the observed generation is less than the spec
115-
generation, then the controller has not processed the latest changes
116-
injected by the opentack-operator in the top-level CR (e.g. the
117-
ContainerImage)
117+
description: |-
118+
ObservedGeneration - the most recent generation observed for this
119+
service. If the observed generation is less than the spec generation,
120+
then the controller has not processed the latest changes injected by
121+
the opentack-operator in the top-level CR (e.g. the ContainerImage)
118122
format: int64
119123
type: integer
120124
type: object

‎config/crd/bases/watcher.openstack.org_watcherapis.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watcherapis.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -21,14 +20,19 @@ spec:
2120
description: WatcherAPI is the Schema for the watcherapis API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object

‎config/crd/bases/watcher.openstack.org_watcherappliers.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watcherappliers.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -21,14 +20,19 @@ spec:
2120
description: WatcherApplier is the Schema for the watcherappliers API
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object

‎config/crd/bases/watcher.openstack.org_watcherdecisionengines.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.11.1
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: watcherdecisionengines.watcher.openstack.org
98
spec:
109
group: watcher.openstack.org
@@ -22,14 +21,19 @@ spec:
2221
API
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object

0 commit comments

Comments
 (0)