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

Origin 4.0 kubernetes 1.12.4 #68

Conversation

soltysh
Copy link
Member

@soltysh soltysh commented Jan 11, 2019

This is 1.12.4 rebase. This includes the same cherry-picks as #67 and additionally all UPSTREAM patches from openshift/origin#21450

@openshift/sig-master

sjenning and others added 30 commits January 11, 2019 11:05
Origin-commit: 7331c6412a9ef1b23155d7fd928f4ddc6961a05b
Origin-commit: a5fade4cb1bb90919a356defa541a4f8ec7d5bb8
…m to allow multiple containers to union for swagger
:100644 100644 b32534e... 3e694fc... M	pkg/controller/serviceaccount/tokens_controller.go
Doesn't offer enough use, complicates creation and setup.
:000000 100644 0000000000... 748bed00fb... A	staging/src/k8s.io/apiserver/pkg/admission/patch.go
:100644 100644 dd1368d4dd... 0e422f990c... M	staging/src/k8s.io/apiserver/pkg/admission/plugins.go
:100644 100644 9fa52a0021... dab9e7233d... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 9be725d4e2... 65e2ed1670... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
:100644 100644 08e342ef56... 9218a1e185... M	staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go
:100644 100644 6dab988e52... 74b9cce53a... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 dd9ab0dcfe... fcaec9e519... M	staging/src/k8s.io/apiserver/pkg/server/routes/version.go
:100644 100644 4e0ce16e85... 68d79a7878... M	test/e2e/common/downwardapi_volume.go
If the service controller is processing a service that does not have type
LoadBalancer and does not have any external load balancer recorded in its
status, do not call the cloud provider to check for an associated load
balancer.

This commit fixes bug 1571940.

https://bugzilla.redhat.com/show_bug.cgi?id=1571940

Origin-commit: aaf46c42283d2cd2611474ad72a76c196f09d0d1
:100644 100644 c561ddb... 17ef5df... M	pkg/kubelet/server.go
juanvallejo and others added 23 commits January 11, 2019 11:17
Perform bootstrapping in the background when client cert rotation is on,
enabling static pods to start before a control plane is reachable.
…wards compatibility

Drop in some future release
Origin-commit: b8b5d25c10bf5b59df0026719602dcb1b39458df
The new metrics adapter is periodically failing, causing e2e tests to
fail because they get a 500 trying to list podmetrics/nodemetrics.

Ignore those resources for now.

https://openshift-gce-devel.appspot.com/build/origin-ci-test/pr-logs/pull/openshift_cluster-monitoring-operator/174/pull-ci-openshift-cluster-monitoring-operator-master-e2e-aws/21/

Origin-commit: 02622d5bca18d8d3bdb3c7ca578c6c69dc2631e6
This change updates the ETCD storage test so that its data is
exported. Thus it can be used by other tests. The dry run test was
updated to consume this data instead of having a duplicate copy.

The code to start a master that can be used for "one of every
resource" style tests was also factored out. It is reused in the
dry run test as well.

This prevents these tests from drifting in the future and reduces
the long term maintenance burden.

Signed-off-by: Monis Khan <mkhan@redhat.com>
This change updates the etcd storage path test to exercise custom
resource storage by creating custom resource definitions before
running the test.

Duplicated custom resource definition test logic was consolidated.

Signed-off-by: Monis Khan <mkhan@redhat.com>
Workers are now private, which means we can't directly connect to
them. For now, make the e2e tests tolerate a bastion hop by
proxying the SSH connection from a given instance.
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 11, 2019
@deads2k
Copy link

deads2k commented Jan 11, 2019

clean picks, names look right.

@deads2k deads2k merged commit f21fc98 into openshift:origin-4.0-kubernetes-1.12.4 Jan 11, 2019
@soltysh soltysh deleted the origin-4.0-kubernetes-1.12.4 branch January 11, 2019 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet