Bump to kubernetes-v1.18.0-beta.2 #116

marun · 2020-03-13T08:50:15Z

TODO:

move commits
code compiling
tests passing

https://docs.google.com/spreadsheets/d/10KYptJkDB1z8_RYCQVBYDjdTlRfyoXILMa0Fg8tnNlY/edit?ts=5e67286f#gid=646747504

…jq 'select(.Version!="v0.0.0")') > Godeps/Godeps.json

The tests need to be rewritten to be safe for concurrent use and for work in contended environments. Disabling the worst offenders and fixing reuse issues around the tests here. Origin-commit: b6281a54c84f20c2f0d35d6a44881e83b2e75227

openshift-ci-robot · 2020-03-13T08:51:49Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: marun
To complete the pull request process, please assign smarterclayton
You can assign the PR to them by writing /assign @smarterclayton in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS
staging/src/k8s.io/api/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

soltysh · 2020-03-13T14:12:20Z

A few comments for now:

Squash all:

UPSTREAM: <carry>: Expose a simple journald shim on the kubelet logs endpoint 
UPSTREAM: <carry>: Expose a simple journald shim on the kubelet logs endpoint 
UPSTREAM: <carry>: Make default journal format precise

together, it's all about exposing that journald through kubelet, so it's sufficient to have a single commit.

It would be reasonable to squash kcm related carries into a single one I mean these:

UPSTREAM: <carry>: GC doesn't ignore hpa and securitycontextconstraints 
UPSTREAM: <carry>: GC doesn't ignore apps/deployments 
UPSTREAM: <carry>: switch to use external API
UPSTREAM: <carry>: scheduling: Node selector aware DS controller should not process openshift-io/node-selector if scheduler.alpha.kubernetes.io/node-selector is set.
UPSTREAM: <carry>: kube-controller-manager: allow running bare kube-controller-manager

marun · 2020-03-13T22:20:05Z

A few comments for now:

Squash all:

UPSTREAM: <carry>: Expose a simple journald shim on the kubelet logs endpoint 
UPSTREAM: <carry>: Expose a simple journald shim on the kubelet logs endpoint 
UPSTREAM: <carry>: Make default journal format precise

Done

It would be reasonable to squash kcm related carries into a single one I mean these:

UPSTREAM: <carry>: GC doesn't ignore hpa and securitycontextconstraints 
UPSTREAM: <carry>: GC doesn't ignore apps/deployments 
UPSTREAM: <carry>: switch to use external API
UPSTREAM: <carry>: scheduling: Node selector aware DS controller should not process openshift-io/node-selector if scheduler.alpha.kubernetes.io/node-selector is set.
UPSTREAM: <carry>: kube-controller-manager: allow running bare kube-controller-manager

Done. Are there any more that kcm carries that should be squashed? i.e.

UPSTREAM: <carry>: allow running bare kube-controller-manager
UPSTREAM: <carry>: kube-controller-manager: exclude some origin resources from quota
UPSTREAM: <carry>: kube-controller-manager: add service serving cert signer to token controller

marun · 2020-03-16T06:50:22Z

Unit tests are passing locally. Commits past 7a4ff00 are new fixes rather than picks. Is make verify supposed to be passing?

staging/src/k8s.io/apiserver/pkg/server/options/authorization.go

pkg/controller/service/controller.go

staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/apiserver.go

staging/src/k8s.io/legacy-cloud-providers/openstack/metadata.go

staging/src/k8s.io/legacy-cloud-providers/openstack/BUILD

pkg/controller/serviceaccount/tokens_controller.go

staging/src/k8s.io/code-generator/cmd/client-gen/generators/client_generator.go

staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/patch.go

staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go

pkg/quota/v1/install/patch_ignoredresources.go

sttts · 2020-03-16T12:09:25Z

pkg/quota/v1/install/patch_ignoredresources.go

+		{Group: "authorization.openshift.io", Resource: "clusterroles"}:               {},
+		{Group: "authorization.openshift.io", Resource: "clusterrolebindings"}:        {},
+		{Group: "apiregistration.k8s.io", Resource: "apiservices"}:                    {},
+		{Group: "apiextensions.k8s.io", Resource: "customresourcedefinitions"}:        {},


@deads2k why do we exclude apiservers and CRDs?

@deads2k why do we exclude apiservers and CRDs?

I have no memory. They are cluster scoped and not covered by quota. Should be removeable.

As per a slack conversation, we can drop cluster-scoped resources from this list.

But trimming the file is deferred till after this lands to not delay things further.

cmd/kube-controller-manager/app/controllermanager.go

staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go

sttts · 2020-03-16T16:08:04Z

staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go

-	// Get Volume
-	volume, err := os.getVolume(pv.Spec.Cinder.VolumeID)
+	// Get metadata
+	md, err := getMetadata(os.metadataOpts.SearchOrder)


@Fedosin why is this a carry and not upstreamed?

Given that @Fedosin appears to be on vacation, I think this concern can be deferred for now. I've prompted him on slack so hopefully he answers when he returns.

Hi! I did this because there was a requirement to read cloud credentials from a secret. The upstream version doesn't support it, as you know.
As I remember, there was an issue with kube-apiserver to get a volume info, so I implemented this workaround.

I believe we can revert it now and go back to the upstream implementation.

openshift-kube-apiserver/configdefault/admission_config.go

openshift-kube-apiserver/admission/network/externalipranger/externalip_admission_test.go

… new kubelet delay in pod deletion

Origin-commit: a1d5a1201d5fb4616187cd009f126f5fe7fa0787

Origin-commit: beac12d815b4099cfd4f4d953da4b8789054be51

…ofile Origin-commit: 84ba7fc304870a30df7136da14bccb4d5232f075

Origin-commit: 4498bb4de03ff3a910fed10bed337ba2fcdf321d

…en checking custom columns (kubectl)

This line is not necessary for our test usage and should not be an issue in OpenShift (openshift-tests already verifies this correctly).

…y running test OpenShift uses these function before any test is run and they cause NPE

Origin-commit: 131dbb4770bb3bed0c07d2a6ca0cbe4cba2556bb

This line makes the upgrade log output unreadable and provides no value during the set of tests it's used in: ``` Jan 12 20:49:25.628: INFO: cluster upgrade is Progressing: Working towards registry.svc.ci.openshift.org/ci-op-jbtg7jjb/release@sha256:144e73d125cce620bdf099be9a85225ade489a95622a70075d264ea3ff79219c: downloading update Jan 12 20:49:26.692: INFO: Poke("http://a74e3476115ce4d2d817a1e5ea608dad-802917831.us-east-1.elb.amazonaws.com:80/echo?msg=hello"): success Jan 12 20:49:28.727: INFO: Poke("http://a74e3476115ce4d2d817a1e5ea608dad-802917831.us-east-1.elb.amazonaws.com:80/echo?msg=hello"): success ``` Origin-commit: 1cdf04c0e15b79fad3e3a6ba896ed2bb3df42b78

…o function Origin-commit: 0d7fb2d769d631054ec9ac0721aee623c96c1001

Origin-commit: cb0b340d0e68c9524fa7fd6277f571b6aa68bf86

The following packages have tests that exceed the default 120s timeout: k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler - The tests in this package collectively take longer than 120s. k8s.io/kubernetes/pkg/volume/csi - One of the unit tests has to wait 2 minutes for a timeout to validate its failure condition.

…nknown labels

marun · 2020-03-17T18:18:08Z

Updated to remove OWNERS files, which were all from UPSTREAM: <carry>: openshift-kube-apiserver: add kube-apiserver patches.

ironcladlou · 2020-03-17T19:08:41Z

I'd like to help review this, but as someone who hasn't done a rebase in literally years, I don't really know where to begin. How does one evaluate whether the proposed tree is in sync with the upstream tag?

What procedure would you recommend to someone looking at this "from the outside" to be of any assistance? Apologies if there's some guide out there I'm missing. docs/rebase.md didn't really help.

openshift-ci-robot · 2020-03-17T19:15:29Z

@marun: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/unit	`2dceee3`	link	`/test unit`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

marun · 2020-03-17T20:18:49Z

Closing in favor of #118, which picks the same commits against rc.1

marun and others added 2 commits March 12, 2020 00:44

go run k8s.io/publishing-bot/cmd/godeps-gen <(go list -m -json all | …

0b2a3e1

…jq 'select(.Version!="v0.0.0")') > Godeps/Godeps.json

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 13, 2020

openshift-ci-robot added the area/dependency Issues or PRs related to dependency changes label Mar 13, 2020

openshift-ci-robot requested review from damemi and danwinship March 13, 2020 08:53

openshift-ci-robot added the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Mar 13, 2020

marun force-pushed the origin-4.5-kubernetes-v1.18.0-beta.2 branch 2 times, most recently from e420c8c to 6992c9a Compare March 16, 2020 06:40