Skip to content

Commit 69541dc

Browse files
sivcharisivchari
committed
fix review findings
Signed-off-by: sivchari <[email protected]>
1 parent 807d63a commit 69541dc

16 files changed

+78
-51
lines changed

‎Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -942,11 +942,7 @@ test-cover: ## Run unit and integration tests and generate a coverage report
942942
.PHONY: test-docker-infrastructure
943943
test-docker-infrastructure: $(SETUP_ENVTEST) ## Run unit and integration tests for docker infrastructure provider
944944
cd $(CAPD_DIR); KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -race ./... $(TEST_ARGS)
945-
$(MAKE) test-conversions-docker-infrastructure TEST_ARGS="$(TEST_ARGS)"
946-
947-
.PHONY: test-conversions-docker-infrastructure
948-
test-conversions-docker-infrastructure: $(SETUP_ENVTEST) ## Run conversions test for docker infrastructure provider
949-
cd $(CAPD_DIR); KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -run "^TestFuzzyConversion$$" ./... $(TEST_ARGS)
945+
$(MAKE) test-docker-infrastructure-conversions TEST_ARGS="$(TEST_ARGS)"
950946

951947
.PHONY: test-docker-infrastructure-conversions
952948
test-docker-infrastructure-conversions: $(SETUP_ENVTEST) ## Run conversions test for docker infrastructure provider

‎test/infrastructure/docker/api/v1alpha3/conversion.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1alpha3
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
apiconversion "k8s.io/apimachinery/pkg/conversion"
22+
"k8s.io/utils/ptr"
2223
"sigs.k8s.io/controller-runtime/pkg/conversion"
2324

2425
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -186,8 +187,8 @@ func Convert_v1beta2_DockerClusterStatus_To_v1alpha3_DockerClusterStatus(in *inf
186187
clusterv1alpha3.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha3_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
187188
}
188189

189-
if in.Initialization != nil {
190-
out.Ready = in.Initialization.Provisioned
190+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
191+
out.Ready = *in.Initialization.Provisioned
191192
}
192193

193194
// Move FailureDomains
@@ -216,8 +217,8 @@ func Convert_v1beta2_DockerMachineStatus_To_v1alpha3_DockerMachineStatus(in *inf
216217
clusterv1alpha3.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha3_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
217218
}
218219

219-
if in.Initialization != nil && in.Initialization.Provisioned {
220-
out.Ready = in.Initialization.Provisioned
220+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
221+
out.Ready = *in.Initialization.Provisioned
221222
}
222223

223224
return nil
@@ -273,10 +274,9 @@ func Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Doc
273274
clusterv1alpha3.Convert_v1alpha3_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
274275
}
275276

276-
out.Initialization = nil
277277
if in.Ready {
278278
out.Initialization = &infrav1.DockerClusterInitializationStatus{
279-
Provisioned: in.Ready,
279+
Provisioned: ptr.To(in.Ready),
280280
}
281281
}
282282

‎test/infrastructure/docker/api/v1alpha4/conversion.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1alpha4
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
apiconversion "k8s.io/apimachinery/pkg/conversion"
22+
"k8s.io/utils/ptr"
2223
"sigs.k8s.io/controller-runtime/pkg/conversion"
2324

2425
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -200,8 +201,8 @@ func Convert_v1beta2_DockerClusterStatus_To_v1alpha4_DockerClusterStatus(in *inf
200201
clusterv1alpha4.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha4_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
201202
}
202203

203-
if in.Initialization != nil {
204-
out.Ready = in.Initialization.Provisioned
204+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
205+
out.Ready = *in.Initialization.Provisioned
205206
}
206207

207208
// Move FailureDomains
@@ -230,8 +231,8 @@ func Convert_v1beta2_DockerMachineStatus_To_v1alpha4_DockerMachineStatus(in *inf
230231
clusterv1alpha4.Convert_v1beta2_Deprecated_V1Beta1_Conditions_To_v1alpha4_Conditions(&in.Deprecated.V1Beta1.Conditions, &out.Conditions)
231232
}
232233

233-
if in.Initialization != nil && in.Initialization.Provisioned {
234-
out.Ready = in.Initialization.Provisioned
234+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
235+
out.Ready = *in.Initialization.Provisioned
235236
}
236237

237238
return nil
@@ -281,7 +282,7 @@ func Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Doc
281282
if out.Initialization == nil {
282283
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
283284
}
284-
out.Initialization.Provisioned = in.Ready
285+
out.Initialization.Provisioned = ptr.To(in.Ready)
285286
}
286287

287288
return nil
@@ -302,10 +303,9 @@ func Convert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Doc
302303
clusterv1alpha4.Convert_v1alpha4_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
303304
}
304305

305-
out.Initialization = nil
306306
if in.Ready {
307307
out.Initialization = &infrav1.DockerClusterInitializationStatus{
308-
Provisioned: in.Ready,
308+
Provisioned: ptr.To(in.Ready),
309309
}
310310
}
311311

‎test/infrastructure/docker/api/v1beta1/conversion.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
apiconversion "k8s.io/apimachinery/pkg/conversion"
22+
"k8s.io/utils/ptr"
2223
"sigs.k8s.io/controller-runtime/pkg/conversion"
2324

2425
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
@@ -139,7 +140,7 @@ func Convert_v1beta1_DevClusterStatus_To_v1beta2_DevClusterStatus(in *DevCluster
139140
if out.Initialization == nil {
140141
out.Initialization = &infrav1.DevClusterInitializationStatus{}
141142
}
142-
out.Initialization.Provisioned = in.Ready
143+
out.Initialization.Provisioned = ptr.To(in.Ready)
143144
}
144145

145146
if in.FailureDomains != nil {
@@ -183,8 +184,8 @@ func Convert_v1beta2_DevClusterStatus_To_v1beta1_DevClusterStatus(in *infrav1.De
183184
return err
184185
}
185186

186-
if in.Initialization != nil {
187-
out.Ready = in.Initialization.Provisioned
187+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
188+
out.Ready = *in.Initialization.Provisioned
188189
}
189190

190191
if in.FailureDomains != nil {
@@ -225,7 +226,7 @@ func Convert_v1beta1_DevMachineStatus_To_v1beta2_DevMachineStatus(in *DevMachine
225226
if out.Initialization == nil {
226227
out.Initialization = &infrav1.DevMachineInitializationStatus{}
227228
}
228-
out.Initialization.Provisioned = in.Ready
229+
out.Initialization.Provisioned = ptr.To(in.Ready)
229230
}
230231

231232
// Reset conditions from autogenerated conversions
@@ -258,8 +259,8 @@ func Convert_v1beta2_DevMachineStatus_To_v1beta1_DevMachineStatus(in *infrav1.De
258259
return err
259260
}
260261

261-
if in.Initialization != nil && in.Initialization.Provisioned {
262-
out.Ready = in.Initialization.Provisioned
262+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
263+
out.Ready = *in.Initialization.Provisioned
263264
}
264265

265266
// Reset conditions from autogenerated conversions
@@ -291,7 +292,7 @@ func Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Dock
291292
if out.Initialization == nil {
292293
out.Initialization = &infrav1.DockerClusterInitializationStatus{}
293294
}
294-
out.Initialization.Provisioned = in.Ready
295+
out.Initialization.Provisioned = ptr.To(in.Ready)
295296
}
296297

297298
if in.FailureDomains != nil {
@@ -335,8 +336,8 @@ func Convert_v1beta2_DockerClusterStatus_To_v1beta1_DockerClusterStatus(in *infr
335336
return err
336337
}
337338

338-
if in.Initialization != nil {
339-
out.Ready = in.Initialization.Provisioned
339+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
340+
out.Ready = *in.Initialization.Provisioned
340341
}
341342

342343
if in.FailureDomains != nil {
@@ -377,7 +378,7 @@ func Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Dock
377378
if out.Initialization == nil {
378379
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
379380
}
380-
out.Initialization.Provisioned = in.Ready
381+
out.Initialization.Provisioned = ptr.To(in.Ready)
381382
}
382383

383384
// Reset conditions from autogenerated conversions
@@ -410,8 +411,8 @@ func Convert_v1beta2_DockerMachineStatus_To_v1beta1_DockerMachineStatus(in *infr
410411
return err
411412
}
412413

413-
if in.Initialization != nil && in.Initialization.Provisioned {
414-
out.Ready = in.Initialization.Provisioned
414+
if in.Initialization != nil && in.Initialization.Provisioned != nil {
415+
out.Ready = *in.Initialization.Provisioned
415416
}
416417

417418
// Reset conditions from autogenerated conversions

‎test/infrastructure/docker/api/v1beta2/devcluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ type DevClusterInitializationStatus struct {
146146
// provisioned is true when the infrastructure provider reports that the Cluster's infrastructure is fully provisioned.
147147
// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate initial Cluster provisioning.
148148
// +optional
149-
Provisioned bool `json:"provisioned,omitempty"`
149+
Provisioned *bool `json:"provisioned,omitempty"`
150150
}
151151

152152
// DevClusterDeprecatedStatus groups all the status fields that are deprecated and will be removed when support for v1beta1 will be dropped.

‎test/infrastructure/docker/api/v1beta2/devmachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ type DevMachineInitializationStatus struct {
380380
// provisioned is true when the infrastructure provider reports that the Machine's infrastructure is fully provisioned.
381381
// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate initial Machine provisioning.
382382
// +optional
383-
Provisioned bool `json:"provisioned,omitempty"`
383+
Provisioned *bool `json:"provisioned,omitempty"`
384384
}
385385

386386
// DevMachineBackendStatus define backend status for a DevMachine.

‎test/infrastructure/docker/api/v1beta2/dockercluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ type DockerClusterInitializationStatus struct {
120120
// provisioned is true when the infrastructure provider reports that the Cluster's infrastructure is fully provisioned.
121121
// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate initial Cluster provisioning.
122122
// +optional
123-
Provisioned bool `json:"provisioned,omitempty"`
123+
Provisioned *bool `json:"provisioned,omitempty"`
124124
}
125125

126126
// DockerClusterDeprecatedStatus groups all the status fields that are deprecated and will be removed when support for v1beta1 will be dropped.

‎test/infrastructure/docker/api/v1beta2/dockermachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ type DockerMachineInitializationStatus struct {
114114
// provisioned is true when the infrastructure provider reports that the Machine's infrastructure is fully provisioned.
115115
// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate initial Machine provisioning.
116116
// +optional
117-
Provisioned bool `json:"provisioned,omitempty"`
117+
Provisioned *bool `json:"provisioned,omitempty"`
118118
}
119119

120120
// DockerMachineDeprecatedStatus groups all the status fields that are deprecated and will be removed when support for v1beta1 will be dropped.

‎test/infrastructure/docker/api/v1beta2/zz_generated.deepcopy.go

Lines changed: 24 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/infrastructure/docker/config/crd/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
labels:
22
- pairs:
3+
# Note: This is needed so the topology reconciler can figure out
4+
# the contract of v1beta1 when v1beta1 objects are used in ClusterClasses.
35
cluster.x-k8s.io/v1beta1: v1beta1
46
cluster.x-k8s.io/v1beta2: v1beta2
57

‎test/infrastructure/docker/internal/controllers/backends/docker/dockercluster_backend.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"github.com/pkg/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28+
"k8s.io/utils/ptr"
2829
ctrl "sigs.k8s.io/controller-runtime"
2930
"sigs.k8s.io/controller-runtime/pkg/client"
3031
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -104,7 +105,7 @@ func (r *ClusterBackEndReconciler) ReconcileNormal(ctx context.Context, cluster
104105

105106
// Mark the dockerCluster ready
106107
dockerCluster.Status.Initialization = &infrav1.DevClusterInitializationStatus{
107-
Provisioned: true,
108+
Provisioned: ptr.To(true),
108109
}
109110
v1beta1conditions.MarkTrue(dockerCluster, infrav1.LoadBalancerAvailableV1Beta1Condition)
110111
conditions.Set(dockerCluster, metav1.Condition{

‎test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
corev1 "k8s.io/api/core/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/types"
30+
"k8s.io/utils/ptr"
3031
ctrl "sigs.k8s.io/controller-runtime"
3132
"sigs.k8s.io/controller-runtime/pkg/client"
3233
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -118,7 +119,7 @@ func (r *MachineBackendReconciler) ReconcileNormal(ctx context.Context, cluster
118119
// ensure ready state is set.
119120
// This is required after move, because status is not moved to the target cluster.
120121
dockerMachine.Status.Initialization = &infrav1.DevMachineInitializationStatus{
121-
Provisioned: true,
122+
Provisioned: ptr.To(true),
122123
}
123124

124125
if externalMachine.Exists() {
@@ -364,7 +365,7 @@ func (r *MachineBackendReconciler) ReconcileNormal(ctx context.Context, cluster
364365
providerID := externalMachine.ProviderID()
365366
dockerMachine.Spec.ProviderID = &providerID
366367
dockerMachine.Status.Initialization = &infrav1.DevMachineInitializationStatus{
367-
Provisioned: true,
368+
Provisioned: ptr.To(true),
368369
}
369370

370371
return ctrl.Result{}, nil

‎test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorycluster_backend.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
apierrors "k8s.io/apimachinery/pkg/api/errors"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/klog/v2"
28+
"k8s.io/utils/ptr"
2829
ctrl "sigs.k8s.io/controller-runtime"
2930
"sigs.k8s.io/controller-runtime/pkg/client"
3031
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -127,7 +128,7 @@ func (r *ClusterBackendReconciler) ReconcileNormal(ctx context.Context, cluster
127128

128129
// Mark the InMemoryCluster ready
129130
inMemoryCluster.Status.Initialization = &infrav1.DevClusterInitializationStatus{
130-
Provisioned: true,
131+
Provisioned: ptr.To(true),
131132
}
132133

133134
return ctrl.Result{}, nil

‎test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorymachine_backend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func (r *MachineBackendReconciler) reconcileNormalCloudMachine(ctx context.Conte
229229

230230
inMemoryMachine.Spec.ProviderID = ptr.To(calculateProviderID(inMemoryMachine))
231231
inMemoryMachine.Status.Initialization = &infrav1.DevMachineInitializationStatus{
232-
Provisioned: true,
232+
Provisioned: ptr.To(true),
233233
}
234234
v1beta1conditions.MarkTrue(inMemoryMachine, infrav1.VMProvisionedCondition)
235235
conditions.Set(inMemoryMachine, metav1.Condition{

0 commit comments

Comments
 (0)