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

1.22.1 rebase #914

Closed
wants to merge 162 commits into from
Closed

1.22.1 rebase #914

wants to merge 162 commits into from

Conversation

damemi
Copy link

@damemi damemi commented Aug 27, 2021

Replacing #913

This was made following the steps in https://github.com/openshift/kubernetes/blob/master/REBASE.openshift.md

Commits link: https://docs.google.com/spreadsheets/d/1SNumGZ-ojXyohqwW3s00ODqOguWPwFxX/edit?usp=sharing&ouid=108595573157330081526&rtpof=true&sd=true

Steps:

$ git fetch upstream
$ git fetch openshift
$ git checkout -b release-1.22.1 v1.22.1
$ git merge -s ours openshift/master
$ $ git log $( git merge-base openshift/master v1.22.1 )..openshift/master --ancestry-path --reverse --no-merges --pretty='tformat:%x09%h%x09%x09%x09%s%x09https://github.com/openshift/kubernetes/commit/%h?w=1' | grep -E $'\t''UPSTREAM: .*'$'\t' | sed -E 's~UPSTREAM: ([0-9]+)(:.*)~UPSTREAM: \1\2\thttps://github.com/kubernetes/kubernetes/pull/\1~' >> ~/Documents/v1.22.1.tsv
<<< check for commits that have merged to 1.22.1 upstream tag >>>
$ git cp ...
<<< resolve conflicts>>>

then when running the make update command ( docker run -it --rm -v $( pwd ):/go/k8s.io/kubernetes:Z --workdir=/go/k8s.io/kubernetes registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.16-openshift-4.8 make update OS_RUN_WITHOUT_DOCKER=yes) I get the following failure:

$ docker run -it --rm -v $( pwd ):/go/k8s.io/kubernetes:Z --workdir=/go/k8s.io/kubernetes registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.16-openshift-4.8 make update OS_RUN_WITHOUT_DOCKER=yes
+++ [0827 18:22:05] Building go targets for linux/amd64:
    ./vendor/k8s.io/code-generator/cmd/prerelease-lifecycle-gen
Generating prerelease lifecycle code for 27 targets
+++ [0827 18:22:28] Building go targets for linux/amd64:
    ./vendor/k8s.io/code-generator/cmd/deepcopy-gen
Generating deepcopy code for 246 targets
+++ [0827 18:23:04] Building go targets for linux/amd64:
    ./vendor/k8s.io/code-generator/cmd/defaulter-gen
Generating defaulter code for 93 targets
+++ [0827 18:23:35] Building go targets for linux/amd64:
    ./vendor/k8s.io/code-generator/cmd/conversion-gen
Generating conversion code for 134 targets
+++ [0827 18:24:25] Building go targets for linux/amd64:
    ./vendor/k8s.io/kube-openapi/cmd/openapi-gen
Generating openapi code for KUBE
Generating openapi code for AGGREGATOR
Generating openapi code for APIEXTENSIONS
Generating openapi code for CODEGEN
Generating openapi code for SAMPLEAPISERVER
Running in silent mode, run with SILENT=false if you want to see script logs.
Running in short-circuit mode; run with FORCE_ALL=true to force all scripts to run.
Running update-test-annotations
../../vendor/k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor/patch_clusteroperators.go:8:2: cannot find package "." in:
	/go/k8s.io/kubernetes/vendor/github.com/openshift/api/config/v1
../../pkg/controller/daemon/patch_nodeselector.go:14:2: cannot find package "." in:
	/go/k8s.io/kubernetes/vendor/github.com/openshift/api/project/v1
../../cmd/kubelet/app/patch_auth.go:4:2: cannot find package "." in:
	/go/k8s.io/kubernetes/vendor/github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer
openshift-hack/e2e/kube_e2e_test.go:3: running "go": exit status 1
Running update-test-annotations FAILED
make: *** [Makefile:158: update] Error 1

saschagrunert and others added 30 commits July 21, 2021 17:30
This assumes that SSH via bastion works if the `KUBE_SSH_BASTION`
environment variable is set, which is the case for
`pull-kubernetes-e2e-gce-correctness`.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
…rry-pick-of-#103806-upstream-release-1.22

Automated cherry pick of kubernetes#103806: Fetch metrics from controller manager & scheduler no run once
use deployment based on upstream manifest

- add liveness and readiness probes
- use kubelet port secure port

https://github.com/kubernetes-sigs/metrics-server/blob/release-0.4/manifests/base/deployment.yaml#L32-L38
That PR fixes --audit-log-path=- support.
It now logs to stdout as in 1.21.
The commands used were (roughly):

	hack/pin-dependency.sh github.com/opencontainers/runc v1.0.1
	hack/lint-dependencies.sh
	# Follow its recommendations.
	hack/pin-dependency.sh github.com/cilium/ebpf v0.6.2
	hack/pin-dependency.sh github.com/opencontainers/selinux v1.8.2
	hack/pin-dependency.sh github.com/sirupsen/logrus v1.8.1
	# Recheck.
	hack/lint-dependencies.sh
	GO111MODULE=on go mod edit -dropreplace github.com/willf/bitset
	hack/update-vendor.sh
	# Recheck.
	hack/lint-dependencies.sh
	hack/update-internal-modules.sh
	# Recheck.
	hack/lint-dependencies.sh

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since runc 1.0.0 it is now sufficient to have SkipDevices: true.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
…-of-#103713-upstream-release-1.22

Automated cherry pick of kubernetes#103713: cluster: fix CI metrics-server deployment
…cherry-pick

Do not try to create an audit log file named "-"
…pick-of-#103743-upstream-release-1.22

Automated cherry pick of kubernetes#103743: vendor: bump runc to 1.0.1
Includes a fix to prevent the agent writing to a closed channel.
…rry-pick-of-#103815-upstream-release-1.22

Automated cherry pick of kubernetes#103815: Fix SIG Node SSH e2e test
…ck-of-#103823-upstream-release-1.22

Automated cherry pick of kubernetes#103823: Make CSR cleaner tolerate objects with invalid
…ck-of-#103831-upstream-release-1.22

Automated cherry pick of kubernetes#103831: disable aufs module
…ick-of-#103895-upstream-release-1.22

Automated cherry pick of kubernetes#103895: Update to using apiserver-network-proxy v1.22
This PR fixes two distruptive subpath test failures.

1. disable --check-volume-lifecycle check
2. skip hostpath driver tests on graceful pod deletion test too.

See details in
kubernetes#103651 (comment)

Change-Id: Ibecd051be865feea5f2a92d22ade848367400939
…-pick-of-#103865-upstream-release-1.22

Automated cherry pick of kubernetes#103865: Add e2e testing manifest bundle to e2e_node test suite
…-pick-of-#103439-upstream-release-1.22

Automated cherry pick of kubernetes#103439: fix azure disk translation issue
…ick-of-#103937-upstream-release-1.22

Automated cherry pick of kubernetes#103937: Fix disruptive subPath test failures
…-pick-of-#103827-upstream-release-1.22

Automated cherry pick of kubernetes#103827: Remove conformance status from a sysctl test and relabel
…pick-of-#104033-upstream-release-1.22

Automated cherry pick of kubernetes#104033: Revert "Add a namespace label to admission metrics and expand
deads2k and others added 14 commits August 27, 2021 13:51
UPSTREAM: <carry>: 1.21 alpha & other tests disablement

UPSTREAM: <carry>: Enable GenerciEphemeralVolume tests

UPSTREAM: <carry>: Re-enable [Feature:NetworkPolicy] tests which were wrongly disabled in rebase

UPSTREAM: <carry>: Reenable NetworkPolicy test

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>

UPSTREAM: <carry>: Conformance tests (sysctls) should be run

We have to run this test for conformance, and the tests pass. Reenable
this block which has been disabled for 2 releases (but appears to work fine).

UPSTREAM: <carry>: Don't force-disable IPv6, dual-stack, and SCTP tests

Instead, openshift-tests will enable or disable them depending on
cluster configuration.

UPSTREAM: <carry>: update Multi-AZ Cluster Volumes test name

This test was renamed upstream in
kubernetes@006dc74
The tag extraction from GOFLAGS doesn't do anything if -tags is not
present in GOFLAGS.  Not only does that mean non-sensical tags are
passed, but because GOFLAGS is a space-separated variable, the build
will fail because the build flags because -tags must be comma-separated.

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
Introduce a new server run option startup-send-retry-after-until-ready

If true, incoming request(s) will be rejected with a '429' status
code and a 'Retry-After' response header until the apiserver has
initialized.
This option ensures that the system stays consistent even when
requests arrive at the server before it has been initialized.

The default value is set to 'false' to maintain current behavior.
During a bump to k8 ver. 1.22.0, networking
tests were disabled to accomplish the bump.
This disabled netpol and older network tests.
Netpol tests will be enabled in a following
PR and therefore only partially fixes BZ.

This commit partially fixes bug 1986307.
https://bugzilla.redhat.com/show_bug.cgi?id=1986307

Signed-off-by: Martin Kennelly <mkennell@redhat.com>
…getting false positives until the server becomes ready

the availability checks depend on fully initialized SDN
OpenShift carries a few reachability checks that affect /readyz protocol
we skip posting failures to avoid getting false positives until the server becomes ready
@openshift-ci-robot openshift-ci-robot added the backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. label Aug 27, 2021
@openshift-ci-robot
Copy link

@damemi: the contents of this pull request could not be automatically validated.

The following commits are valid:

The following commits could not be validated and must be approved by a top-level approver:

@openshift-ci openshift-ci bot requested review from mfojtik and sttts August 27, 2021 18:38
Copy link
Author

@damemi damemi left a comment

Choose a reason for hiding this comment

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

@openshift-ci openshift-ci bot added the vendor-update Touching vendor dir or related files label Aug 27, 2021
@openshift-ci
Copy link

openshift-ci bot commented Aug 27, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: damemi
To complete the pull request process, please assign sttts after the PR has been reviewed.
You can assign the PR to them by writing /assign @sttts 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:

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

@openshift-ci
Copy link

openshift-ci bot commented Aug 27, 2021

@damemi: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/prow/unit 99da458 link /test unit
ci/prow/verify-commits 99da458 link /test verify-commits
ci/prow/integration 99da458 link /test integration
ci/prow/artifacts 99da458 link /test artifacts
ci/prow/e2e-agnostic-cmd 99da458 link /test e2e-agnostic-cmd
ci/prow/e2e-aws-serial 99da458 link /test e2e-aws-serial
ci/prow/e2e-gcp-upgrade 99da458 link /test e2e-gcp-upgrade
ci/prow/e2e-aws-csi 99da458 link /test e2e-aws-csi
ci/prow/e2e-azure-upgrade 99da458 link /test e2e-azure-upgrade
ci/prow/e2e-aws-downgrade 99da458 link /test e2e-aws-downgrade
ci/prow/images 99da458 link /test images
ci/prow/k8s-e2e-gcp 99da458 link /test k8s-e2e-gcp
ci/prow/e2e-aws-upgrade 99da458 link /test e2e-aws-upgrade
ci/prow/e2e-aws-fips 99da458 link /test e2e-aws-fips
ci/prow/e2e-gcp 99da458 link /test e2e-gcp
ci/prow/k8s-e2e-conformance-aws 99da458 link /test k8s-e2e-conformance-aws
ci/prow/k8s-e2e-gcp-serial 99da458 link /test k8s-e2e-gcp-serial
ci/prow/verify 99da458 link /test verify

Full PR test history. Your PR dashboard.

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.

@openshift-ci
Copy link

openshift-ci bot commented Aug 29, 2021

@damemi: PR needs rebase.

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.

@openshift-ci openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 29, 2021
@damemi
Copy link
Author

damemi commented Aug 30, 2021

/close

@openshift-ci
Copy link

openshift-ci bot commented Aug 30, 2021

@damemi: Closed this PR.

In response to this:

/close

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.

@openshift-ci openshift-ci bot closed this Aug 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backports/unvalidated-commits Indicates that not all commits come to merged upstream PRs. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet