Skip to content

Commit 8870f1b

Browse files
authored
Revert "Machine CRDs now makes use of status subresource (#223)" (#226)
This reverts commit 4018eb9.
1 parent 4018eb9 commit 8870f1b

File tree

16 files changed

+26
-82
lines changed

16 files changed

+26
-82
lines changed

.ci/integration-tests

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,12 @@ function print_results() {
403403

404404
printf "\n\t\t\t----- Start of Test Script -----------\n"
405405

406-
#setup_environment
407-
#test_all_providers
408-
#pkill controller_manager
409-
#cleanup_all_providers
410-
#print_logs
411-
#print_results
406+
setup_environment
407+
test_all_providers
408+
pkill controller_manager
409+
cleanup_all_providers
410+
print_logs
411+
print_results
412412

413413
printf "\n\t\t\t----- End of Test Script -----------\n"
414414

pkg/apis/machine/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ import (
2424
)
2525

2626
// WARNING!
27-
// IF YOU MODIFY ANY OF THE TYPES HERE COPY THEM TO ./v1alpha1/types.go
27+
// IF YOU MODIFY ANY OF THE TYPES HERE COPY THEM TO ../types.go
2828
// AND RUN ./hack/generate-code
2929

3030
/********************** Machine APIs ***************/
3131

3232
// +genclient
33+
// +genclient:noStatus
3334
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
3435

3536
// Machine TODO

pkg/apis/machine/v1alpha1/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
/********************** Machine APIs ***************/
2929

3030
// +genclient
31+
// +genclient:noStatus
3132
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
3233

3334
// Machine TODO

pkg/apis/machine/v1alpha1/zz_generated.deepcopy.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.

pkg/apis/machine/zz_generated.deepcopy.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.

pkg/client/clientset/internalversion/typed/machine/internalversion/fake/fake_machine.go

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

pkg/client/clientset/internalversion/typed/machine/internalversion/machine.go

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

pkg/client/clientset/versioned/typed/machine/v1alpha1/fake/fake_machine.go

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

pkg/client/clientset/versioned/typed/machine/v1alpha1/machine.go

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

pkg/controller/deployment.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030

3131
"github.com/golang/glog"
3232

33-
v1 "k8s.io/api/core/v1"
33+
"k8s.io/api/core/v1"
3434
"k8s.io/apimachinery/pkg/api/errors"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/apimachinery/pkg/labels"
@@ -487,7 +487,7 @@ func (dc *controller) reconcileClusterMachineDeployment(key string) error {
487487
dc.recorder.Eventf(d, v1.EventTypeWarning, "SelectingAll", "This deployment is selecting all machines. A non-empty selector is required.")
488488
if d.Status.ObservedGeneration < d.Generation {
489489
d.Status.ObservedGeneration = d.Generation
490-
dc.controlMachineClient.MachineDeployments(d.Namespace).UpdateStatus(d)
490+
dc.controlMachineClient.MachineDeployments(d.Namespace).Update(d)
491491
}
492492
return nil
493493
}

0 commit comments

Comments
 (0)