Skip to content

Commit c6b2b35

Browse files
mboersmamboersma
committed
Bump controller-gen to v0.14.0 to fix NPE
1 parent 490b330 commit c6b2b35

14 files changed

+2219
-2068
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ifneq ($(abspath $(ROOT_DIR)),$(GOPATH)/src/sigs.k8s.io/cluster-api-provider-azu
6969
endif
7070

7171
# Binaries.
72-
CONTROLLER_GEN_VER := v0.13.0
72+
CONTROLLER_GEN_VER := v0.14.0
7373
CONTROLLER_GEN_BIN := controller-gen
7474
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
7575

‎config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusteridentities.yaml‎

Lines changed: 70 additions & 63 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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: azureclusteridentities.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -32,14 +32,19 @@ spec:
3232
API.
3333
properties:
3434
apiVersion:
35-
description: 'APIVersion defines the versioned schema of this representation
36-
of an object. Servers should convert recognized schemas to the latest
37-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
35+
description: |-
36+
APIVersion defines the versioned schema of this representation of an object.
37+
Servers should convert recognized schemas to the latest internal value, and
38+
may reject unrecognized values.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3840
type: string
3941
kind:
40-
description: 'Kind is a string value representing the REST resource this
41-
object represents. Servers may infer this from the endpoint the client
42-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
42+
description: |-
43+
Kind is a string value representing the REST resource this object represents.
44+
Servers may infer this from the endpoint the client submits requests to.
45+
Cannot be updated.
46+
In CamelCase.
47+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4348
type: string
4449
metadata:
4550
type: object
@@ -48,14 +53,12 @@ spec:
4853
used to create an AzureIdentity.
4954
properties:
5055
allowedNamespaces:
51-
description: AllowedNamespaces is used to identify the namespaces
52-
the clusters are allowed to use the identity from. Namespaces can
53-
be selected either using an array of namespaces or with label selector.
54-
An empty allowedNamespaces object indicates that AzureClusters can
55-
use this identity from any namespace. If this object is nil, no
56-
namespaces will be allowed (default behaviour, if this field is
57-
not provided) A namespace should be either in the NamespaceList
58-
or match with Selector to use the identity.
56+
description: |-
57+
AllowedNamespaces is used to identify the namespaces the clusters are allowed to use the identity from.
58+
Namespaces can be selected either using an array of namespaces or with label selector.
59+
An empty allowedNamespaces object indicates that AzureClusters can use this identity from any namespace.
60+
If this object is nil, no namespaces will be allowed (default behaviour, if this field is not provided)
61+
A namespace should be either in the NamespaceList or match with Selector to use the identity.
5962
nullable: true
6063
properties:
6164
list:
@@ -66,36 +69,39 @@ spec:
6669
nullable: true
6770
type: array
6871
selector:
69-
description: "Selector is a selector of namespaces that AzureCluster
70-
can use this Identity from. This is a standard Kubernetes LabelSelector,
71-
a label query over a set of resources. The result of matchLabels
72-
and matchExpressions are ANDed. \n A nil or empty selector indicates
73-
that AzureCluster cannot use this AzureClusterIdentity from
74-
any namespace."
72+
description: |-
73+
Selector is a selector of namespaces that AzureCluster can
74+
use this Identity from. This is a standard Kubernetes LabelSelector,
75+
a label query over a set of resources. The result of matchLabels and
76+
matchExpressions are ANDed.
77+
78+
79+
A nil or empty selector indicates that AzureCluster cannot use this
80+
AzureClusterIdentity from any namespace.
7581
properties:
7682
matchExpressions:
7783
description: matchExpressions is a list of label selector
7884
requirements. The requirements are ANDed.
7985
items:
80-
description: A label selector requirement is a selector
81-
that contains values, a key, and an operator that relates
82-
the key and values.
86+
description: |-
87+
A label selector requirement is a selector that contains values, a key, and an operator that
88+
relates the key and values.
8389
properties:
8490
key:
8591
description: key is the label key that the selector
8692
applies to.
8793
type: string
8894
operator:
89-
description: operator represents a key's relationship
90-
to a set of values. Valid operators are In, NotIn,
91-
Exists and DoesNotExist.
95+
description: |-
96+
operator represents a key's relationship to a set of values.
97+
Valid operators are In, NotIn, Exists and DoesNotExist.
9298
type: string
9399
values:
94-
description: values is an array of string values. If
95-
the operator is In or NotIn, the values array must
96-
be non-empty. If the operator is Exists or DoesNotExist,
97-
the values array must be empty. This array is replaced
98-
during a strategic merge patch.
100+
description: |-
101+
values is an array of string values. If the operator is In or NotIn,
102+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
103+
the values array must be empty. This array is replaced during a strategic
104+
merge patch.
99105
items:
100106
type: string
101107
type: array
@@ -107,18 +113,18 @@ spec:
107113
matchLabels:
108114
additionalProperties:
109115
type: string
110-
description: matchLabels is a map of {key,value} pairs. A
111-
single {key,value} in the matchLabels map is equivalent
112-
to an element of matchExpressions, whose key field is "key",
113-
the operator is "In", and the values array contains only
114-
"value". The requirements are ANDed.
116+
description: |-
117+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
118+
map is equivalent to an element of matchExpressions, whose key field is "key", the
119+
operator is "In", and the values array contains only "value". The requirements are ANDed.
115120
type: object
116121
type: object
117122
x-kubernetes-map-type: atomic
118123
type: object
119124
clientID:
120-
description: ClientID is the service principal client ID. Both User
121-
Assigned MSI and SP can use this field.
125+
description: |-
126+
ClientID is the service principal client ID.
127+
Both User Assigned MSI and SP can use this field.
122128
type: string
123129
clientSecret:
124130
description: ClientSecret is a secret reference which should contain
@@ -135,16 +141,17 @@ spec:
135141
type: object
136142
x-kubernetes-map-type: atomic
137143
resourceID:
138-
description: ResourceID is the Azure resource ID for the User Assigned
139-
MSI resource. Only applicable when type is UserAssignedMSI.
144+
description: |-
145+
ResourceID is the Azure resource ID for the User Assigned MSI resource.
146+
Only applicable when type is UserAssignedMSI.
140147
type: string
141148
tenantID:
142149
description: TenantID is the service principal primary tenant id.
143150
type: string
144151
type:
145-
description: Type is the type of Azure Identity used. ServicePrincipal,
146-
ServicePrincipalCertificate, UserAssignedMSI, ManualServicePrincipal
147-
or WorkloadIdentity.
152+
description: |-
153+
Type is the type of Azure Identity used.
154+
ServicePrincipal, ServicePrincipalCertificate, UserAssignedMSI, ManualServicePrincipal or WorkloadIdentity.
148155
enum:
149156
- ServicePrincipal
150157
- UserAssignedMSI
@@ -168,37 +175,37 @@ spec:
168175
operational state.
169176
properties:
170177
lastTransitionTime:
171-
description: Last time the condition transitioned from one status
172-
to another. This should be when the underlying condition changed.
173-
If that is not known, then using the time when the API field
174-
changed is acceptable.
178+
description: |-
179+
Last time the condition transitioned from one status to another.
180+
This should be when the underlying condition changed. If that is not known, then using the time when
181+
the API field changed is acceptable.
175182
format: date-time
176183
type: string
177184
message:
178-
description: A human readable message indicating details about
179-
the transition. This field may be empty.
185+
description: |-
186+
A human readable message indicating details about the transition.
187+
This field may be empty.
180188
type: string
181189
reason:
182-
description: The reason for the condition's last transition
183-
in CamelCase. The specific API may choose whether or not this
184-
field is considered a guaranteed API. This field may not be
185-
empty.
190+
description: |-
191+
The reason for the condition's last transition in CamelCase.
192+
The specific API may choose whether or not this field is considered a guaranteed API.
193+
This field may not be empty.
186194
type: string
187195
severity:
188-
description: Severity provides an explicit classification of
189-
Reason code, so the users or machines can immediately understand
190-
the current situation and act accordingly. The Severity field
191-
MUST be set only when Status=False.
196+
description: |-
197+
Severity provides an explicit classification of Reason code, so the users or machines can immediately
198+
understand the current situation and act accordingly.
199+
The Severity field MUST be set only when Status=False.
192200
type: string
193201
status:
194202
description: Status of the condition, one of True, False, Unknown.
195203
type: string
196204
type:
197-
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
198-
Many .condition.type values are consistent across resources
199-
like Available, but because arbitrary conditions can be useful
200-
(see .node.status.conditions), the ability to deconflict is
201-
important.
205+
description: |-
206+
Type of condition in CamelCase or in foo.example.com/CamelCase.
207+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
208+
can be useful (see .node.status.conditions), the ability to deconflict is important.
202209
type: string
203210
required:
204211
- lastTransitionTime

0 commit comments

Comments
 (0)