Skip to content

Commit 9e148b6

Browse files
siddhibhor-56siddhibhor-56
committed
Changes in update-client-gen script for ApplyOperatorStatus,ApplyOperatorSpec,PatchOperatorStatus functions
1 parent 295ba1d commit 9e148b6

File tree

2,729 files changed

+76345
-87483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,729 files changed

+76345
-87483
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/golang:1.22 AS builder
1+
FROM docker.io/golang:1.23 AS builder
22
WORKDIR /go/src/github.com/openshift/cert-manager-operator
33
COPY . .
44
RUN make build --warn-undefined-variables

‎bundle/manifests/operator.openshift.io_certmanagers.yaml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
creationTimestamp: null
77
name: certmanagers.operator.openshift.io
88
spec:
@@ -793,17 +793,30 @@ spec:
793793
description: OperatorCondition is just the standard condition fields.
794794
properties:
795795
lastTransitionTime:
796+
description: |-
797+
lastTransitionTime is the last time the condition transitioned from one status to another.
798+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
796799
format: date-time
797800
type: string
798801
message:
799802
type: string
800803
reason:
801804
type: string
802805
status:
806+
description: status of the condition, one of True, False, Unknown.
807+
enum:
808+
- "True"
809+
- "False"
810+
- Unknown
803811
type: string
804812
type:
813+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
814+
maxLength: 316
815+
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])$
805816
type: string
806817
required:
818+
- lastTransitionTime
819+
- status
807820
- type
808821
type: object
809822
type: array
@@ -840,9 +853,27 @@ spec:
840853
description: resource is the resource type of the thing you're
841854
tracking
842855
type: string
856+
required:
857+
- group
858+
- name
859+
- namespace
860+
- resource
843861
type: object
844862
type: array
845-
x-kubernetes-list-type: atomic
863+
x-kubernetes-list-map-keys:
864+
- group
865+
- resource
866+
- namespace
867+
- name
868+
x-kubernetes-list-type: map
869+
latestAvailableRevision:
870+
description: latestAvailableRevision is the deploymentID of the most
871+
recent deployment
872+
format: int32
873+
type: integer
874+
x-kubernetes-validations:
875+
- message: must only increase
876+
rule: self >= oldSelf
846877
observedGeneration:
847878
description: observedGeneration is the last generation change you've
848879
dealt with

‎bundle/manifests/operator.openshift.io_istiocsrs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
creationTimestamp: null
77
name: istiocsrs.operator.openshift.io
88
spec:

‎config/crd/bases/operator.openshift.io_certmanagers.yaml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: certmanagers.operator.openshift.io
88
spec:
99
group: operator.openshift.io
@@ -793,17 +793,30 @@ spec:
793793
description: OperatorCondition is just the standard condition fields.
794794
properties:
795795
lastTransitionTime:
796+
description: |-
797+
lastTransitionTime is the last time the condition transitioned from one status to another.
798+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
796799
format: date-time
797800
type: string
798801
message:
799802
type: string
800803
reason:
801804
type: string
802805
status:
806+
description: status of the condition, one of True, False, Unknown.
807+
enum:
808+
- "True"
809+
- "False"
810+
- Unknown
803811
type: string
804812
type:
813+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
814+
maxLength: 316
815+
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])$
805816
type: string
806817
required:
818+
- lastTransitionTime
819+
- status
807820
- type
808821
type: object
809822
type: array
@@ -840,9 +853,27 @@ spec:
840853
description: resource is the resource type of the thing you're
841854
tracking
842855
type: string
856+
required:
857+
- group
858+
- name
859+
- namespace
860+
- resource
843861
type: object
844862
type: array
845-
x-kubernetes-list-type: atomic
863+
x-kubernetes-list-map-keys:
864+
- group
865+
- resource
866+
- namespace
867+
- name
868+
x-kubernetes-list-type: map
869+
latestAvailableRevision:
870+
description: latestAvailableRevision is the deploymentID of the most
871+
recent deployment
872+
format: int32
873+
type: integer
874+
x-kubernetes-validations:
875+
- message: must only increase
876+
rule: self >= oldSelf
846877
observedGeneration:
847878
description: observedGeneration is the last generation change you've
848879
dealt with

‎config/crd/bases/operator.openshift.io_istiocsrs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: istiocsrs.operator.openshift.io
88
spec:
99
group: operator.openshift.io

‎go.mod

Lines changed: 58 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,46 @@ module github.com/openshift/cert-manager-operator
22

33
go 1.23.0
44

5-
toolchain go1.23.4
5+
toolchain go1.23.8
66

77
require (
88
github.com/cert-manager/cert-manager v1.16.4
99
github.com/go-bindata/go-bindata v3.1.2+incompatible
1010
github.com/go-logr/logr v1.4.2
1111
github.com/golangci/golangci-lint v1.50.1
12-
github.com/google/go-cmp v0.7.0
12+
github.com/google/go-cmp v0.6.0
1313
github.com/google/go-jsonnet v0.17.0
1414
github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1
1515
github.com/mogensen/kubernetes-split-yaml v0.3.0
16-
github.com/onsi/ginkgo/v2 v2.22.1
17-
github.com/onsi/gomega v1.36.2
18-
github.com/openshift/api v0.0.0-20240912201240-0a8800162826
19-
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
20-
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
21-
github.com/openshift/library-go v0.0.0-20241118144106-bfd968d8eef4
16+
github.com/onsi/ginkgo/v2 v2.19.0
17+
github.com/onsi/gomega v1.34.0
18+
github.com/openshift/api v0.0.0-20241101202457-04eb3fd119d2
19+
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
20+
github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f
21+
github.com/openshift/library-go v0.0.0-20250403134058-7c43fdf96c62
2222
github.com/operator-framework/operator-lib v0.11.0
23-
github.com/spf13/cobra v1.9.1
24-
github.com/spf13/pflag v1.0.6
23+
github.com/spf13/cobra v1.8.1
24+
github.com/spf13/pflag v1.0.5
2525
github.com/stretchr/testify v1.10.0
26-
golang.org/x/tools v0.31.0
27-
k8s.io/api v0.32.2
28-
k8s.io/apiextensions-apiserver v0.32.2
29-
k8s.io/apimachinery v0.32.3
30-
k8s.io/client-go v0.32.2
31-
k8s.io/code-generator v0.32.3
32-
k8s.io/component-base v0.32.2
26+
golang.org/x/tools v0.24.0
27+
k8s.io/api v0.31.7
28+
k8s.io/apiextensions-apiserver v0.31.1
29+
k8s.io/apimachinery v0.31.7
30+
k8s.io/client-go v0.31.7
31+
k8s.io/code-generator v0.31.1
32+
k8s.io/component-base v0.31.7
3333
k8s.io/klog/v2 v2.130.1
34-
k8s.io/kubernetes v1.30.8
35-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
34+
k8s.io/kubernetes v1.31.7
35+
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
3636
sigs.k8s.io/controller-runtime v0.19.0
3737
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230912183013-811757733433
38-
sigs.k8s.io/controller-tools v0.17.3
39-
sigs.k8s.io/kustomize/kustomize/v5 v5.1.1
38+
sigs.k8s.io/controller-tools v0.15.0
39+
sigs.k8s.io/kustomize/kustomize/v5 v5.4.2
4040
sigs.k8s.io/yaml v1.4.0
4141
)
4242

4343
require (
4444
4d63.com/gochecknoglobals v0.1.0 // indirect
45-
cel.dev/expr v0.18.0 // indirect
4645
github.com/Abirdcfly/dupword v0.0.7 // indirect
4746
github.com/Antonboom/errname v0.1.7 // indirect
4847
github.com/Antonboom/nilnil v0.1.1 // indirect
@@ -72,19 +71,20 @@ require (
7271
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
7372
github.com/coreos/go-semver v0.3.1 // indirect
7473
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
75-
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
74+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
7675
github.com/curioswitch/go-reassign v0.2.0 // indirect
7776
github.com/daixiang0/gci v0.8.1 // indirect
7877
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7978
github.com/denis-tingaikin/go-header v0.4.3 // indirect
8079
github.com/distribution/reference v0.5.0 // indirect
81-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
80+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
8281
github.com/esimonov/ifshort v1.0.4 // indirect
8382
github.com/ettle/strcase v0.1.1 // indirect
8483
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
8584
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
86-
github.com/fatih/color v1.18.0 // indirect
85+
github.com/fatih/color v1.17.0 // indirect
8786
github.com/fatih/structtag v1.2.0 // indirect
87+
github.com/felixge/fgprof v0.9.4 // indirect
8888
github.com/felixge/httpsnoop v1.0.4 // indirect
8989
github.com/firefart/nonamedreturns v1.0.4 // indirect
9090
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -94,9 +94,9 @@ require (
9494
github.com/go-errors/errors v1.4.2 // indirect
9595
github.com/go-logr/stdr v1.2.2 // indirect
9696
github.com/go-logr/zapr v1.3.0 // indirect
97-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
97+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9898
github.com/go-openapi/jsonreference v0.21.0 // indirect
99-
github.com/go-openapi/swag v0.23.1 // indirect
99+
github.com/go-openapi/swag v0.23.0 // indirect
100100
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
101101
github.com/go-toolsmith/astcast v1.0.0 // indirect
102102
github.com/go-toolsmith/astcopy v1.0.2 // indirect
@@ -106,10 +106,11 @@ require (
106106
github.com/go-toolsmith/strparse v1.0.0 // indirect
107107
github.com/go-toolsmith/typep v1.0.2 // indirect
108108
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
109-
github.com/gobuffalo/flect v1.0.3 // indirect
109+
github.com/gobuffalo/flect v1.0.2 // indirect
110110
github.com/gobwas/glob v0.2.3 // indirect
111111
github.com/gofrs/flock v0.8.1 // indirect
112112
github.com/gogo/protobuf v1.3.2 // indirect
113+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
113114
github.com/golang/protobuf v1.5.4 // indirect
114115
github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
115116
github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
@@ -120,11 +121,10 @@ require (
120121
github.com/golangci/misspell v0.3.5 // indirect
121122
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
122123
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
123-
github.com/google/btree v1.0.1 // indirect
124-
github.com/google/cel-go v0.22.0 // indirect
125-
github.com/google/gnostic-models v0.6.9 // indirect
124+
github.com/google/cel-go v0.20.1 // indirect
125+
github.com/google/gnostic-models v0.6.8 // indirect
126126
github.com/google/gofuzz v1.2.0 // indirect
127-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
127+
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
128128
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
129129
github.com/google/uuid v1.6.0 // indirect
130130
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
@@ -160,7 +160,7 @@ require (
160160
github.com/leonklingele/grouper v1.1.0 // indirect
161161
github.com/lufeee/execinquery v1.2.1 // indirect
162162
github.com/magiconair/properties v1.8.6 // indirect
163-
github.com/mailru/easyjson v0.9.0 // indirect
163+
github.com/mailru/easyjson v0.7.7 // indirect
164164
github.com/maratori/testableexamples v1.0.0 // indirect
165165
github.com/maratori/testpackage v1.1.0 // indirect
166166
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
@@ -186,7 +186,7 @@ require (
186186
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
187187
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
188188
github.com/pkg/errors v0.9.1 // indirect
189-
github.com/pkg/profile v1.3.0 // indirect
189+
github.com/pkg/profile v1.7.0 // indirect
190190
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
191191
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
192192
github.com/prometheus/client_golang v1.20.4 // indirect
@@ -237,9 +237,9 @@ require (
237237
github.com/yagipy/maintidx v1.0.0 // indirect
238238
github.com/yeya24/promlinter v0.2.0 // indirect
239239
gitlab.com/bosi/decorder v0.2.3 // indirect
240-
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
241-
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
242-
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
240+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
241+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
242+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
243243
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
244244
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
245245
go.opentelemetry.io/otel v1.29.0 // indirect
@@ -252,51 +252,52 @@ require (
252252
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
253253
go.uber.org/multierr v1.11.0 // indirect
254254
go.uber.org/zap v1.27.0 // indirect
255-
golang.org/x/crypto v0.36.0 // indirect
255+
golang.org/x/crypto v0.32.0 // indirect
256256
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
257257
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
258-
golang.org/x/mod v0.24.0 // indirect
259-
golang.org/x/net v0.37.0 // indirect
258+
golang.org/x/mod v0.20.0 // indirect
259+
golang.org/x/net v0.34.0 // indirect
260260
golang.org/x/oauth2 v0.23.0 // indirect
261-
golang.org/x/sync v0.12.0 // indirect
262-
golang.org/x/sys v0.31.0 // indirect
263-
golang.org/x/term v0.30.0 // indirect
264-
golang.org/x/text v0.23.0 // indirect
265-
golang.org/x/time v0.7.0 // indirect
261+
golang.org/x/sync v0.10.0 // indirect
262+
golang.org/x/sys v0.29.0 // indirect
263+
golang.org/x/term v0.28.0 // indirect
264+
golang.org/x/text v0.21.0 // indirect
265+
golang.org/x/time v0.6.0 // indirect
266266
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
267267
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
268268
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
269269
google.golang.org/grpc v1.66.2 // indirect
270-
google.golang.org/protobuf v1.36.6 // indirect
270+
google.golang.org/protobuf v1.34.2 // indirect
271271
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
272272
gopkg.in/inf.v0 v0.9.1 // indirect
273273
gopkg.in/ini.v1 v1.67.0 // indirect
274274
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
275275
gopkg.in/yaml.v2 v2.4.0 // indirect
276276
gopkg.in/yaml.v3 v3.0.1 // indirect
277277
honnef.co/go/tools v0.3.3 // indirect
278-
k8s.io/apiserver v0.32.2 // indirect
278+
k8s.io/apiserver v0.31.7 // indirect
279279
k8s.io/cloud-provider v0.30.1 // indirect
280280
k8s.io/component-helpers v0.30.1 // indirect
281281
k8s.io/controller-manager v0.30.1 // indirect
282-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
283-
k8s.io/kms v0.32.2 // indirect
282+
k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7 // indirect
283+
k8s.io/kms v0.31.7 // indirect
284284
k8s.io/kube-aggregator v0.31.1 // indirect
285-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
285+
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
286286
k8s.io/kubelet v0.30.1 // indirect
287287
mvdan.cc/gofumpt v0.4.0 // indirect
288288
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
289289
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
290290
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
291-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
291+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
292292
sigs.k8s.io/gateway-api v1.1.0 // indirect
293-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
293+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
294294
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
295-
sigs.k8s.io/kustomize/api v0.14.0 // indirect
296-
sigs.k8s.io/kustomize/cmd/config v0.11.3 // indirect
297-
sigs.k8s.io/kustomize/kyaml v0.14.3 // indirect
298-
sigs.k8s.io/randfill v1.0.0 // indirect
299-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
295+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
296+
sigs.k8s.io/kustomize/cmd/config v0.14.1 // indirect
297+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
298+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
300299
)
301300

302301
replace github.com/cert-manager/cert-manager => github.com/openshift/jetstack-cert-manager v1.16.4
302+
303+
replace sigs.k8s.io/controller-tools => github.com/openshift/kubernetes-sigs-controller-tools v0.12.1-0.20250220141355-6d2c85031fbc

0 commit comments

Comments
 (0)