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.

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

Populate namespace when querying functions #512

Merged
merged 1 commit into from
Sep 20, 2019
Merged

Populate namespace when querying functions #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions Gopkg.lock
View file
Open in desktop

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

13 changes: 6 additions & 7 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.6.1"

[[constraint]]
name = "github.com/openfaas/faas"
version = "0.16.0"
version = "0.17.3"

[[constraint]]
name = "github.com/openfaas/faas-provider"
version = "0.9.5"
version = "0.10.1"

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.6.1"

[[constraint]]
name = "k8s.io/apimachinery"
Expand Down
2 changes: 1 addition & 1 deletion handlers/reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ func getService(functionNamespace string, functionName string, clientset *kubern
}

if item != nil {

function := readFunction(*item)
if function != nil {
return function, nil
Expand All @@ -98,6 +97,7 @@ func readFunction(item appsv1.Deployment) *types.FunctionStatus {
InvocationCount: 0,
Labels: &labels,
Annotations: &item.Spec.Template.Annotations,
Namespace: item.Namespace,
}

return &function
Expand Down
1 change: 1 addition & 0 deletions vendor/github.com/openfaas/faas-provider/logs/handler.go
View file
Open in desktop

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

13 changes: 8 additions & 5 deletions vendor/github.com/openfaas/faas-provider/serve.go
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion vendor/github.com/openfaas/faas-provider/types/model.go
View file
Open in desktop

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