Skip to content

Commit 11a4de6

Browse files
Neo2308OchiengEd
Neo2308
and
OchiengEd
authored
Update modules to support k8s v0.29.2 (#319)
* Update modules to support k8s v0.29.2 Add support for kubernetes v0.29.2 in the Operator Framework api project dependencies. Signed-off-by: Edmund Ochieng <[email protected]> * Cleanup extra golang modules Signed-off-by: Edmund Ochieng <[email protected]> * Bump versions of controller-runtime among other modules Signed-off-by: Edmund Ochieng <[email protected]> * Update controller tools and regen files Updated controller tools to v0.14.0. Refreshed auto-generated files. * Regenerated files * Regenerated files using go 1.21 * Fix diff --------- Signed-off-by: Edmund Ochieng <[email protected]> Co-authored-by: Edmund Ochieng <[email protected]>
1 parent 191f5a7 commit 11a4de6

17 files changed

+6736
-1438
lines changed

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
101101
YQ ?= $(LOCALBIN)/yq
102102

103103
## Tool Versions
104-
CONTROLLER_TOOLS_VERSION ?= v0.9.0
104+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
105105
YQ_VERSION ?= v4.28.1
106106

107107
.PHONY: controller-gen

‎crds/operators.coreos.com_catalogsources.yaml

+613-103
Large diffs are not rendered by default.

‎crds/operators.coreos.com_clusterserviceversions.yaml

+3,789-723
Large diffs are not rendered by default.

‎crds/operators.coreos.com_installplans.yaml

+93-25
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.9.0
6-
creationTimestamp: null
5+
controller-gen.kubebuilder.io/version: v0.14.0
76
name: installplans.operators.coreos.com
87
spec:
98
group: operators.coreos.com
@@ -40,10 +39,19 @@ spec:
4039
- spec
4140
properties:
4241
apiVersion:
43-
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'
42+
description: |-
43+
APIVersion defines the versioned schema of this representation of an object.
44+
Servers should convert recognized schemas to the latest internal value, and
45+
may reject unrecognized values.
46+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4447
type: string
4548
kind:
46-
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'
49+
description: |-
50+
Kind is a string value representing the REST resource this object represents.
51+
Servers may infer this from the endpoint the client submits requests to.
52+
Cannot be updated.
53+
In CamelCase.
54+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4755
type: string
4856
metadata:
4957
type: object
@@ -56,7 +64,9 @@ spec:
5664
- clusterServiceVersionNames
5765
properties:
5866
approval:
59-
description: Approval is the user approval policy for an InstallPlan. It must be one of "Automatic" or "Manual".
67+
description: |-
68+
Approval is the user approval policy for an InstallPlan.
69+
It must be one of "Automatic" or "Manual".
6070
type: string
6171
approved:
6272
type: boolean
@@ -71,37 +81,63 @@ spec:
7181
sourceNamespace:
7282
type: string
7383
status:
74-
description: "InstallPlanStatus represents the information about the status of steps required to complete installation. \n Status may trail the actual state of a system."
84+
description: |-
85+
InstallPlanStatus represents the information about the status of
86+
steps required to complete installation.
87+
88+
89+
Status may trail the actual state of a system.
7590
type: object
7691
required:
7792
- catalogSources
7893
- phase
7994
properties:
8095
attenuatedServiceAccountRef:
81-
description: AttenuatedServiceAccountRef references the service account that is used to do scoped operator install.
96+
description: |-
97+
AttenuatedServiceAccountRef references the service account that is used
98+
to do scoped operator install.
8299
type: object
83100
properties:
84101
apiVersion:
85102
description: API version of the referent.
86103
type: string
87104
fieldPath:
88-
description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
105+
description: |-
106+
If referring to a piece of an object instead of an entire object, this string
107+
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
108+
For example, if the object reference is to a container within a pod, this would take on a value like:
109+
"spec.containers{name}" (where "name" refers to the name of the container that triggered
110+
the event) or if no container name is specified "spec.containers[2]" (container with
111+
index 2 in this pod). This syntax is chosen only to have some well-defined way of
112+
referencing a part of an object.
113+
TODO: this design is not final and this field is subject to change in the future.
89114
type: string
90115
kind:
91-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
116+
description: |-
117+
Kind of the referent.
118+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
92119
type: string
93120
name:
94-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
121+
description: |-
122+
Name of the referent.
123+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
95124
type: string
96125
namespace:
97-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
126+
description: |-
127+
Namespace of the referent.
128+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
98129
type: string
99130
resourceVersion:
100-
description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
131+
description: |-
132+
Specific resourceVersion to which this reference is made, if any.
133+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
101134
type: string
102135
uid:
103-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
136+
description: |-
137+
UID of the referent.
138+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
104139
type: string
140+
x-kubernetes-map-type: atomic
105141
bundleLookups:
106142
description: BundleLookups is the set of in-progress requests to pull and unpackage bundle content to the cluster.
107143
type: array
@@ -122,23 +158,42 @@ spec:
122158
description: API version of the referent.
123159
type: string
124160
fieldPath:
125-
description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
161+
description: |-
162+
If referring to a piece of an object instead of an entire object, this string
163+
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
164+
For example, if the object reference is to a container within a pod, this would take on a value like:
165+
"spec.containers{name}" (where "name" refers to the name of the container that triggered
166+
the event) or if no container name is specified "spec.containers[2]" (container with
167+
index 2 in this pod). This syntax is chosen only to have some well-defined way of
168+
referencing a part of an object.
169+
TODO: this design is not final and this field is subject to change in the future.
126170
type: string
127171
kind:
128-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
172+
description: |-
173+
Kind of the referent.
174+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
129175
type: string
130176
name:
131-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
177+
description: |-
178+
Name of the referent.
179+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
132180
type: string
133181
namespace:
134-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
182+
description: |-
183+
Namespace of the referent.
184+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
135185
type: string
136186
resourceVersion:
137-
description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
187+
description: |-
188+
Specific resourceVersion to which this reference is made, if any.
189+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
138190
type: string
139191
uid:
140-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
192+
description: |-
193+
UID of the referent.
194+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
141195
type: string
196+
x-kubernetes-map-type: atomic
142197
conditions:
143198
description: Conditions represents the overall state of a BundleLookup.
144199
type: array
@@ -172,7 +227,9 @@ spec:
172227
description: Identifier is the catalog-unique name of the operator (the name of the CSV for bundles that contain CSVs)
173228
type: string
174229
path:
175-
description: Path refers to the location of a bundle to pull. It's typically an image reference.
230+
description: |-
231+
Path refers to the location of a bundle to pull.
232+
It's typically an image reference.
176233
type: string
177234
properties:
178235
description: The effective properties of the unpacked bundle.
@@ -187,7 +244,9 @@ spec:
187244
conditions:
188245
type: array
189246
items:
190-
description: InstallPlanCondition represents the overall status of the execution of an InstallPlan.
247+
description: |-
248+
InstallPlanCondition represents the overall status of the execution of
249+
an InstallPlan.
191250
type: object
192251
properties:
193252
lastTransitionTime:
@@ -207,7 +266,10 @@ spec:
207266
description: InstallPlanConditionType describes the state of an InstallPlan at a certain point as a whole.
208267
type: string
209268
message:
210-
description: Message is a human-readable message containing detailed information that may be important to understanding why the plan has its current status.
269+
description: |-
270+
Message is a human-readable message containing detailed
271+
information that may be important to understanding why the
272+
plan has its current status.
211273
type: string
212274
phase:
213275
description: InstallPlanPhase is the current status of a InstallPlan as a whole.
@@ -227,7 +289,9 @@ spec:
227289
resolving:
228290
type: string
229291
resource:
230-
description: StepResource represents the status of a resource to be tracked by an InstallPlan.
292+
description: |-
293+
StepResource represents the status of a resource to be tracked by an
294+
InstallPlan.
231295
type: object
232296
required:
233297
- group
@@ -252,10 +316,14 @@ spec:
252316
version:
253317
type: string
254318
status:
255-
description: StepStatus is the current status of a particular resource an in InstallPlan
319+
description: |-
320+
StepStatus is the current status of a particular resource an in
321+
InstallPlan
256322
type: string
257323
startTime:
258-
description: StartTime is the time when the controller began applying the resources listed in the plan to the cluster.
324+
description: |-
325+
StartTime is the time when the controller began applying
326+
the resources listed in the plan to the cluster.
259327
type: string
260328
format: date-time
261329
served: true

0 commit comments

Comments
 (0)