Skip to content

Commit 1c295fa

Browse files
committed
NE-1808: Bump k8s.io, openshift, controller-runtime modules and golang
- Bumped golang to 1.22: - Update go.mod - Update Dockerfiles - Bumped k8s.io/* modules to 0.30.3 and OpenShift API to 20240812094746-86145edb40cf. - Bumped controller-runtime to 0.18.5: - Manager's `Port` option removed, now using dedicated webhook server field (kubernetes-sigs/controller-runtime#2422). - Manager's `MetricsBindAddress` option removed, now using dedicated metrics server field (kubernetes-sigs/controller-runtime#2407). - Cache's `Namespaces` option replaced by `DefaultNamespaces` (kubernetes-sigs/controller-runtime#2421). - Bumped aws-load-balancer-controller to f39ae43121c3 to use latest CRD scheme in e2e tests. - Regenerated CRD and bundle manifests using `make bundle` command. - Bumped `kustomize` to v5 to fix a conflict caused by k8s.io bumps: - `kyaml` unable to use the bumped `github.com/google/gnostic-models/openapiv2` package. - Removed `TypeMeta` from expected deployment object when it's compared to structured one retrieved from fake client (kubernetes-sigs/controller-runtime#2633).
1 parent 59f0616 commit 1c295fa

File tree

1,973 files changed

+145158
-97728
lines changed

Some content is hidden

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

1,973 files changed

+145158
-97728
lines changed

.ci-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.19-openshift-4.12
4+
tag: rhel-8-release-golang-1.22-openshift-4.17

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM registry.access.redhat.com/ubi8/go-toolset:1.19 as builder
2+
FROM registry.access.redhat.com/ubi8/go-toolset:1.22 as builder
33

44
# Copy the go source
55
COPY main.go main.go

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ endif
243243

244244
CONTROLLER_GEN ?= go run sigs.k8s.io/controller-tools/cmd/controller-gen
245245

246-
KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v4
246+
KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v5
247247

248248
ENVTEST ?= go run sigs.k8s.io/controller-runtime/tools/setup-envtest
249249

bundle/manifests/elbv2.k8s.aws_ingressclassparams.yaml

+75-26
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.5.0
5+
controller-gen.kubebuilder.io/version: v0.14.0
66
creationTimestamp: null
77
name: ingressclassparams.elbv2.k8s.aws
88
spec:
@@ -36,20 +36,31 @@ spec:
3636
description: IngressClassParams is the Schema for the IngressClassParams API
3737
properties:
3838
apiVersion:
39-
description: 'APIVersion defines the versioned schema of this representation
40-
of an object. Servers should convert recognized schemas to the latest
41-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
39+
description: |-
40+
APIVersion defines the versioned schema of this representation of an object.
41+
Servers should convert recognized schemas to the latest internal value, and
42+
may reject unrecognized values.
43+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4244
type: string
4345
kind:
44-
description: 'Kind is a string value representing the REST resource this
45-
object represents. Servers may infer this from the endpoint the client
46-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
46+
description: |-
47+
Kind is a string value representing the REST resource this object represents.
48+
Servers may infer this from the endpoint the client submits requests to.
49+
Cannot be updated.
50+
In CamelCase.
51+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4752
type: string
4853
metadata:
4954
type: object
5055
spec:
5156
description: IngressClassParamsSpec defines the desired state of IngressClassParams
5257
properties:
58+
certificateArn:
59+
description: CertificateArn specifies the ARN of the certificates
60+
for all Ingresses that belong to IngressClass with this IngressClassParams.
61+
items:
62+
type: string
63+
type: array
5364
group:
5465
description: Group defines the IngressGroup for all Ingresses that
5566
belong to IngressClass with this IngressClassParams.
@@ -60,12 +71,19 @@ spec:
6071
required:
6172
- name
6273
type: object
74+
inboundCIDRs:
75+
description: InboundCIDRs specifies the CIDRs that are allowed to
76+
access the Ingresses that belong to IngressClass with this IngressClassParams.
77+
items:
78+
type: string
79+
type: array
6380
ipAddressType:
6481
description: IPAddressType defines the ip address type for all Ingresses
6582
that belong to IngressClass with this IngressClassParams.
6683
enum:
6784
- ipv4
6885
- dualstack
86+
- dualstack-without-public-ipv4
6987
type: string
7088
loadBalancerAttributes:
7189
description: LoadBalancerAttributes define the custom attributes to
@@ -86,58 +104,89 @@ spec:
86104
type: object
87105
type: array
88106
namespaceSelector:
89-
description: NamespaceSelector restrict the namespaces of Ingresses
90-
that are allowed to specify the IngressClass with this IngressClassParams.
107+
description: |-
108+
NamespaceSelector restrict the namespaces of Ingresses that are allowed to specify the IngressClass with this IngressClassParams.
91109
* if absent or present but empty, it selects all namespaces.
92110
properties:
93111
matchExpressions:
94112
description: matchExpressions is a list of label selector requirements.
95113
The requirements are ANDed.
96114
items:
97-
description: A label selector requirement is a selector that
98-
contains values, a key, and an operator that relates the key
99-
and values.
115+
description: |-
116+
A label selector requirement is a selector that contains values, a key, and an operator that
117+
relates the key and values.
100118
properties:
101119
key:
102120
description: key is the label key that the selector applies
103121
to.
104122
type: string
105123
operator:
106-
description: operator represents a key's relationship to
107-
a set of values. Valid operators are In, NotIn, Exists
108-
and DoesNotExist.
124+
description: |-
125+
operator represents a key's relationship to a set of values.
126+
Valid operators are In, NotIn, Exists and DoesNotExist.
109127
type: string
110128
values:
111-
description: values is an array of string values. If the
112-
operator is In or NotIn, the values array must be non-empty.
113-
If the operator is Exists or DoesNotExist, the values
114-
array must be empty. This array is replaced during a strategic
129+
description: |-
130+
values is an array of string values. If the operator is In or NotIn,
131+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
132+
the values array must be empty. This array is replaced during a strategic
115133
merge patch.
116134
items:
117135
type: string
118136
type: array
137+
x-kubernetes-list-type: atomic
119138
required:
120139
- key
121140
- operator
122141
type: object
123142
type: array
143+
x-kubernetes-list-type: atomic
124144
matchLabels:
125145
additionalProperties:
126146
type: string
127-
description: matchLabels is a map of {key,value} pairs. A single
128-
{key,value} in the matchLabels map is equivalent to an element
129-
of matchExpressions, whose key field is "key", the operator
130-
is "In", and the values array contains only "value". The requirements
131-
are ANDed.
147+
description: |-
148+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
149+
map is equivalent to an element of matchExpressions, whose key field is "key", the
150+
operator is "In", and the values array contains only "value". The requirements are ANDed.
132151
type: object
133152
type: object
153+
x-kubernetes-map-type: atomic
134154
scheme:
135155
description: Scheme defines the scheme for all Ingresses that belong
136156
to IngressClass with this IngressClassParams.
137157
enum:
138158
- internal
139159
- internet-facing
140160
type: string
161+
sslPolicy:
162+
description: SSLPolicy specifies the SSL Policy for all Ingresses
163+
that belong to IngressClass with this IngressClassParams.
164+
type: string
165+
subnets:
166+
description: Subnets defines the subnets for all Ingresses that belong
167+
to IngressClass with this IngressClassParams.
168+
properties:
169+
ids:
170+
description: IDs specify the resource IDs of subnets. Exactly
171+
one of this or `tags` must be specified.
172+
items:
173+
description: SubnetID specifies a subnet ID.
174+
pattern: subnet-[0-9a-f]+
175+
type: string
176+
minItems: 1
177+
type: array
178+
tags:
179+
additionalProperties:
180+
items:
181+
type: string
182+
type: array
183+
description: |-
184+
Tags specifies subnets in the load balancer's VPC where each
185+
tag specified in the map key contains one of the values in the corresponding
186+
value list.
187+
Exactly one of this or `ids` must be specified.
188+
type: object
189+
type: object
141190
tags:
142191
description: Tags defines list of Tags on AWS resources provisioned
143192
for Ingresses that belong to IngressClass with this IngressClassParams.
@@ -164,5 +213,5 @@ status:
164213
acceptedNames:
165214
kind: ""
166215
plural: ""
167-
conditions: []
168-
storedVersions: []
216+
conditions: null
217+
storedVersions: null

0 commit comments

Comments
 (0)