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

✨Upgrade CoreDNS image info during KCP reconcile #2574

Merged
merged 1 commit into from
Mar 10, 2020
Merged

✨Upgrade CoreDNS image info during KCP reconcile #2574

merged 1 commit into from
Mar 10, 2020

Conversation

wfernandes
Copy link
Contributor

What this PR does / why we need it:
This PR does what the corresponding issues asks 🙂

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2545

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 6, 2020
@wfernandes
Copy link
Contributor Author

/assign @ncdc @vincepri

@wfernandes wfernandes force-pushed the kcp-coredns-upgrades branch 2 times, most recently from 431def1 to eb7b1f1 Compare March 6, 2020 19:17
@ncdc
Copy link
Contributor

ncdc commented Mar 6, 2020

Did an initial review. No additional comments beyond what Vince already wrote. Looking forward to seeing the Corefile migration code!

@ncdc ncdc mentioned this pull request Mar 6, 2020
Merged
sethp-nr
sethp-nr reviewed Mar 6, 2020
View reviewed changes
controlplane/kubeadm/internal/kubeadm_config_map_test.go
cm: &corev1.ConfigMap{Data: map[string]string{}},
expectErr: true,
},
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we add a test for "does not set imageRepository or imageTag in the config map if they aren't specified in the KubeadmConfig"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean that if the imageRepo and imageTag are not defined in the ClusterConfig, then don't set them?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah – I assume that's enough to signal to kubeadm not to muck with the CoreDNS deployment (which is what I'm really after).

@vincepri
Copy link
Member

vincepri commented Mar 6, 2020

/milestone v0.3.0

@k8s-ci-robot k8s-ci-robot added this to the v0.3.0 milestone Mar 6, 2020
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 7, 2020
@wfernandes wfernandes force-pushed the kcp-coredns-upgrades branch 2 times, most recently from 72562cc to 1bdac44 Compare March 7, 2020 20:01
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 8, 2020
@rajansandeep
Copy link

/cc

@k8s-ci-robot
Copy link
Contributor

@rajansandeep: GitHub didn't allow me to request PR reviews from the following users: rajansandeep.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

vincepri
vincepri reviewed Mar 8, 2020
View reviewed changes
controlplane/kubeadm/internal/workload_cluster.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster.go Outdated Show resolved Hide resolved
controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go Outdated Show resolved Hide resolved
controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go Outdated Show resolved Hide resolved
controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster.go Outdated Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
detiber
detiber reviewed Mar 9, 2020
View reviewed changes
controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/kubeadm_config_map.go Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
@wfernandes wfernandes mentioned this pull request Mar 9, 2020
Closed
@vincepri
Copy link
Member

Hey folks, we took some time this afternoon to refactor code around and make sure to double-check the logic. I resolved most of the earlier comments, if you can all do another pass that'd be great. We'll need to do an e2e test pass before this can be merged

ncdc
ncdc reviewed Mar 10, 2020
View reviewed changes
Copy link
Contributor

@ncdc ncdc left a comment

Choose a reason for hiding this comment

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

I'm still a bit under the weather, so I think I need to defer to @detiber and @vincepri and others to finish this out, but I had a few comments to add

controlplane/kubeadm/internal/kubeadm_config_map.go Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster_coredns.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster_coredns.go Outdated Show resolved Hide resolved
controlplane/kubeadm/internal/workload_cluster_coredns.go Outdated Show resolved Hide resolved
@vincepri vincepri force-pushed the kcp-coredns-upgrades branch 4 times, most recently from ac5a2eb to b8464ae Compare March 10, 2020 15:03
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 10, 2020
@vincepri vincepri force-pushed the kcp-coredns-upgrades branch from b8464ae to 9b2d4bb Compare March 10, 2020 15:10
@detiber
Copy link
Member

detiber commented Mar 10, 2020

Current changes lgtm

@wfernandes wfernandes changed the title [WIP] ✨Upgrade CoreDNS image info during KCP reconcile ✨Upgrade CoreDNS image info during KCP reconcile Mar 10, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 10, 2020
@vincepri
Copy link
Member

@detiber @ncdc This should be good to go I think

@detiber
Copy link
Member

detiber commented Mar 10, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2020
@vincepri vincepri force-pushed the kcp-coredns-upgrades branch from 9b2d4bb to af66cea Compare March 10, 2020 16:59
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2020
@vincepri
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri, wfernandes

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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 10, 2020
@vincepri
Copy link
Member

@detiber need another 👀

@detiber
Copy link
Member

detiber commented Mar 10, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2020
@k8s-ci-robot k8s-ci-robot merged commit b0638fa into kubernetes-sigs:master Mar 10, 2020
@wfernandes wfernandes deleted the kcp-coredns-upgrades branch April 6, 2020 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncdc ncdc ncdc left review comments

@detiber detiber detiber left review comments

@vincepri vincepri vincepri left review comments

@rajansandeep rajansandeep rajansandeep left review comments

@sethp-nr sethp-nr sethp-nr left review comments

@sedefsavas sedefsavas sedefsavas left review comments

@CecileRobertMichon CecileRobertMichon Awaiting requested review from CecileRobertMichon

Assignees

@ncdc ncdc

@detiber detiber

@vincepri vincepri

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v0.3.0
Development

Successfully merging this pull request may close these issues.

KCP: Handle CoreDNS upgrades
8 participants
@wfernandes @ncdc @vincepri @rajansandeep @k8s-ci-robot @detiber @sethp-nr @sedefsavas