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.

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

kubeadm: use ClusterConfiguration in images.go #67503

Merged

Conversation

rosti
Copy link
Contributor

@rosti rosti commented Aug 16, 2018

What this PR does / why we need it:

This PR is the first in a series, targeting the replacement of InitConfiguration with ClusterConfiguration, when the former is not needed. Please, review only the last commit.

Replace the unnecessary use of InitConfiguration in images.go with ClusterConfiguration. This changes the interfaces of the following functions:

  • GetKubeControlPlaneImage
  • GetEtcdImage
  • GetAllImages

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
refs kubernetes/kubeadm#963

Special notes for your reviewer:

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/area kubeadm
/kind enhancement
/assign @luxas
/assign @timothysc
/assign @fabriziopandini

Depends on:

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Aug 16, 2018
@k8s-ci-robot k8s-ci-robot added the sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. label Aug 16, 2018
@k8s-ci-robot k8s-ci-robot added area/kubeadm size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 16, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 16, 2018
Copy link
Member

@fabriziopandini fabriziopandini left a comment

Choose a reason for hiding this comment

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

@rosti +100 for jumping in and helping on @luxas work!

/approve

Being this so big, I kindly ask @timothysc or @liztio (or *) to give a second pass + final lgtm

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 16, 2018
@chuckha
Copy link
Contributor

chuckha commented Aug 17, 2018

the last commit here looks good, just waiting on the parent PR to merge

@rosti rosti force-pushed the kubeadm_clusterconfig_images branch from b5ae84b to bde91ee Compare August 17, 2018 14:02
@rosti rosti force-pushed the kubeadm_clusterconfig_images branch 2 times, most recently from acdc496 to f1e8d8e Compare August 22, 2018 09:05
@timothysc
Copy link
Member

/hold

I'm just going to put a hold on this one till the other PRs clear out. We have a bunch of large PRs in flight in the merge queue. I have no idea why they are taking so long, but I will check back on this one tomorrow.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 22, 2018
Replace the unnecessary use of InitConfiguration in images.go with
ClusterConfiguration. This changes the interfaces of the following functions:

- GetKubeControlPlaneImage
- GetEtcdImage
- GetAllImages

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
@rosti rosti force-pushed the kubeadm_clusterconfig_images branch from f1e8d8e to de39f49 Compare August 23, 2018 14:38
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 23, 2018
@rosti
Copy link
Contributor Author

rosti commented Aug 23, 2018

/test pull-kubernetes-e2e-gce

@timothysc timothysc removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 24, 2018
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 24, 2018
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

I'm very frustrated by stuff like this. I feel like we need to abstract our internal data handling, or perhaps when we reach beta this will be less of an issue...

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini, rosti, timothysc

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

@rosti
Copy link
Contributor Author

rosti commented Aug 24, 2018

@timothysc Thanks for the approval.

I'm very frustrated by stuff like this. I feel like we need to abstract our internal data handling, or perhaps when we reach beta this will be less of an issue...

I am too, but I view this more like the "necessary evil". Abstractions can be cumbersome sometimes and I think that we should first try reaching beta this way (before going into abstractions).

@timothysc
Copy link
Member

/test pull-kubernetes-e2e-gce

@timothysc
Copy link
Member

/test pull-kubernetes-e2e-kops-aws

@timothysc
Copy link
Member

/test pull-kubernetes-e2e-kops-aws

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 67776, 67503, 67679, 67786, 67830). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit de80c82 into kubernetes:master Aug 24, 2018
@rosti rosti deleted the kubeadm_clusterconfig_images branch November 22, 2018 15:26
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. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants