build(deps): bump coredns from 1.3.1 to 1.6.2 #2575

Ebaneck · 2020-05-27T09:26:47Z

Component:

'deps', 'build'

Context:

See: #2572

Summary:

Since the target branch runs K8s 1.16 and following the kubeadm standards as specified in the issue, let us bump the version of coredns to 1.6.2.
Following kubeadm standards for K8s 1.16 release as specified here: https://github.com/kubernetes/kubernetes/blob/release-1.16/cmd/kubeadm/app/phases/addons/dns/manifests.go#L306.

Acceptance criteria:

Closes: #2572

bert-e · 2020-05-27T09:26:49Z

Hello ebaneck,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2020-05-27T09:26:56Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/2572-update-coredns into
development/2.5
w/2.6/improvement/2572-update-coredns will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-05-27T09:26:58Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

NicolasT · 2020-05-27T09:27:39Z

Did you check for any differences in the Corefile as well?

Ebaneck · 2020-05-27T09:29:42Z

Did you check for any differences in the Corefile as well?

Nope, I was not aware. I am going to check now

Our current deployed version for coredns is `1.3.1` which seems to be very old. Since we plan a minor release, we should bump the version of Coredns to a recent release. Note: since this branch runs K8S 1.16, we bind the coredns version to `1.6.2` following same standards from kubeadm. Closes: #2572

bert-e · 2020-05-27T14:17:50Z

History mismatch

Merge commit #36f55cb5fd43d5236786a6b849b9d0d1e303dae7 on the integration branch
w/2.6/improvement/2572-update-coredns is merging a branch which is neither the current
branch improvement/2572-update-coredns nor the development branch
development/2.6.

It is likely due to a rebase of the branch improvement/2572-update-coredns and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

NicolasT · 2020-05-27T14:35:04Z

salt/metalk8s/kubernetes/coredns/deployed.sls

                health
                kubernetes {{ coredns.cluster_domain }} {{ coredns.reverse_cidrs }} {
                  pods insecure
-                  upstream
                  fallthrough in-addr.arpa ip6.arpa
                }
                prometheus :9153
-                proxy . /etc/resolv.conf
+                forward . /etc/resolv.conf
                cache 30
                loop
                reload
                loadbalance
+                ready
            }


It appears these changes are made using some tool? However, they're not (necessarily) in line with what kubeadm now deploys: https://github.com/kubernetes/kubernetes/blob/87473a5d27e52f8eb86575898cd6e6d8b8e881be/cmd/kubeadm/app/phases/addons/dns/manifests.go#L303 (note: this is master, should figure out what kubeadm does for the K8s release we want to ship).

Would make sense to re-run/update https://github.com/NicolasT/kubeadm-dry-run

Ideally here, it's a 2.5 branch and we ship K8S 1.16.8.

Cross-checking with the kubeadm specs from a corresponding release here: https://github.com/kubernetes/kubernetes/blob/release-1.16/cmd/kubeadm/app/phases/addons/dns/manifests.go#L306, It seems we are all good.

Note: One thing which the kubeadm Corefile adds is a TTL set to 30 seconds. I will add this and be done.

I would use the same content as what kubeadm deploys. Indeed, ready is in there, but at a different location in the file. Would be easier to 'review' if we just deploy the exact same thing.

Furthermore, the RBAC resources may need to be validated as well?

Yeah, I followed same placement as that of kubeadm

all good with RBAC definitions

Would make sense to re-run/update https://github.com/NicolasT/kubeadm-dry-run

Definitely, even make it part of our procedure for updating K8s dependencies. Could we somehow use this as a tool for rendering our formulas, just as we do for Helm?
Also, in the future I think it'd make sense to use the kubeadm Operator (once it is implemented) directly in the product (would make it much easier to maintain).

Not convinced about the latter. Adding another tool which, next to Salt, does things on hosts will result in a messy situation where we no longer know what does what.

Since we are updating coredns from 1.3.1 to 1.6.2, we need to update the Corefile to remove deprecated plugins. Given that we follow kubeadm standards, the Corefile is updated using the following specifification; ``` https://github.com/kubernetes/kubernetes/blob/release-1.16/cmd/kubeadm/app/phases/addons/dns/manifests.go#L306 ```

Ebaneck · 2020-05-27T16:38:42Z

/reset

bert-e · 2020-05-27T16:38:49Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2020-05-27T16:38:58Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/2572-update-coredns into
development/2.5
w/2.6/improvement/2572-update-coredns will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-05-27T16:38:59Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

Ebaneck · 2020-05-28T08:36:54Z

Hold until after release!

bert-e · 2020-07-06T10:41:19Z

Branches have diverged

This pull request's source branch improvement/2572-update-coredns has diverged from
development/2.5 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

Merge origin/development/2.5 into improvement/2572-update-coredns
Rebase improvement/2572-update-coredns onto origin/development/2.5

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

…t/2572-update-coredns

bert-e · 2020-07-06T10:53:56Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

Ebaneck · 2020-07-06T13:30:31Z

/approve

bert-e · 2020-07-06T13:30:39Z

Build failed

The build for commit did not succeed in branch improvement/2572-update-coredns.

The following options are set: approve

bert-e · 2020-07-07T07:26:30Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.5
✔️ development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2020-07-07T08:20:43Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.5
✔️ development/2.6

The following branches have NOT changed:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

Please check the status of the associated issue None.

Goodbye ebaneck.

Ebaneck requested a review from a team May 27, 2020 09:26

Ebaneck marked this pull request as draft May 27, 2020 09:31

Ebaneck force-pushed the improvement/2572-update-coredns branch from 36f55cb to bbdc710 Compare May 27, 2020 14:17

NicolasT reviewed May 27, 2020

View reviewed changes

Ebaneck force-pushed the improvement/2572-update-coredns branch 2 times, most recently from 21fe95a to f1998d3 Compare May 27, 2020 16:10

Ebaneck marked this pull request as ready for review May 27, 2020 17:33

Ebaneck requested a review from NicolasT May 27, 2020 17:34

Ebaneck mentioned this pull request May 29, 2020

build(deps): bump coredns from 1.3.1 to 1.6.5 #2582

Merged

Ebaneck requested a review from gdemonet July 6, 2020 10:41

scality deleted a comment from gdemonet Jul 6, 2020

Merge remote-tracking branch 'origin/development/2.5' into improvemen…

c54bfb5

…t/2572-update-coredns

NicolasT approved these changes Jul 6, 2020

View reviewed changes

bert-e merged commit 1994fa3 into development/2.5 Jul 7, 2020

bert-e deleted the improvement/2572-update-coredns branch July 7, 2020 08:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(deps): bump coredns from 1.3.1 to 1.6.2 #2575

build(deps): bump coredns from 1.3.1 to 1.6.2 #2575

Ebaneck commented May 27, 2020 •

edited

Loading

bert-e commented May 27, 2020

bert-e commented May 27, 2020

bert-e commented May 27, 2020

NicolasT commented May 27, 2020

Ebaneck commented May 27, 2020

bert-e commented May 27, 2020

NicolasT May 27, 2020

Ebaneck May 27, 2020

NicolasT May 27, 2020

Ebaneck May 27, 2020

Ebaneck May 27, 2020 •

edited

Loading

gdemonet May 28, 2020

NicolasT May 28, 2020

Ebaneck commented May 27, 2020

bert-e commented May 27, 2020

bert-e commented May 27, 2020

bert-e commented May 27, 2020

Ebaneck commented May 28, 2020

bert-e commented Jul 6, 2020

bert-e commented Jul 6, 2020

Ebaneck commented Jul 6, 2020

bert-e commented Jul 6, 2020

bert-e commented Jul 7, 2020

bert-e commented Jul 7, 2020

build(deps): bump coredns from 1.3.1 to 1.6.2 #2575

build(deps): bump coredns from 1.3.1 to 1.6.2 #2575

Conversation

Ebaneck commented May 27, 2020 • edited Loading

bert-e commented May 27, 2020

Hello ebaneck,

bert-e commented May 27, 2020

Integration data created

bert-e commented May 27, 2020

Waiting for approval

NicolasT commented May 27, 2020

Ebaneck commented May 27, 2020

bert-e commented May 27, 2020

History mismatch

NicolasT May 27, 2020

Choose a reason for hiding this comment

Ebaneck May 27, 2020

Choose a reason for hiding this comment

NicolasT May 27, 2020

Choose a reason for hiding this comment

Ebaneck May 27, 2020

Choose a reason for hiding this comment

Ebaneck May 27, 2020 • edited Loading

Choose a reason for hiding this comment

gdemonet May 28, 2020

Choose a reason for hiding this comment

NicolasT May 28, 2020

Choose a reason for hiding this comment

Ebaneck commented May 27, 2020

bert-e commented May 27, 2020

Reset complete

bert-e commented May 27, 2020

Integration data created

bert-e commented May 27, 2020

Waiting for approval

Ebaneck commented May 28, 2020

bert-e commented Jul 6, 2020

Branches have diverged

bert-e commented Jul 6, 2020

Waiting for approval

Ebaneck commented Jul 6, 2020

bert-e commented Jul 6, 2020

Build failed

bert-e commented Jul 7, 2020

In the queue

bert-e commented Jul 7, 2020

Ebaneck commented May 27, 2020 •

edited

Loading

Ebaneck May 27, 2020 •

edited

Loading