Skip to content

Bug 1746103: Fix secret in pod log in 4.1 #278

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

Merged
jhadvig merged 2 commits into from
Sep 5, 2019
Merged

Bug 1746103: Fix secret in pod log in 4.1 #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f92c7b
Bump library-go to fix bug 1737315 - secrets in pod log
benjaminapetersen Aug 28, 2019
fdefa6d
Fixes in response to pinning openshift dependency repos to 4.1
benjaminapetersen Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 10 additions & 9 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import:

# openshift
- package: github.com/openshift/api
version: master
version: release-4.1
- package: github.com/openshift/client-go
version: master
version: release-4.1
- package: github.com/openshift/library-go
version: master
version: release-4.1

# codegen
# codegen
Copy link
Copy Markdown
Member

@spadgett spadgett Aug 30, 2019

Choose a reason for hiding this comment

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

nit: unintentional whitespace change?

- package: k8s.io/gengo/args
version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b
- package: golang.org/x/tools/imports
Expand Down
2 changes: 1 addition & 1 deletion pkg/console/operator/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (c *consoleOperator) SetStatusCondition(operatorConfig *operatorsv1.Console

func (c *consoleOperator) ConditionResourceSyncSuccess(operatorConfig *operatorsv1.Console) *operatorsv1.Console {
v1helpers.SetOperatorCondition(&operatorConfig.Status.Conditions, operatorsv1.OperatorCondition{
Type: operatorsv1.OperatorStatusTypeFailing,
Type: operatorsv1.OperatorStatusTypeDegraded,
Copy link
Copy Markdown
Contributor Author

@benjaminapetersen benjaminapetersen Aug 29, 2019

Choose a reason for hiding this comment

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

This is the only modification required in operator code.

Status: operatorsv1.ConditionFalse,
LastTransitionTime: metav1.Now(),
})
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/go-test/deep/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 18 additions & 1 deletion vendor/github.com/go-test/deep/CHANGES.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 15 additions & 13 deletions vendor/github.com/go-test/deep/deep.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading