Skip to content

Bump k8s to 1.14.1 #42

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.

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

Conversation

ingvagabund
Copy link
Member

  • bump k8s to v1.14.1
  • Manager.GetRecorder renamed to Manager.GetEventRecorderFor
  • replace "-" with "_" in controller names (the name is used to prefix prometheus metric name which refuses "-" in metric name, see ⚠ Bump Kubernetes version to 1.14 kubernetes-sigs/controller-runtime#376)
    • machineset-controller -> machineset_controller
    • machinedeployment-controller -> machinedeployment_controller
    • cluster-controller -> cluster_controller
  • replace order of arguments in Client.List (runtime object switched with list options, list options converted to a function)
  • schema moved from "sigs.k8s.io/controller-runtime/pkg/runtime/schema" under "sigs.k8s.io/controller-runtime/pkg/scheme"
  • "k8s.io/client-go/util/integer" moved under "k8s.io/utils/integer"

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 22, 2019
@ingvagabund
Copy link
Member Author

/refresh
/retest

@ingvagabund ingvagabund reopened this May 22, 2019
@ingvagabund
Copy link
Member Author

/retest

@ingvagabund ingvagabund force-pushed the bump-k8s-to-1.14.1 branch from 415c2ac to 69d5683 Compare May 22, 2019 20:29
@@ -61,7 +61,7 @@ func AddWithActuator(mgr manager.Manager, actuator Actuator) error {
func newReconciler(mgr manager.Manager, actuator Actuator) reconcile.Reconciler {
r := &ReconcileMachine{
Client: mgr.GetClient(),
eventRecorder: mgr.GetRecorder("machine-controller"),
eventRecorder: mgr.GetEventRecorderFor("machine-controller"),

Choose a reason for hiding this comment

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

Should this also be s/-/_?

Copy link
Member Author

Choose a reason for hiding this comment

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

I would still prefer to keep the event source to have - instead of _.

Requires to update controller-runtime to the latest which has just recently adopted k8s v1.14.
…o/controller-runtime@master

- Manager.GetRecorder renamed to Manager.GetEventRecorderFor
- replace "-" with "_" in controller names (the name is used to prefix prometheus metric name which refuses "-" in metric name)
  - machineset-controller -> machineset_controller
  - machinedeployment-controller -> machinedeployment_controller
  - cluster-controller -> cluster_controller
- replace order of arguments in Client.List (runtime object switched with list options, list options converted to a function)
- schema moved from "sigs.k8s.io/controller-runtime/pkg/runtime/schema" under "sigs.k8s.io/controller-runtime/pkg/scheme"
- "k8s.io/client-go/util/integer" moved under "k8s.io/utils/integer"
@ingvagabund ingvagabund force-pushed the bump-k8s-to-1.14.1 branch from 69d5683 to 73386ff Compare May 24, 2019 11:44
@frobware
Copy link

/approve

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: frobware

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 May 24, 2019
@frobware
Copy link

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 24, 2019
@openshift-merge-robot openshift-merge-robot merged commit e911af7 into openshift:openshift-4.2-cluster-api-0.1.0 May 24, 2019
@ingvagabund ingvagabund deleted the bump-k8s-to-1.14.1 branch May 24, 2019 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants