Skip to content

Bug 1737315: Fix secret in pod log#276

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
benjaminapetersen:bump/2017/aug/27
Aug 27, 2019
Merged

Bug 1737315: Fix secret in pod log#276
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
benjaminapetersen:bump/2017/aug/27

Conversation

@benjaminapetersen
Copy link
Copy Markdown
Contributor

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@benjaminapetersen: This pull request references Bugzilla bug 1737315, which is invalid:

  • expected the bug to target the "4.2.0" release, but it targets "4.1.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1737315: Fix secret in pod log

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 openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Aug 27, 2019
@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

/assign @spadgett @jhadvig

@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@benjaminapetersen: This pull request references Bugzilla bug 1737315, which is invalid:

  • expected the bug to target the "4.2.0" release, but it targets "4.1.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

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.

@spadgett
Copy link
Copy Markdown
Member

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Aug 27, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@spadgett: This pull request references Bugzilla bug 1737315, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/bugzilla refresh

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.

Copy link
Copy Markdown
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 27, 2019
@spadgett spadgett added this to the v4.2 milestone Aug 27, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, spadgett

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [benjaminapetersen,spadgett]

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

@openshift-merge-robot openshift-merge-robot merged commit b18cc3b into openshift:master Aug 27, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@benjaminapetersen: All pull requests linked via external trackers have merged. Bugzilla bug 1737315 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1737315: Fix secret in pod log

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.

@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

benjaminapetersen commented Aug 28, 2019

/cherrypick release-4.1

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

@openshift-cherrypick-robot
Copy link
Copy Markdown

@benjaminapetersen: #276 failed to apply on top of branch "release-4.1":

Using index info to reconstruct a base tree...
M	glide.lock
M	vendor/github.com/go-test/deep/CHANGES.md
M	vendor/github.com/openshift/api/config/v1/types_build.go
M	vendor/github.com/openshift/api/config/v1/types_ingress.go
M	vendor/github.com/openshift/api/config/v1/types_network.go
A	vendor/github.com/openshift/api/config/v1/types_operatorhub.go
M	vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/network/v1/generated.pb.go
M	vendor/github.com/openshift/api/operator/v1/types_network.go
M	vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
M	vendor/github.com/openshift/api/route/v1/generated.pb.go
M	vendor/github.com/openshift/client-go/glide.lock
M	vendor/github.com/openshift/library-go/cmd/crd-schema-gen/generator/generator.go
M	vendor/github.com/openshift/library-go/glide.lock
M	vendor/github.com/openshift/library-go/glide.yaml
A	vendor/github.com/openshift/library-go/pkg/oauth/oauthserviceaccountclient/oauthclientregistry_test.go.git/rebase-apply/patch:311: trailing whitespace.
// Network holds cluster-wide information about Network. The canonical name is `cluster`. It is used to configure the desired network configuration, such as: IP address pools for services/pod IPs, network plugin, etc. 
.git/rebase-apply/patch:312: trailing whitespace.
// Please view network.spec for an explanation on what applies when configuring this resource. 
.git/rebase-apply/patch:334: trailing whitespace.
	// IP address pool to use for pod IPs. 
.git/rebase-apply/patch:335: trailing whitespace.
	// This field is immutable after installation. 
.git/rebase-apply/patch:340: trailing whitespace.
	// This field is immutable after installation. 
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

A	vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client.go
A	vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client_test.go
A	vendor/github.com/openshift/library-go/pkg/operator/watchdog/cmd.go
A	vendor/github.com/openshift/library-go/pkg/operator/watchdog/cmd_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/pkg/operator/watchdog/cmd_test.go deleted in HEAD and modified in Bump *. Version Bump * of vendor/github.com/openshift/library-go/pkg/operator/watchdog/cmd_test.go left in tree.
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/pkg/operator/watchdog/cmd.go deleted in HEAD and modified in Bump *. Version Bump * of vendor/github.com/openshift/library-go/pkg/operator/watchdog/cmd.go left in tree.
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client_test.go deleted in HEAD and modified in Bump *. Version Bump * of vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client_test.go left in tree.
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client.go deleted in HEAD and modified in Bump *. Version Bump * of vendor/github.com/openshift/library-go/pkg/operator/genericoperatorclient/dynamic_operator_client.go left in tree.
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/pkg/oauth/oauthserviceaccountclient/oauthclientregistry_test.go deleted in HEAD and modified in Bump *. Version Bump * of vendor/github.com/openshift/library-go/pkg/oauth/oauthserviceaccountclient/oauthclientregistry_test.go left in tree.
Auto-merging vendor/github.com/openshift/library-go/glide.yaml
CONFLICT (content): Merge conflict in vendor/github.com/openshift/library-go/glide.yaml
Auto-merging vendor/github.com/openshift/library-go/glide.lock
CONFLICT (content): Merge conflict in vendor/github.com/openshift/library-go/glide.lock
Removing vendor/github.com/openshift/library-go/cmd/crd-schema-gen/main.go
CONFLICT (modify/delete): vendor/github.com/openshift/library-go/cmd/crd-schema-gen/generator/generator.go deleted in Bump * and modified in HEAD. Version HEAD of vendor/github.com/openshift/library-go/cmd/crd-schema-gen/generator/generator.go left in tree.
Auto-merging vendor/github.com/openshift/client-go/glide.lock
CONFLICT (content): Merge conflict in vendor/github.com/openshift/client-go/glide.lock
Auto-merging vendor/github.com/openshift/api/route/v1/generated.pb.go
Auto-merging vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go
Auto-merging vendor/github.com/openshift/api/operator/v1/types_network.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/operator/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/network/v1/generated.pb.go
Auto-merging vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
CONFLICT (modify/delete): vendor/github.com/openshift/api/config/v1/types_operatorhub.go deleted in HEAD and modified in Bump *. Version Bump * of vendor/github.com/openshift/api/config/v1/types_operatorhub.go left in tree.
Auto-merging vendor/github.com/openshift/api/config/v1/types_network.go
CONFLICT (content): Merge conflict in vendor/github.com/openshift/api/config/v1/types_network.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_ingress.go
Auto-merging vendor/github.com/openshift/api/config/v1/types_build.go
Auto-merging vendor/github.com/go-test/deep/CHANGES.md
CONFLICT (content): Merge conflict in vendor/github.com/go-test/deep/CHANGES.md
Auto-merging glide.lock
CONFLICT (content): Merge conflict in glide.lock
error: Failed to merge in the changes.
Patch failed at 0001 Bump *

Details

In response to this:

/cherrypick release-4.1

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.

@benjaminapetersen
Copy link
Copy Markdown
Contributor Author

Sadly, not clean....

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. 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.

6 participants