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.

Sign up for GitHub

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

Jump to bottom

Bug 1820687: allow patch for updating namespace #394

Merged

openshift-merge-robot merged 3 commits into openshift:master from soltysh:bug1820687

Apr 24, 2020

Member

soltysh commented Apr 11, 2020

/assign @deads2k

openshift-ci-robot assigned deads2k

openshift-ci-robot commented Apr 11, 2020

@soltysh: This pull request references Bugzilla bug 1820687, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1820687: allow patch for updating namespace

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-robot added the bugzilla/valid-bug label

soltysh mentioned this pull request

Bug 1820687: use patch when updating namespace openshift/cluster-policy-controller#22

Merged

openshift-ci-robot requested review from deads2k and mfojtik

April 11, 2020 04:44

openshift-ci-robot added the approved label

Member Author

soltysh commented Apr 11, 2020

/retest

openshift-ci-robot mentioned this pull request

Bug 1820687: NS SCC annotations exist, else forbidden: unable to validate... openshift/origin#24828

Merged

Member Author

soltysh commented Apr 14, 2020

/retest

soltysh force-pushed the bug1820687 branch from 7697ae0 to fa68bd8 Compare

April 14, 2020 10:49

Member Author

soltysh commented Apr 14, 2020

/retest

2 similar comments

Member Author

soltysh commented Apr 14, 2020

/retest

Member Author

soltysh commented Apr 14, 2020

/retest

Member Author

soltysh commented Apr 14, 2020

/hold

openshift-ci-robot added the do-not-merge/hold label

soltysh force-pushed the bug1820687 branch 2 times, most recently from b4ef4f6 to d412fb6 Compare

April 15, 2020 11:24

Member Author

soltysh commented Apr 15, 2020

/retest

tnozicka reviewed

View reviewed changes

test/e2e/satokensigner_test.go

@@ @@ -27,17 +27,20 @@ func TestSATokenSignerControllerSyncCerts(t *testing.T) { @@
               	ctx := context.Background()
               	// wait for the operator readiness
+              	t.Logf("Waiting for true, false, false")

Contributor

tnozicka Apr 15, 2020

t.Log, until 1.14, is not logging until the test finishes but if it panics we don't have logs - I'd do klog.Infof for now (don't forget klog.Init

tnozicka reviewed

View reviewed changes

pkg/operator/v411_00_assets/bindata.go Outdated

    
                  terminationMessagePolicy: FallbackToLogsOnError

                  image: ${IMAGE}

                  imagePullPolicy: IfNotPresent

                  command: ['/usr/bin/timeout', '30', "/bin/bash", "-c"]

                  command: ['/usr/bin/timeout', '105', '/bin/bash', '-ec'] # a bit more than 60s for graceful termination + 35s for minimum-termination-duration, 5s extra cri-o's graceful termination period

Contributor

tnozicka Apr 15, 2020

graceful termination applies to apiserver, I think we should set 60 s for TIME_WAIT + 5 s for crio

soltysh force-pushed the bug1820687 branch from 396ea62 to e48c0d7 Compare

April 15, 2020 15:36

soltysh mentioned this pull request

Bug 1826259: fix ingress CA cert location #402

Merged

Member Author

soltysh commented Apr 21, 2020

/retest

soltysh added 3 commits

April 22, 2020 13:00


          Bug 1820687: allow patch for updating namespace

f18bf16


          Switch from prints to proper logging

fab897d


          Bump initContainer timeout and squash both wait-for-port loops into one

b35d8f9

soltysh force-pushed the bug1820687 branch from e48c0d7 to b35d8f9 Compare

April 22, 2020 11:06

Member Author

soltysh commented Apr 22, 2020

/hold cancel

openshift-ci-robot removed the do-not-merge/hold label

Contributor

tnozicka commented Apr 23, 2020

/lgtm

openshift-ci-robot assigned tnozicka

openshift-ci-robot added the lgtm label

openshift-ci-robot commented Apr 23, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: soltysh, tnozicka

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~~ [soltysh,tnozicka]

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

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

9 similar comments

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 23, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

Contributor

openshift-bot commented Apr 24, 2020

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-merge-robot merged commit a7887c3 into openshift:master

openshift-ci-robot commented Apr 24, 2020

@soltysh: Some pull requests linked via external trackers have merged: openshift/cluster-kube-controller-manager-operator#394. The following pull requests linked via external trackers have not merged:

openshift/cluster-policy-controller#22 is open
Bugzilla bug 1820687 has been moved to the MODIFIED state.

In response to this:

Bug 1820687: allow patch for updating namespace

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.

soltysh deleted the bug1820687 branch

April 27, 2020 10:56

Member Author

soltysh commented Apr 29, 2020

/cherrypick release-4.4

openshift-cherrypick-robot commented Apr 29, 2020

@soltysh: #394 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	bindata/v4.1.0/kube-controller-manager/namespace-security-allocation-controller-clusterrole.yaml
M	pkg/operator/v411_00_assets/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/v411_00_assets/bindata.go
CONFLICT (content): Merge conflict in pkg/operator/v411_00_assets/bindata.go
CONFLICT (modify/delete): bindata/v4.1.0/kube-controller-manager/namespace-security-allocation-controller-clusterrole.yaml deleted in HEAD and modified in Bug 1820687: allow patch for updating namespace. Version Bug 1820687: allow patch for updating namespace of bindata/v4.1.0/kube-controller-manager/namespace-security-allocation-controller-clusterrole.yaml left in tree.
Patch failed at 0001 Bug 1820687: allow patch for updating namespace

In response to this:

/cherrypick release-4.4

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.

This was referenced Apr 29, 2020

[release-4.4] Bug 1829327: allow patch for updating namespace openshift/openshift-apiserver#100

Merged

[release-4.3] Bug 1829328: allow patch for updating namespace openshift/openshift-apiserver#101

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment