Skip to content

Commit 4bba8f5

Browse files
kishorjkishorj
authored
cut v2.4.6 release (#2968)
1 parent 44dfe8b commit 4bba8f5

File tree

14 files changed

+320
-159
lines changed

14 files changed

+320
-159
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
MAKEFILE_PATH = $(dir $(realpath -s $(firstword $(MAKEFILE_LIST))))
33

44
# Image URL to use all building/pushing image targets
5-
IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.4.5
5+
IMG ?= public.ecr.aws/eks/aws-load-balancer-controller:v2.4.6
66

77
CRD_OPTIONS ?= "crd:crdVersions=v1"
88

‎config/controller/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
88
kind: Kustomization
99
images:
1010
- name: controller
11-
newName: amazon/aws-alb-ingress-controller
12-
newTag: v2.4.5
11+
newName: public.ecr.aws/eks/aws-load-balancer-controller
12+
newTag: v2.4.6

‎config/crd/bases/elbv2.k8s.aws_ingressclassparams.yaml

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition
54
metadata:
65
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
6+
controller-gen.kubebuilder.io/version: v0.11.1
87
creationTimestamp: null
98
name: ingressclassparams.elbv2.k8s.aws
109
spec:
@@ -38,18 +37,23 @@ spec:
3837
description: IngressClassParams is the Schema for the IngressClassParams API
3938
properties:
4039
apiVersion:
41-
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'
40+
description: 'APIVersion defines the versioned schema of this representation
41+
of an object. Servers should convert recognized schemas to the latest
42+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
4243
type: string
4344
kind:
44-
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'
45+
description: 'Kind is a string value representing the REST resource this
46+
object represents. Servers may infer this from the endpoint the client
47+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
4548
type: string
4649
metadata:
4750
type: object
4851
spec:
4952
description: IngressClassParamsSpec defines the desired state of IngressClassParams
5053
properties:
5154
group:
52-
description: Group defines the IngressGroup for all Ingresses that belong to IngressClass with this IngressClassParams.
55+
description: Group defines the IngressGroup for all Ingresses that
56+
belong to IngressClass with this IngressClassParams.
5357
properties:
5458
name:
5559
description: Name is the name of IngressGroup.
@@ -58,13 +62,16 @@ spec:
5862
- name
5963
type: object
6064
ipAddressType:
61-
description: IPAddressType defines the ip address type for all Ingresses that belong to IngressClass with this IngressClassParams.
65+
description: IPAddressType defines the ip address type for all Ingresses
66+
that belong to IngressClass with this IngressClassParams.
6267
enum:
6368
- ipv4
6469
- dualstack
6570
type: string
6671
loadBalancerAttributes:
67-
description: LoadBalancerAttributes define the custom attributes to LoadBalancers for all Ingress that that belong to IngressClass with this IngressClassParams.
72+
description: LoadBalancerAttributes define the custom attributes to
73+
LoadBalancers for all Ingress that that belong to IngressClass with
74+
this IngressClassParams.
6875
items:
6976
description: Attributes defines custom attributes on resources.
7077
properties:
@@ -80,21 +87,33 @@ spec:
8087
type: object
8188
type: array
8289
namespaceSelector:
83-
description: NamespaceSelector restrict the namespaces of Ingresses that are allowed to specify the IngressClass with this IngressClassParams. * if absent or present but empty, it selects all namespaces.
90+
description: NamespaceSelector restrict the namespaces of Ingresses
91+
that are allowed to specify the IngressClass with this IngressClassParams.
92+
* if absent or present but empty, it selects all namespaces.
8493
properties:
8594
matchExpressions:
86-
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
95+
description: matchExpressions is a list of label selector requirements.
96+
The requirements are ANDed.
8797
items:
88-
description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
98+
description: A label selector requirement is a selector that
99+
contains values, a key, and an operator that relates the key
100+
and values.
89101
properties:
90102
key:
91-
description: key is the label key that the selector applies to.
103+
description: key is the label key that the selector applies
104+
to.
92105
type: string
93106
operator:
94-
description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist.
107+
description: operator represents a key's relationship to
108+
a set of values. Valid operators are In, NotIn, Exists
109+
and DoesNotExist.
95110
type: string
96111
values:
97-
description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.
112+
description: values is an array of string values. If the
113+
operator is In or NotIn, the values array must be non-empty.
114+
If the operator is Exists or DoesNotExist, the values
115+
array must be empty. This array is replaced during a strategic
116+
merge patch.
98117
items:
99118
type: string
100119
type: array
@@ -106,17 +125,24 @@ spec:
106125
matchLabels:
107126
additionalProperties:
108127
type: string
109-
description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed.
128+
description: matchLabels is a map of {key,value} pairs. A single
129+
{key,value} in the matchLabels map is equivalent to an element
130+
of matchExpressions, whose key field is "key", the operator
131+
is "In", and the values array contains only "value". The requirements
132+
are ANDed.
110133
type: object
111134
type: object
135+
x-kubernetes-map-type: atomic
112136
scheme:
113-
description: Scheme defines the scheme for all Ingresses that belong to IngressClass with this IngressClassParams.
137+
description: Scheme defines the scheme for all Ingresses that belong
138+
to IngressClass with this IngressClassParams.
114139
enum:
115140
- internal
116141
- internet-facing
117142
type: string
118143
tags:
119-
description: Tags defines list of Tags on AWS resources provisioned for Ingresses that belong to IngressClass with this IngressClassParams.
144+
description: Tags defines list of Tags on AWS resources provisioned
145+
for Ingresses that belong to IngressClass with this IngressClassParams.
120146
items:
121147
description: Tag defines a AWS Tag on resources.
122148
properties:
@@ -136,9 +162,3 @@ spec:
136162
served: true
137163
storage: true
138164
subresources: {}
139-
status:
140-
acceptedNames:
141-
kind: ""
142-
plural: ""
143-
conditions: []
144-
storedVersions: []

0 commit comments

Comments
 (0)