removing port from webhook and revising signal impl (#68)

* removing port from webhook and revising signal impl * using sync map * fixing webhook client and refactoring Makefile to actually build
argoproj · Jul 26, 2018 · 0cb7b7f · 0cb7b7f
1 parent ddee233
commit 0cb7b7f
Show file tree

Hide file tree

Showing 15 changed files with 345 additions and 325 deletions.
diff --git a/Makefile b/Makefile
@@ -33,21 +33,6 @@ ifdef IMAGE_NAMESPACE
 IMAGE_PREFIX=${IMAGE_NAMESPACE}/
 endif
 
-.PHONY: protogen
-protogen:
-	./hack/generate-proto.sh
-
-.PHONY: clientgen
-clientgen:
-	./hack/update-codegen.sh
-
-.PHONY: openapigen
-openapi-gen:
-	./hack/update-openapigen.sh
-
-.PHONY: codegen
-codegen: clientgen openapigen protogen
-
 # this is the default stream service
 STREAM=nats
 
@@ -114,3 +99,18 @@ coverage:
 
 clean:
 	-rm -rf ${CURRENT_DIR}/dist
+
+.PHONY: protogen
+protogen:
+	./hack/generate-proto.sh
+
+.PHONY: clientgen
+clientgen:
+	./hack/update-codegen.sh
+
+.PHONY: openapigen
+openapi-gen:
+	./hack/update-openapigen.sh
+
+.PHONY: codegen
+codegen: clientgen openapigen protogen
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -1,19 +1,20 @@
 # Roadmap
 
 ## Development Phase
+- Simplify logging
 - E2E testing
 - Documentation
-- Implement repeatable sensors
 - Add NATS Streaming Signal support
 - Add SNS & SQS Signal Support
 
 
 ## Design Phase
-- Pluggable Calendar definitions that extend a common Calendar interface
 - Pass in credentials for connection to various signal sources
 - Implement GC for old sensors
-
+- Implement repeatable sensors
 
 ## Idea Phase
 - Smarter pod queue processing
 - Attach PVC to sensor executor pod spec for storing events
+- Use [hashicorp/go-getter](https://github.com/hashicorp/go-getter) for the `ArtifactReader` interface.
+- Add [Upspin](https://upspin.io/) as an `Artifact` file source.
diff --git a/examples/context-filter-webhook.yaml b/examples/context-filter-webhook.yaml
@@ -8,8 +8,7 @@ spec:
   signals:
     - name: webhook
       webhook:
-        endpoint: /app
-        port: 7070
+        endpoint: /filter/context
         method: POST
       filters:
         context:

diff --git a/examples/data-filter-webhook.yaml b/examples/data-filter-webhook.yaml
@@ -8,8 +8,7 @@ spec:
   signals:
     - name: webhook
       webhook:
-        endpoint: /app
-        port: 7070
+        endpoint: /filter/data
         method: POST
       filters:
         data:

diff --git a/examples/time-filter-webhook.yaml b/examples/time-filter-webhook.yaml
@@ -8,7 +8,7 @@ spec:
   signals:
     - name: webhook
       webhook:
-        endpoint: /app
+        endpoint: /filter/time
         method: POST
       filters:
         time:

diff --git a/examples/webhook-sensor.yaml b/examples/webhook-sensor.yaml
@@ -9,7 +9,6 @@ spec:
     - name: webhook
       webhook:
         endpoint: /app
-        port: 7070
         method: POST
   triggers:
     - name: hello-world-workflow-trigger

diff --git a/examples/webhook-with-resource-param.yaml b/examples/webhook-with-resource-param.yaml
@@ -9,7 +9,6 @@ spec:
     - name: webhook
       webhook:
         endpoint: /hello
-        port: 7070
         method: POST
   triggers:
     - name: argo-workflow

diff --git a/hack/k8s/manifests/services/webhook.yaml b/hack/k8s/manifests/services/webhook.yaml
@@ -19,6 +19,8 @@ spec:
               value: 0.0.0.0:8080
             - name: MICRO_BROKER_ADDRESS
               value: 0.0.0.0:10001
+            - name: WEBHOOK_PORT
+              value: 7070
           ports:
           - containerPort: 8080
             name: micro-port