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

assets/installconfig: apply defaults to install config #1058

Merged

Conversation

wking
Copy link
Member

@wking wking commented Jan 12, 2019

The Install Config asset will apply defaults to fields for which there are reasonable defaults. This applies to a generated Install Config asset and to an Install Config asset loaded from disk.

Carrying #902 onto #1057. CC @staebler, @abhinavdahiya, @crawford. Hold until #1057 lands:

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 12, 2019
@wking wking added this to the Freeze milestone Jan 12, 2019
@wking wking force-pushed the defaults-for-installconfig branch from 2444a35 to f3ffb86 Compare January 12, 2019 07:05
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 12, 2019
@wking
Copy link
Member Author

wking commented Jan 12, 2019

The commit carried from #902 actually conflicted with changes that landed in master since #1057 branched off. So I've pushed 2444a35 -> f3ffb86 to rebase the two commits onto master. If #1057 lands before midnight, I'll rebase this again. If someone drops a /lgtm on this PR before #1057 lands, I'll /hold #1057 and try and get this one landed (with both changes) instead.

@wking
Copy link
Member Author

wking commented Jan 12, 2019

e2e-aws:

fail [github.com/openshift/origin/test/extended/operators/cluster.go:109]: Expected
    <[]string | len:1, cap:1>: [
        "Pod openshift-core-operators/origin-cluster-osin-operator2-7c95d6b586-f55tl is not healthy: container operator has restarted more than 5 times",
    ]
to be empty

...
failed: (2m2s) 2019-01-12T07:58:33 "[Feature:Platform] Managed cluster should have no crashlooping pods in core namespaces over two minutes [Suite:openshift/conformance/parallel]"

and many more. Maybe my rebase broke something?

/retest

@wking
Copy link
Member Author

wking commented Jan 12, 2019

Logs from that busted osin pod:

$ curl -s https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_installer/1058/pull-ci-openshift-installer-master-e2e-aws/2845/artifacts/e2e-aws/pods/openshift-core-operators_origin-cluster-osin-operator2-7c95d6b586-f55tl_operator_previous.log.gz | gunzip  | tail -n 13
ERROR: logging before flag.Parse: I0112 07:33:52.629752       1 leaderelection.go:209] successfully renewed lease openshift-core-operators/cluster-osin-operator2-lock
ERROR: logging before flag.Parse: I0112 07:33:54.651256       1 leaderelection.go:209] successfully renewed lease openshift-core-operators/cluster-osin-operator2-lock
panic: osins.osin.openshift.io "openshift-osin" is forbidden: caches not synchronized

goroutine 85 [running]:
github.com/openshift/cluster-osin-operator/vendor/github.com/openshift/library-go/pkg/operator/v1helpers.EnsureOperatorConfigExists(0x1c2bf60, 0xc4200e6430, 0xc4208e2000, 0x91, 0xa0, 0x1a5e164, 0x11, 0x1a529f5, 0x8, 0x1a4e7be, ...)
	/go/src/github.com/openshift/cluster-osin-operator/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/helpers.go:99 +0x34e
github.com/openshift/cluster-osin-operator/pkg/operator2.RunOperator(0xc420470f90, 0x0, 0x0)
	/go/src/github.com/openshift/cluster-osin-operator/pkg/operator2/starter.go:83 +0x5a6
github.com/openshift/cluster-osin-operator/vendor/github.com/openshift/library-go/pkg/controller/controllercmd.(*ControllerBuilder).Run.func2(0xc42051fb00)
	/go/src/github.com/openshift/cluster-osin-operator/vendor/github.com/openshift/library-go/pkg/controller/controllercmd/builder.go:213 +0x4f
created by github.com/openshift/cluster-osin-operator/vendor/k8s.io/client-go/tools/leaderelection.(*LeaderElector).Run
	/go/src/github.com/openshift/cluster-osin-operator/vendor/k8s.io/client-go/tools/leaderelection/leaderelection.go:155 +0x92

Dunno what was going on there, but once I find out, I'll file an upstream issue or PR.

@wking
Copy link
Member Author

wking commented Jan 12, 2019

panic: osins.osin.openshift.io "openshift-osin" is forbidden: caches not synchronized

goroutine 85 [running]:
github.com/openshift/cluster-osin-operator/vendor/github.com/openshift/library-go/pkg/operator/v1helpers.EnsureOperatorConfigExists(0x1c2bf60, 0xc4200e6430, 0xc4208e2000, 0x91, 0xa0, 0x1a5e164, 0x11, 0x1a529f5, 0x8, 0x1a4e7be, ...)
	/go/src/github.com/openshift/cluster-osin-operator/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/helpers.go:99 +0x34e

The panic is from this line, and openshift/library-go#168 may fix it (I'm not sure, but it mentions "fix panic" and syncing ;).

@abhinavdahiya
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2019
@crawford
Copy link
Contributor

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 12, 2019
The Install Config asset will apply defaults to fields for which there
are reasonable defaults. This applies to a generated Install Config
asset and to an Install Config asset loaded from disk.
@wking wking force-pushed the defaults-for-installconfig branch from f3ffb86 to ec92355 Compare January 12, 2019 15:29
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2019
@crawford
Copy link
Contributor

Rebased onto master. No content changes. Still looks good to me.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, crawford, wking

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

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [abhinavdahiya,crawford,wking]

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

@wking
Copy link
Member Author

wking commented Jan 12, 2019

e2e-aws:

Jan 12 16:11:13.964 E kube-apiserver Kube API started failing: Get https://ci-op-f1bz6hw3-1d3f3-api.origin-ci-int-aws.dev.rhcloud.com:6443/api/v1/namespaces/kube-system?timeout=3s: context deadline exceeded (Client.Timeout exceeded while awaiting headers) Jan 12 16:11:42.964 E kube-apiserver Kube API started failing: Get https://ci-op-f1bz6hw3-1d3f3-api.origin-ci-int-aws.dev.rhcloud.com:6443/api/v1/namespaces/kube-system?timeout=3s: net/http: request canceled (Client.Timeout exceeded while awaiting headers)

and more.

/retest

@openshift-merge-robot openshift-merge-robot merged commit 8173c23 into openshift:master Jan 12, 2019
@wking wking deleted the defaults-for-installconfig branch January 12, 2019 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants