Skip to content

Commit 4ef872d

Browse files
committed
fix review findings
Signed-off-by: sivchari <[email protected]>
1 parent 7bc66a6 commit 4ef872d

14 files changed

+31
-74
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,10 +952,10 @@ test-cover: ## Run unit and integration tests and generate a coverage report
952952
.PHONY: test-docker-infrastructure
953953
test-docker-infrastructure: $(SETUP_ENVTEST) ## Run unit and integration tests for docker infrastructure provider
954954
cd $(CAPD_DIR); KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -race ./... $(TEST_ARGS)
955-
$(MAKE) test-docker-infrastructure-conversions TEST_ARGS="$(TEST_ARGS) "
955+
$(MAKE) test-conversions-docker-infrastructure TEST_ARGS="$(TEST_ARGS)"
956956

957-
.PHONY: test-docker-infrastructure-conversions
958-
test-docker-infrastructure-conversions: $(SETUP_ENVTEST) ## Run conversions test for docker infrastructure provider
957+
.PHONY: test-conversions-docker-infrastructure
958+
test-conversions-docker-infrastructure: $(SETUP_ENVTEST) ## Run conversions test for docker infrastructure provider
959959
cd $(CAPD_DIR); KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -run "^TestFuzzyConversion$$" ./... $(TEST_ARGS)
960960

961961
.PHONY: test-docker-infrastructure-verbose

test/e2e/config/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ providers:
352352
- sourcePath: "../data/infrastructure-docker/main/clusterclass-quick-start-kcp-only.yaml"
353353
- sourcePath: "../data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml"
354354
- sourcePath: "../data/infrastructure-docker/main/clusterclass-in-memory.yaml"
355-
- sourcePath: "../data/shared/main/docker/metadata.yaml"
355+
- sourcePath: "../data/shared/main/metadata.yaml"
356356

357357
- name: test-extension
358358
type: RuntimeExtensionProvider

test/e2e/data/shared/main/docker/metadata.yaml

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ func Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Doc
221221
clusterv1alpha3.Convert_v1alpha3_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
222222
}
223223

224-
out.Initialization = nil
225224
if in.Ready {
226-
out.Initialization = &infrav1.DockerMachineInitializationStatus{
227-
Provisioned: true,
225+
if out.Initialization == nil {
226+
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
228227
}
228+
out.Initialization.Provisioned = in.Ready
229229
}
230230

231231
return nil

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@ func Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Doc
265265
clusterv1alpha4.Convert_v1alpha4_Conditions_To_v1beta2_Deprecated_V1Beta1_Conditions(&in.Conditions, &out.Deprecated.V1Beta1.Conditions)
266266
}
267267

268-
out.Initialization = nil
269268
if in.Ready {
270-
out.Initialization = &infrav1.DockerMachineInitializationStatus{
271-
Provisioned: in.Ready,
269+
if out.Initialization == nil {
270+
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
272271
}
272+
out.Initialization.Provisioned = in.Ready
273273
}
274274

275275
return nil

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ func Convert_v1beta1_DevClusterStatus_To_v1beta2_DevClusterStatus(in *DevCluster
135135
return err
136136
}
137137

138-
out.Initialization = nil
139138
if in.Ready {
140-
out.Initialization = &infrav1.DevClusterInitializationStatus{
141-
Provisioned: in.Ready,
139+
if out.Initialization == nil {
140+
out.Initialization = &infrav1.DevClusterInitializationStatus{}
142141
}
142+
out.Initialization.Provisioned = in.Ready
143143
}
144144

145145
// Reset conditions from autogenerated conversions
@@ -200,11 +200,11 @@ func Convert_v1beta1_DevMachineStatus_To_v1beta2_DevMachineStatus(in *DevMachine
200200
return err
201201
}
202202

203-
out.Initialization = nil
204203
if in.Ready {
205-
out.Initialization = &infrav1.DevMachineInitializationStatus{
206-
Provisioned: in.Ready,
204+
if out.Initialization == nil {
205+
out.Initialization = &infrav1.DevMachineInitializationStatus{}
207206
}
207+
out.Initialization.Provisioned = in.Ready
208208
}
209209

210210
// Reset conditions from autogenerated conversions
@@ -266,11 +266,11 @@ func Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Dock
266266
return err
267267
}
268268

269-
out.Initialization = nil
270269
if in.Ready {
271-
out.Initialization = &infrav1.DockerClusterInitializationStatus{
272-
Provisioned: in.Ready,
270+
if out.Initialization == nil {
271+
out.Initialization = &infrav1.DockerClusterInitializationStatus{}
273272
}
273+
out.Initialization.Provisioned = in.Ready
274274
}
275275

276276
// Reset conditions from autogenerated conversions
@@ -331,11 +331,11 @@ func Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Dock
331331
return err
332332
}
333333

334-
out.Initialization = nil
335334
if in.Ready {
336-
out.Initialization = &infrav1.DockerMachineInitializationStatus{
337-
Provisioned: in.Ready,
335+
if out.Initialization == nil {
336+
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
338337
}
338+
out.Initialization.Provisioned = in.Ready
339339
}
340340

341341
// Reset conditions from autogenerated conversions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ type DevMachineStatus struct {
357357
// +kubebuilder:validation:MaxItems=32
358358
Conditions []metav1.Condition `json:"conditions,omitempty"`
359359

360-
// initialization provides observations of the FooMachine initialization process.
360+
// initialization provides observations of the DevMachine initialization process.
361361
// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial Machine provisioning.
362362
// +optional
363363
Initialization *DevMachineInitializationStatus `json:"initialization,omitempty"`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type DockerClusterStatus struct {
9292
// +kubebuilder:validation:MaxItems=32
9393
Conditions []metav1.Condition `json:"conditions,omitempty"`
9494

95-
// initialization provides observations of the DevCluster initialization process.
95+
// initialization provides observations of the DockerCluster initialization process.
9696
// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial Cluster provisioning.
9797
// +optional
9898
Initialization *DockerClusterInitializationStatus `json:"initialization,omitempty"`

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ type DockerMachineStatus struct {
9090
// +kubebuilder:validation:MaxItems=32
9191
Conditions []metav1.Condition `json:"conditions,omitempty"`
9292

93-
// initialization provides observations of the FooMachine initialization process.
93+
// initialization provides observations of the DockerMachine initialization process.
9494
// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial Machine provisioning.
9595
// +optional
9696
Initialization *DockerMachineInitializationStatus `json:"initialization,omitempty"`

test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_devmachines.yaml

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

0 commit comments

Comments
 (0)