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

[reissue] kubeadm: Split out ClusterConfiguration from InitConfiguration #67441

Merged
merged 2 commits into from Aug 22, 2018

Conversation

@rosti
Copy link
Member

rosti commented Aug 15, 2018

As @luxas is not able to take care of #66219, I am reissuing the same change here. There are a few minor things added by me:

  • The original PR is rebased on latest master.
  • Some broken tests were fixed.
  • Some TODOs were added.
  • Run update-bazel and update-gofmt

Below is the text of the original PR by Lucas.


What this PR does / why we need it:

Splits MasterConfiguration to InitConfiguration and ClusterConfiguration as outlined in the kubeadm Config KEP. InitConfiguration holds init-only information, and ClusterConfiguration holds cluster-wide information. In the internal representation InitConfiguration wraps ClusterConfiguration as a field, but in serialized format they're different YAML documents.

Which issue(s) this PR fixes (optional, in fixes #(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
ref: kubernetes/kubeadm#911
Depends on:

Special notes for your reviewer:

Release note:

kubeadm: InitConfiguration now consists of two structs: InitConfiguration and ClusterConfiguration

@kubernetes/sig-cluster-lifecycle-pr-reviews

@rosti

This comment has been minimized.

Copy link
Member Author

rosti commented Aug 15, 2018

@rosti

This comment has been minimized.

Copy link
Member Author

rosti commented Aug 15, 2018

/assign @luxas

@neolit123

This comment has been minimized.

Copy link
Member

neolit123 commented Aug 15, 2018

thanks for doing this PR!
edit: we should probably close the original.

it needs a:

./hack/update-gofmt.sh
./hack/update-bazel.sh

but other than that i think we should merge ASAP and apply changes on top if needed.

@rosti rosti force-pushed the rosti:kubeadm_clusterconfig branch 2 times, most recently from 97dcee5 to d3e7de0 Aug 16, 2018

@rosti rosti referenced this pull request Aug 16, 2018

Merged

kubeadm: use ClusterConfiguration in images.go #67503

1 of 1 task complete
@fabriziopandini
Copy link
Contributor

fabriziopandini left a comment

@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

@neolit123 neolit123 referenced this pull request Aug 17, 2018

Closed

Tracking issue for "Config to v1beta1" #963

19 of 28 tasks complete

@rosti rosti force-pushed the rosti:kubeadm_clusterconfig branch from d3e7de0 to fc664de Aug 17, 2018

@chuckha

This comment has been minimized.

Copy link
Member

chuckha commented Aug 17, 2018

this code looks good to me. I'd rather get this merged ASAP as @neolit123 points out and fix anything that breaks before the release

@timothysc
Copy link
Member

timothysc left a comment

What's with all the TODOs? are we going to follow on or address here?

@fabriziopandini - I've been out for too long so I've lost state.

@@ -16,7 +16,12 @@ limitations under the License.

package fuzzer

import (
// TODO: Fuzzing rouudtrip tests are currently disabled in the v1.12 cycle due to the
// v1alpha2 -> v1alpha3 migration. As the ComponentConfigs were embedded in the structs

This comment has been minimized.

Copy link
@timothysc

timothysc Aug 20, 2018

Member

Can you open an issue here?

API: kubeadmapiv1alpha3.API{AdvertiseAddress: "1.2.3.4"},
BootstrapTokens: []kubeadmapiv1alpha3.BootstrapToken{sillyToken},
KubernetesVersion: fmt.Sprintf("v1.%d.0", constants.MinimumControlPlaneVersion.Minor()+1),
// TODO: Probably move to getDefaultedClusterConfig?

This comment has been minimized.

Copy link
@timothysc

This comment has been minimized.

Copy link
@rosti

rosti Aug 22, 2018

Author Member

I think, this one was a comment in the old PR. We decided to mark all unaddressed comments in the original PR as TODOs in the new one.

@fabriziopandini

This comment has been minimized.

Copy link
Contributor

fabriziopandini commented Aug 21, 2018

@timothysc this PR is already too big + it blocking other changes, so better to follow up on TODOs with separated PRs.
@rosti already created two of them, but IMO it is better to focus on completing users facing changes now while tackling TODOs only afterwards

@timothysc

This comment has been minimized.

Copy link
Member

timothysc commented Aug 21, 2018

@rosti - needs a rebase

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Aug 21, 2018

luxas added some commits Aug 10, 2018

kubeadm: Split out ClusterConfiguration from InitConfiguration
Trivial rebasement, fixed some broken tests,
and inserted some TODOs: Rostislav M. Georgiev <rostislavg@vmware.com>

@rosti rosti force-pushed the rosti:kubeadm_clusterconfig branch from fc664de to 0fde05a Aug 22, 2018

@k8s-ci-robot k8s-ci-robot removed the lgtm label Aug 22, 2018

@rosti

This comment has been minimized.

Copy link
Member Author

rosti commented Aug 22, 2018

Rebased the PR.

@fabriziopandini

This comment has been minimized.

Copy link
Contributor

fabriziopandini commented Aug 22, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Aug 22, 2018

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Aug 22, 2018

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

@timothysc

This comment has been minimized.

Copy link
Member

timothysc commented Aug 22, 2018

/lgtm

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Aug 22, 2018

[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

@k8s-github-robot

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Aug 22, 2018

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 51605c3 into kubernetes:master Aug 22, 2018

17 of 18 checks passed

Submit Queue Required Github CI test is not green: pull-kubernetes-kubemark-e2e-gce-big
Details
cla/linuxfoundation luxas authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-e2e-kubeadm-gce Skipped
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details

hh pushed a commit to ii/kubernetes that referenced this pull request Aug 24, 2018

Kubernetes Submit Queue
Merge pull request kubernetes#67503 from rosti/kubeadm_clusterconfig_…
…images

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 <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

 kubeadm: use ClusterConfiguration in images.go

**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:
- [X] kubernetes#67441

**Release note**:

```release-note
NONE
```

@rosti rosti deleted the rosti:kubeadm_clusterconfig branch Nov 22, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.