diff --git a/README.md b/README.md index 463f9d1..05561a5 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Supported Version: nginx 0.22.0 ## Testing a sample 1. Execute the below command to create a sample siddhi deployment. -`kubectl create -f ./deploy/crds/example-siddhi-deployment.yaml` +`kubectl create -f ./deploy/crds/monitor-app.yaml` Siddhi Operator would create a Siddhi-Runner deployment with the Siddhi app deployed through the example-siddhi-app CRD, a service, and an ingress to expose the http endpoint which is in the Siddhi sample. @@ -59,7 +59,7 @@ In order to disable the automatic ingress creation, you can set **AUTO_INGRESS_C 4. Use following CURL command to publish an event to the sample Siddhi app that's deployed. ``` curl -X POST \ - http://siddhi/example-siddhi-deployment/8280/example \ + http://siddhi/monitor-app/8280/example \ -H 'Content-Type: application/json' \ -d '{ "type": "monitored", diff --git a/deploy/crds/example-siddhi-deployment.yaml b/deploy/crds/monitor-app.yaml similarity index 80% rename from deploy/crds/example-siddhi-deployment.yaml rename to deploy/crds/monitor-app.yaml index 9f5ed62..c9c20ec 100644 --- a/deploy/crds/example-siddhi-deployment.yaml +++ b/deploy/crds/monitor-app.yaml @@ -1,28 +1,28 @@ apiVersion: siddhi.io/v1alpha1 kind: SiddhiProcess metadata: - name: example-siddhi-deployment + name: monitor-app version: 1.0.0 spec: pod: image: siddhiio/siddhi-runner-alpine - imageTag: v0.1.0 + imageTag: 0.1.0 tls: ingressSecret: siddhi-tls env: - name: RECEIVER_URL - value: "http://0.0.0.0:8006/foo" + value: "http://0.0.0.0:8280/example" - name: BASIC_AUTH_ENABLED value: "false" # apps: # - app1 # - app2 query: | - @App:name("Example-Siddhi") + @App:name("MonitorApp") @App:description("Description of the plan") @sink(type='log', prefix='LOGGER') - @source(type='http', receiver.url='http://0.0.0.0:8280/example', basic.auth.enabled='false', @map(type='json')) + @source(type='http', receiver.url='${RECEIVER_URL}', basic.auth.enabled='${BASIC_AUTH_ENABLED}', @map(type='json')) define stream DevicePowerStream (type string, deviceID string, power int); diff --git a/deploy/operator.yaml b/deploy/operator.yaml index c22c908..1c91ba7 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: siddhi-operator containers: - name: siddhi-operator - image: docker.io/siddhiio/siddhi-operator:v0.1.0 + image: docker.io/siddhiio/siddhi-operator:0.1.0 command: - siddhi-operator imagePullPolicy: Always @@ -31,11 +31,11 @@ spec: - name: OPERATOR_NAME value: siddhi-operator - name: OPERATOR_VERSION - value: v0.1.0 + value: 0.1.0 - name: SIDDHI_RUNNER_IMAGE value: siddhiio/siddhi-runner-alpine - name: SIDDHI_RUNNER_IMAGE_TAG - value: v0.1.0 + value: 0.1.0 - name: SIDDHI_RUNNER_IMAGE_SECRET value: null - name: SIDDHI_RUNNER_HOME @@ -76,7 +76,7 @@ spec: version: 1.0.0 spec: containers: - - image: siddhiio/siddhi-parser:v0.1.0 + - image: siddhiio/siddhi-parser:0.1.0 imagePullPolicy: IfNotPresent name: siddhirunner-msf4j ports: diff --git a/docs/sample-outputs/deployment.png b/docs/sample-outputs/deployment.png index e65b760..735590a 100644 Binary files a/docs/sample-outputs/deployment.png and b/docs/sample-outputs/deployment.png differ diff --git a/docs/sample-outputs/pod_log.png b/docs/sample-outputs/pod_log.png index 6f44803..e084f88 100644 Binary files a/docs/sample-outputs/pod_log.png and b/docs/sample-outputs/pod_log.png differ