Rebase 1.8.1 by soltysh · Pull Request #17115 · openshift/origin

soltysh · 2017-10-31T19:26:09Z

@mfojtik @sttts @liggitt @deads2k @ironcladlou you can slowly start looking into it.

Rebase status:

build
- make build
- make build-test
test
- unit
- integration
- cmd
- e2e
- extended networking
- extended images
- conformance install
- extended builds
- conformance install_update
- conformance gce

follow ups:

make FailOnSwap match upstream, override for cluster-up specifically - Limit fail-on-swap override to cluster-up #17385
remove images/dockerregistry, resolve pulling docker-registry for e2e? - Remove dockerregistry Dockerfile and build #17388
move source-to-image to stop using engine-api - Drop engine api source-to-image#834
isolate pkg/build/builder and source-to-image docker dependencies
move oc cluster to stop using engine-api
resolve implications of client-side normalization to docker.io/... - opened bz
move removed image integration tests (4e13893#diff-f6445471719845682237f710388c51fa) to dockerregistry repo?

release notes - added to openshift/openshift-docs#6458

autoscaling/v2alpha1 removed
batch/v2alpha1 scheduled jobs removed
kubelet must not use swap
stdlib json decoding is stricter than ugorji/json-iter ("123"->int breaks, {}->[] breaks)

openshift-merge-robot · 2017-10-31T19:26:17Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: soltysh
We suggest the following additional approver: eparis

Assign the PR to them by writing /assign @eparis in a comment when ready.

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

Details

Needs approval from an approver in each of these OWNERS Files:

OWNERS

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

soltysh · 2017-10-31T19:27:03Z

@mfojtik in case I messed something up when reorganizing commits the before tree is here.

sttts · 2017-11-02T07:17:00Z

hack/godep-save.sh

-  api/types/registry \
-  api/types/strslice \
-  api/types/swarm \
-  api/types/versions


wow, if this goes away finally

sttts · 2017-11-02T07:18:23Z

vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go


+// TODO: Remove jsoniter for now as it is buggy and fails the serialization
+// test for DockerImage objects.
+/*


Can you add more info to the commit message? What fails? Do we have a test-case? Can we open an issue in the upstream project?

@mfojtik fyi, since you've touched it

sttts · 2017-11-02T07:26:08Z

pkg/cmd/server/kubernetes/master/master_config.go

 		writer = cmdutil.NewGLogWriterV(0)
 	}
-	backend = auditlog.NewBackend(writer, auditlog.FormatLegacy)
+	backend = auditlog.NewBackend(writer, auditlog.FormatLegacy, auditv1alpha1.SchemeGroupVersion)


why not the beta version?

I don't want to do it in the rebase, I'll do it post, I have a trello card for it.

sttts · 2017-11-02T07:28:23Z

pkg/build/registry/buildconfiginstantiate/rest.go

 		return nil, errors.NewInternalError(fmt.Errorf("unable to connect to server: %v", err))
 	}
 	streamOptions := remotecommand.StreamOptions{
-		SupportedProtocols: kubeletremotecommand.SupportedStreamingProtocols,


That's still broken, that's one of the pieces I need to revisit.

@soltysh is there a follow up issue or note somewhere so we don't forget?

soltysh · 2017-11-06T20:08:42Z

Re-synced k8s bump commit and rebased against this morning master, but it appears there are some problems in the k8s pr. I'll sync with @mfojtik tomorrow and figure this out.

sttts · 2017-11-08T10:02:52Z

pkg/cmd/server/origin/master.go


 func (c *MasterConfig) withAggregator(delegateAPIServer apiserver.DelegationTarget, kubeAPIServerConfig apiserver.RecommendedConfig, apiExtensionsInformers apiextensionsinformers.SharedInformerFactory) (*aggregatorapiserver.APIAggregator, error) {
-	aggregatorConfig, err := c.createAggregatorConfig(kubeAPIServerConfig)
+	aggregatorConfig, err := c.createAggregatorConfig(kubeAPIServerConfig.Config, c.ClientGoKubeInformers)


Why isn't kubeAPIServerConfig.SharedInformerFactory set with a non-nil value?

This change looks suspicious, probably now hiding another error.

…or GC

…ump cronjob storage

liggitt · 2017-11-20T15:05:18Z

CI is green on 8e9bea0 modulo existing issues against master

Squashed commits to 614724c (zero diff with 8e9bea0)

no conflicts in the two commits between 79097d0...3841e1d

openshift-ci-robot · 2017-11-20T17:25:39Z

@soltysh: The following tests failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/extended_conformance_install_update	`8e9bea0`	link	`/test extended_conformance_install_update`
ci/openshift-jenkins/integration	`614724c`	link	`/test integration`
ci/openshift-jenkins/extended_conformance_install	`614724c`	link	`/test extended_conformance_install`
ci/openshift-jenkins/extended_image_ecosystem	`614724c`	link	`/test extended_image_ecosystem`
ci/openshift-jenkins/extended_conformance_gce	`614724c`	link	`/test extended_conformance_gce`

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.

Details

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.

@liggitt

Automatic merge from submit-queue. interesting: fixup template data types @liggitt @mfojtik the cherry-pick from #17115

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 31, 2017

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 31, 2017

openshift-merge-robot assigned 0xmichalis and gabemontero Oct 31, 2017

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 31, 2017

openshift-merge-robot added needs-api-review vendor-update Touching vendor dir or related files labels Oct 31, 2017

soltysh assigned sttts, liggitt and deads2k and unassigned gabemontero and 0xmichalis Oct 31, 2017

sttts reviewed Nov 2, 2017

View reviewed changes

hack/godep-save.sh

api/types/registry \

api/types/strslice \

api/types/swarm \

api/types/versions

Copy link

Contributor

sttts Nov 2, 2017

Choose a reason for hiding this comment

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

wow, if this goes away finally

sttts reviewed Nov 2, 2017

View reviewed changes

soltysh force-pushed the rebase_1.8.1 branch from a8ca179 to 50e1bd3 Compare November 6, 2017 11:54

soltysh mentioned this pull request Nov 6, 2017

Rebase kubernetes 1.8.1 openshift/kubernetes#43

Merged

soltysh force-pushed the rebase_1.8.1 branch from 50e1bd3 to 402100d Compare November 6, 2017 20:05

soltysh force-pushed the rebase_1.8.1 branch 3 times, most recently from 533ef94 to 419f26d Compare November 8, 2017 10:02

sttts reviewed Nov 8, 2017

View reviewed changes

soltysh force-pushed the rebase_1.8.1 branch 4 times, most recently from d141711 to 036aca0 Compare November 10, 2017 15:14

liggitt and others added 17 commits November 20, 2017 09:40

interesting: ignore authorization.openshift.io role/binding objects f…

ac05001

…or GC

interesting: add cohabitating resources for daemonsets/replicasets, b…

d1cd05f

…ump cronjob storage

interesting: etcd_storage_path test updates

63a6cb2

interesting: ApproximatePodTemplateForObject

1ca85cb

interesting: make 'oc registry' generate valid DaemonSet

92be7a1

interesting: run reflectors in a goroutine

a44a001

interesting: bump reconcile qps

d710c22

interesting: remove bad tests from test/cmd/certs.sh

29fa8d2

interesting: generate canonical temporary build tag

8652c72

interesting: fixup template data types

df42d5a

interesting: API server changes

4eaf2c6

interesting: Master and node changes

4a494ef

interesting: remove double printer handler registration

5240af8

interesting: buildconfig/instantiate spdy executor change

424fa05

interesting: restore ability to start with swap on by default

bd1da08

Generated files

1252cce

fixme: use openshift/origin-docker-registry:latest as registry image

614724c

liggitt force-pushed the rebase_1.8.1 branch from 8e9bea0 to 614724c Compare November 20, 2017 15:04

liggitt merged commit 49fb419 into openshift:master Nov 20, 2017

This was referenced Nov 20, 2017

interesting: fixup template data types #17386

Merged

Drop github.com/docker/engine-api packages openshift/source-to-image#833

Closed

openshift-merge-robot added a commit that referenced this pull request Nov 20, 2017

Merge pull request #17386 from soltysh/template_cp_from_rebase

60412ad

Automatic merge from submit-queue. interesting: fixup template data types @liggitt @mfojtik the cherry-pick from #17115

soltysh deleted the rebase_1.8.1 branch November 21, 2017 11:20

jim-minter mentioned this pull request Dec 5, 2017

OpenShift types are missing from OpenAPI and swagger endpoints #17610

Closed

soltysh mentioned this pull request Jan 2, 2018

Restore registry tests as registry moved to external repo #17958

Closed

This was referenced Apr 9, 2018

Reenable signature workflow extended test #16344

Closed

Restore image signature workflow extended test openshift/image-registry#74

Closed

Restore tests for image signature workflow openshift/image-registry#39

Closed

Conversation

soltysh commented Oct 31, 2017 • edited by liggitt Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-merge-robot commented Oct 31, 2017

Uh oh!

soltysh commented Oct 31, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

soltysh commented Nov 6, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

liggitt commented Nov 20, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 20, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

15 participants

soltysh commented Oct 31, 2017 •

edited by liggitt

Loading

liggitt commented Nov 20, 2017 •

edited

Loading