Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Cluster autoscaler operator to consume machine.openshift.io #35

Merged
merged 5 commits into from
Feb 7, 2019
Merged

Update Cluster autoscaler operator to consume machine.openshift.io #35

merged 5 commits into from
Feb 7, 2019

Conversation

spangenberg
Copy link
Contributor

No description provided.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 4, 2019
@bison
Copy link
Contributor

bison commented Feb 4, 2019

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 4, 2019
@frobware
Copy link
Contributor

frobware commented Feb 4, 2019 

minSizeAnnotation = "sigs.k8s.io/cluster-api-autoscaler-node-group-min-size"
maxSizeAnnotation = "sigs.k8s.io/cluster-api-autoscaler-node-group-max-size"

Both of these need to become "machine.openshift.io/..."

@spangenberg
Copy link
Contributor Author 

minSizeAnnotation = "sigs.k8s.io/cluster-api-autoscaler-node-group-min-size"
maxSizeAnnotation = "sigs.k8s.io/cluster-api-autoscaler-node-group-max-size"

Both of these need to become "machine.openshift.io/..."

Thanks for the catch.

bison
bison approved these changes Feb 5, 2019
View reviewed changes
Copy link
Contributor

@bison bison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Looks perfect. Should be good to merge if the tests pass.

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 5, 2019
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2019
@bison
Copy link
Contributor

bison commented Feb 5, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 5, 2019
@bison
Copy link
Contributor

bison commented Feb 5, 2019

/test e2e-aws

1 similar comment
@bison
Copy link
Contributor

bison commented Feb 6, 2019

/test e2e-aws

@frobware
Copy link
Contributor

frobware commented Feb 7, 2019

/retest

@frobware
Copy link
Contributor

frobware commented Feb 7, 2019

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2019
enxebre
enxebre reviewed Feb 7, 2019
View reviewed changes
pkg/controller/machineautoscaler/machineautoscaler_controller.go
{Group: "cluster.k8s.io", Version: "v1alpha1", Kind: "MachineDeployment"},
{Group: "cluster.k8s.io", Version: "v1alpha1", Kind: "MachineSet"},
{Group: "machine.openshift.io", Version: "v1beta1", Kind: "MachineDeployment"},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a blocker, this would belong to a different PR

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to decide quickly. this will merge RSN if the tests pass as we have LGTM and APPROVE.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What belongs to a different PR? Just adding MachineDeployments? Or am I misunderstanding?

There's no harm in adding the deployments here.

@bison
Copy link
Contributor

bison commented Feb 7, 2019

/test e2e-aws-operator

Tests are passing for me locally. Not sure what was up on the last run.

@enxebre
Copy link
Member

enxebre commented Feb 7, 2019 •
edited

F0207 11:15:21.543907 1 cloud_provider_builder.go:90] Unknown cloud provider: openshift-machine-api

You could either pin the autoscaler image on cao (we'd need to keep both groups here https://github.com/openshift/cluster-autoscaler-operator/pull/35/files#diff-defb693cda2c7b43fb8c51ddc5cf70deL33) or just disable the deployment test as part of this PR, then re enable it after openshift/kubernetes-autoscaler#29 gets merged

@enxebre enxebre mentioned this pull request Feb 7, 2019
Merged
@frobware frobware mentioned this pull request Feb 7, 2019
Closed
@openshift-ci-robot openshift-ci-robot removed lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 7, 2019
enxebre
enxebre reviewed Feb 7, 2019
View reviewed changes
test/e2e/main.go Outdated
return err
}
glog.Info("PASS: ExpectClusterAutoscalerAvailable")
// TODO: Disabled temporarily
Copy link
Member

@enxebre enxebre Feb 7, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add some context on the TODO on why disabling?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good now.

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2019
bison
bison approved these changes Feb 7, 2019
View reviewed changes
Copy link
Contributor

@bison bison left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@enxebre
Copy link
Member

enxebre commented Feb 7, 2019

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2019
@openshift-merge-robot openshift-merge-robot merged commit ee1ccc7 into openshift:master Feb 7, 2019
@spangenberg spangenberg mentioned this pull request Feb 7, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frobware frobware frobware approved these changes

@enxebre enxebre enxebre left review comments

@bison bison bison approved these changes

@paulfantom paulfantom Awaiting requested review from paulfantom

Assignees

@bison bison

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@spangenberg @bison @frobware @enxebre @openshift-ci-robot @openshift-merge-robot