appmanager: bind triggers to actions
diff --git a/appmanager/cmd/main.go b/appmanager/cmd/main.go
index 9bf0b4e..4905a04 100644
--- a/appmanager/cmd/main.go
+++ b/appmanager/cmd/main.go
@@ -97,8 +97,8 @@
}
type trigger struct {
- Namespace string `json:"namespace"`
- Template string `json:"template"`
+ App string `json:"app"`
+ Action string `json:"action"`
}
func (hn *handler) handleTriggers(w http.ResponseWriter, r *http.Request) {
@@ -117,7 +117,7 @@
for _, a := range hn.manager.Apps {
for _, t := range a.Triggers.Triggers {
if t.TriggerOn.Type == triggerOnType && t.TriggerOn.Event == triggerOnEvent {
- triggers = append(triggers, trigger{a.Namespace, t.Template})
+ triggers = append(triggers, trigger{a.Name, t.Action})
}
}
}
@@ -233,6 +233,7 @@
if err != nil {
glog.Fatalf("Could ot initialize manager: %v", err)
}
+ glog.Info(manager)
h := handler{clientset, manager, app.NewK8sLauncher(clientset)}
http.HandleFunc("/triggers", h.handleTriggers)
http.HandleFunc("/launch_action", h.handleLaunchAction)
diff --git a/appmanager/install.yaml b/appmanager/install.yaml
index 36457aa..a4c9d69 100644
--- a/appmanager/install.yaml
+++ b/appmanager/install.yaml
@@ -4,6 +4,7 @@
metadata:
name: pcloud-app-manager
---
+# TODO(giolekva): use default service account
apiVersion: v1
kind: ServiceAccount
metadata:
diff --git a/appmanager/triggers.go b/appmanager/triggers.go
index aee109f..f0611d5 100644
--- a/appmanager/triggers.go
+++ b/appmanager/triggers.go
@@ -8,7 +8,7 @@
type Trigger struct {
Name string `yaml:"name"`
TriggerOn TriggerOn `yaml:"triggerOn"`
- Template string `yaml:"template"`
+ Action string `yaml:"action"`
}
type Triggers struct {