Skip to content

Commit 54da075

Browse files
authored
Merge pull request #1467 from CecileRobertMichon/makefile-versions
Update hack/tools versions
2 parents df3cb5b + 9826c5d commit 54da075

16 files changed

+1873
-622
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,38 +58,38 @@ ifneq ($(abspath $(ROOT_DIR)),$(GOPATH)/src/sigs.k8s.io/cluster-api-provider-azu
5858
endif
5959

6060
# Binaries.
61-
CONTROLLER_GEN_VER := v0.5.0
61+
CONTROLLER_GEN_VER := v0.6.1
6262
CONTROLLER_GEN_BIN := controller-gen
6363
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
6464

65-
CONVERSION_GEN_VER := v0.20.4
65+
CONVERSION_GEN_VER := v0.21.2
6666
CONVERSION_GEN_BIN := conversion-gen
6767
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
6868

6969
ENVSUBST_BIN := envsubst
7070
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)-drone
7171

72-
GOLANGCI_LINT_VER := v1.38.0
72+
GOLANGCI_LINT_VER := v1.41.1
7373
GOLANGCI_LINT_BIN := golangci-lint
7474
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7575

76-
KUSTOMIZE_VER := v4.0.4
76+
KUSTOMIZE_VER := v4.1.3
7777
KUSTOMIZE_BIN := kustomize
7878
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
7979

80-
MOCKGEN_VER := v1.5.0
80+
MOCKGEN_VER := v1.6.0
8181
MOCKGEN_BIN := mockgen
8282
MOCKGEN := $(TOOLS_BIN_DIR)/$(MOCKGEN_BIN)-$(MOCKGEN_VER)
8383

84-
RELEASE_NOTES_VER := v0.3.4
84+
RELEASE_NOTES_VER := v0.9.0
8585
RELEASE_NOTES_BIN := release-notes
8686
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
8787

88-
GO_APIDIFF_VER := latest
88+
GO_APIDIFF_VER := v0.1.0
8989
GO_APIDIFF_BIN := go-apidiff
9090
GO_APIDIFF := $(TOOLS_BIN_DIR)/$(GO_APIDIFF_BIN)
9191

92-
GINKGO_VER := v1.15.2
92+
GINKGO_VER := v1.16.4
9393
GINKGO_BIN := ginkgo
9494
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9595

api/v1alpha3/zz_generated.conversion.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 120 additions & 39 deletions
Large diffs are not rendered by default.

config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml

Lines changed: 347 additions & 111 deletions
Large diffs are not rendered by default.

config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepoolmachines.yaml

Lines changed: 81 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.5.0
7+
controller-gen.kubebuilder.io/version: v0.6.1
88
creationTimestamp: null
99
name: azuremachinepoolmachines.infrastructure.cluster.x-k8s.io
1010
spec:
@@ -46,87 +46,131 @@ spec:
4646
name: v1alpha4
4747
schema:
4848
openAPIV3Schema:
49-
description: AzureMachinePoolMachine is the Schema for the azuremachinepoolmachines API.
49+
description: AzureMachinePoolMachine is the Schema for the azuremachinepoolmachines
50+
API.
5051
properties:
5152
apiVersion:
52-
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'
53+
description: 'APIVersion defines the versioned schema of this representation
54+
of an object. Servers should convert recognized schemas to the latest
55+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
5356
type: string
5457
kind:
55-
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'
58+
description: 'Kind is a string value representing the REST resource this
59+
object represents. Servers may infer this from the endpoint the client
60+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
5661
type: string
5762
metadata:
5863
type: object
5964
spec:
60-
description: AzureMachinePoolMachineSpec defines the desired state of AzureMachinePoolMachine.
65+
description: AzureMachinePoolMachineSpec defines the desired state of
66+
AzureMachinePoolMachine.
6167
properties:
6268
instanceID:
63-
description: InstanceID is the identification of the Machine Instance within the VMSS
69+
description: InstanceID is the identification of the Machine Instance
70+
within the VMSS
6471
type: string
6572
providerID:
66-
description: ProviderID is the identification ID of the Virtual Machine Scale Set
73+
description: ProviderID is the identification ID of the Virtual Machine
74+
Scale Set
6775
type: string
6876
required:
6977
- instanceID
7078
- providerID
7179
type: object
7280
status:
73-
description: AzureMachinePoolMachineStatus defines the observed state of AzureMachinePoolMachine.
81+
description: AzureMachinePoolMachineStatus defines the observed state
82+
of AzureMachinePoolMachine.
7483
properties:
7584
conditions:
7685
description: Conditions defines current service state of the AzureMachinePool.
7786
items:
78-
description: Condition defines an observation of a Cluster API resource operational state.
87+
description: Condition defines an observation of a Cluster API resource
88+
operational state.
7989
properties:
8090
lastTransitionTime:
81-
description: Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
91+
description: Last time the condition transitioned from one status
92+
to another. This should be when the underlying condition changed.
93+
If that is not known, then using the time when the API field
94+
changed is acceptable.
8295
format: date-time
8396
type: string
8497
message:
85-
description: A human readable message indicating details about the transition. This field may be empty.
98+
description: A human readable message indicating details about
99+
the transition. This field may be empty.
86100
type: string
87101
reason:
88-
description: The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.
102+
description: The reason for the condition's last transition
103+
in CamelCase. The specific API may choose whether or not this
104+
field is considered a guaranteed API. This field may not be
105+
empty.
89106
type: string
90107
severity:
91-
description: Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.
108+
description: Severity provides an explicit classification of
109+
Reason code, so the users or machines can immediately understand
110+
the current situation and act accordingly. The Severity field
111+
MUST be set only when Status=False.
92112
type: string
93113
status:
94114
description: Status of the condition, one of True, False, Unknown.
95115
type: string
96116
type:
97-
description: Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.
117+
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
118+
Many .condition.type values are consistent across resources
119+
like Available, but because arbitrary conditions can be useful
120+
(see .node.status.conditions), the ability to deconflict is
121+
important.
98122
type: string
99123
required:
100124
- status
101125
- type
102126
type: object
103127
type: array
104128
failureMessage:
105-
description: "FailureMessage will be set in the event that there is a terminal problem reconciling the MachinePool and will contain a more verbose string suitable for logging and human consumption. \n Any transient errors that occur during the reconciliation of MachinePools can be added as events to the MachinePool object and/or logged in the controller's output."
129+
description: "FailureMessage will be set in the event that there is
130+
a terminal problem reconciling the MachinePool and will contain
131+
a more verbose string suitable for logging and human consumption.
132+
\n Any transient errors that occur during the reconciliation of
133+
MachinePools can be added as events to the MachinePool object and/or
134+
logged in the controller's output."
106135
type: string
107136
failureReason:
108-
description: "FailureReason will be set in the event that there is a terminal problem reconciling the MachinePool machine and will contain a succinct value suitable for machine interpretation. \n Any transient errors that occur during the reconciliation of MachinePools can be added as events to the MachinePool object and/or logged in the controller's output."
137+
description: "FailureReason will be set in the event that there is
138+
a terminal problem reconciling the MachinePool machine and will
139+
contain a succinct value suitable for machine interpretation. \n
140+
Any transient errors that occur during the reconciliation of MachinePools
141+
can be added as events to the MachinePool object and/or logged in
142+
the controller's output."
109143
type: string
110144
instanceName:
111-
description: InstanceName is the name of the Machine Instance within the VMSS
145+
description: InstanceName is the name of the Machine Instance within
146+
the VMSS
112147
type: string
113148
latestModelApplied:
114-
description: LatestModelApplied indicates the instance is running the most up-to-date VMSS model. A VMSS model describes the image version the VM is running. If the instance is not running the latest model, it means the instance may not be running the version of Kubernetes the Machine Pool has specified and needs to be updated.
149+
description: LatestModelApplied indicates the instance is running
150+
the most up-to-date VMSS model. A VMSS model describes the image
151+
version the VM is running. If the instance is not running the latest
152+
model, it means the instance may not be running the version of Kubernetes
153+
the Machine Pool has specified and needs to be updated.
115154
type: boolean
116155
longRunningOperationState:
117-
description: LongRunningOperationState saves the state for an Azure long running operations so it can be continued on the next reconciliation loop.
156+
description: LongRunningOperationState saves the state for an Azure
157+
long running operations so it can be continued on the next reconciliation
158+
loop.
118159
properties:
119160
futureData:
120-
description: FutureData is the base64 url encoded json Azure AutoRest Future
161+
description: FutureData is the base64 url encoded json Azure AutoRest
162+
Future
121163
type: string
122164
name:
123165
description: Name is the name of the Azure resource
124166
type: string
125167
resourceGroup:
126-
description: ResourceGroup is the Azure resource group for the resource
168+
description: ResourceGroup is the Azure resource group for the
169+
resource
127170
type: string
128171
type:
129-
description: Type describes the type of future, update, create, delete, etc
172+
description: Type describes the type of future, update, create,
173+
delete, etc
130174
type: string
131175
required:
132176
- type
@@ -138,7 +182,17 @@ spec:
138182
description: API version of the referent.
139183
type: string
140184
fieldPath:
141-
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.'
185+
description: 'If referring to a piece of an object instead of
186+
an entire object, this string should contain a valid JSON/Go
187+
field access statement, such as desiredState.manifest.containers[2].
188+
For example, if the object reference is to a container within
189+
a pod, this would take on a value like: "spec.containers{name}"
190+
(where "name" refers to the name of the container that triggered
191+
the event) or if no container name is specified "spec.containers[2]"
192+
(container with index 2 in this pod). This syntax is chosen
193+
only to have some well-defined way of referencing a part of
194+
an object. TODO: this design is not final and this field is
195+
subject to change in the future.'
142196
type: string
143197
kind:
144198
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
@@ -150,14 +204,16 @@ spec:
150204
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
151205
type: string
152206
resourceVersion:
153-
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'
207+
description: 'Specific resourceVersion to which this reference
208+
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
154209
type: string
155210
uid:
156211
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
157212
type: string
158213
type: object
159214
provisioningState:
160-
description: ProvisioningState is the provisioning state of the Azure virtual machine instance.
215+
description: ProvisioningState is the provisioning state of the Azure
216+
virtual machine instance.
161217
type: string
162218
ready:
163219
description: Ready is true when the provider resource is ready.

0 commit comments

Comments
 (0)