Skip to content

Commit

Permalink
Merge pull request #5 from BuddhiWathsala/master
Browse files Browse the repository at this point in the history
Resolve configuration file path and enable https by default
  • Loading branch information
pcnfernando authored Apr 13, 2019
2 parents 9d22bd1 + 3852143 commit 25e7897
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 25 deletions.
31 changes: 7 additions & 24 deletions deploy/crds/example-siddhi-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ spec:
pod:
image: siddhiio/siddhi-runner-alpine
imageTag: v0.1.0
# tls:
# ingressSecret: siddhi-tls
tls:
ingressSecret: siddhi-tls
env:
- name: RECEIVER_URL
value: "http://0.0.0.0:8006/foo"
Expand All @@ -32,29 +32,12 @@ spec:
from DevicePowerStream[type == 'monitored']
select deviceID, power
insert into MonitorDevicesPowerStream;
siddhi.runner.configs:
wso2.datasources: #to update the default deployment.yml
dataSources:
- name: PERSISTENCE_DB
description: The MySQL datasource used for state persistence
jndiConfig:
name: jdbc/PERSISTENCE_DB
definition:
type: RDBMS
configuration:
jdbcUrl: 'jdbc:mysql://mysql:3306/PERSISTENCE_DB?useSSL=false'
username: root
password: root
driverClassName: com.mysql.jdbc.Driver
maxPoolSize: 50
idleTimeout: 60000
connectionTestQuery: SELECT 1
validationTimeout: 30000
siddhi.runner.configs: |
state.persistence:
enabled: true
intervalInMin: 10
intervalInMin: 5
revisionsToKeep: 2
persistenceStore: io.siddhi.distribution.core.persistence.DBPersistenceStore
persistenceStore: io.siddhi.distribution.core.persistence.FileSystemPersistenceStore
config:
datasource: PERSISTENCE_DB
table: PERSISTENCE_TABLE
location: siddhi-app-persistence
2 changes: 1 addition & 1 deletion pkg/controller/siddhiprocess/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
}
volumeMounts = append(volumeMounts, volumeMount)
}
configParameter = "-Dconfig=" + "tmp/configs/" + deploymentYAMLConfigMapName
configParameter = "-Dconfig=" + siddhiHome + "tmp/configs/" + deploymentYAMLConfigMapName
}

if len(siddhiProcess.Spec.EnviromentVariables) > 0 {
Expand Down

0 comments on commit 25e7897

Please sign in to comment.