Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

[WIP] migrate WIT to use proxy for all deployments API requests #2284

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b6fcaba
Eliminate some more duplicate names for deployments API refactoring
stooke Jan 26, 2018
36e590a
Merge remote-tracking branch 'upstream/master'
stooke Jan 26, 2018
58342c7
Merge remote-tracking branch 'upstream/master'
stooke Jan 29, 2018
a45161a
Merge remote-tracking branch 'upstream/master'
stooke Feb 6, 2018
dbcf947
Merge remote-tracking branch 'upstream/master'
stooke Feb 7, 2018
99d3f01
remove unused /apps API
stooke Feb 8, 2018
e45ac78
Merge remote-tracking branch 'upstream/master'
stooke Feb 8, 2018
2b06816
Merge remote-tracking branch 'upstream/master'
stooke Feb 9, 2018
94159dc
Merge remote-tracking branch 'upstream/master'
stooke Feb 22, 2018
9bb38c8
Merge remote-tracking branch 'upstream/master'
stooke Feb 23, 2018
ad3b87f
Merge remote-tracking branch 'upstream/master'
stooke Feb 27, 2018
e32a323
Merge remote-tracking branch 'upstream/master'
stooke Feb 28, 2018
1a9481d
Merge remote-tracking branch 'upstream/master'
stooke Mar 2, 2018
ff47976
Merge remote-tracking branch 'upstream/master'
stooke Mar 19, 2018
29461ed
Merge remote-tracking branch 'upstream/master'
stooke Mar 26, 2018
15ee913
Merge remote-tracking branch 'upstream/master'
stooke Apr 5, 2018
7df6871
Merge remote-tracking branch 'upstream/master'
stooke Apr 6, 2018
f9a252e
Merge remote-tracking branch 'upstream/master'
stooke Apr 9, 2018
99f3d57
Merge remote-tracking branch 'upstream/master'
stooke Apr 10, 2018
8193a2f
Merge remote-tracking branch 'upstream/master'
stooke Apr 13, 2018
7ebe5eb
Merge remote-tracking branch 'upstream/master'
stooke Apr 18, 2018
d1514f0
Merge remote-tracking branch 'upstream/master'
stooke Apr 19, 2018
d2eb5e3
Merge remote-tracking branch 'upstream/master'
stooke Apr 24, 2018
63c3ec9
Merge remote-tracking branch 'upstream/master'
stooke Apr 25, 2018
fa0d3bd
Merge remote-tracking branch 'upstream/master'
stooke Apr 27, 2018
2418c94
Merge remote-tracking branch 'upstream/master'
stooke Apr 30, 2018
7a7c9e8
Merge remote-tracking branch 'upstream/master'
stooke May 9, 2018
e4c3a6c
Merge remote-tracking branch 'upstream/master'
stooke May 28, 2018
ee6062b
simplify URL provider to only use proxy service
stooke May 29, 2018
32e319f
Merge remote-tracking branch 'upstream/master' into jst-fullproxy
stooke Sep 11, 2018
9d8c3c1
Merge remote-tracking branch 'upstream/master' into jst-fullproxy
stooke Sep 11, 2018
9709d60
Merge remote-tracking branch 'upstream/master' into jst-fullproxy
stooke Oct 4, 2018
60a85f1
remove references to Tenant service
stooke Oct 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions controller/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ func (g *defaultClientGetter) GetKubeClient(ctx context.Context) (kubernetes.Kub
if err != nil {
log.Error(ctx, map[string]interface{}{
"err": err,
}, "could not retrieve tenant data")
return nil, errs.Wrap(err, "could not retrieve tenant data")
}, "could not create urlProvider")
return nil, errs.Wrap(err, "could not create urlProvider")
}

/* Timeout used per HTTP request to Kubernetes/OpenShift API servers.
Expand Down
1 change: 0 additions & 1 deletion controller/deployments_osioclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ func (osioclient *OSIOClient) GetNamespaceByType(ctx context.Context, userServic
}

// GetUserServices - fetch array of user services
// In the future, consider calling the tenant service (as /api/user/services implementation does)
func (osioclient *OSIOClient) GetUserServices(ctx context.Context) (*app.UserService, error) {

if osioclient.userServices != nil {
Expand Down
Loading