diff --git a/.vscode/launch.json b/.vscode/launch.json index 21f07cf..8e4f663 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,7 +5,7 @@ "name": "Attach to IntentEditor", "address": "127.0.0.1", "localRoot": "${workspaceFolder}/Source", - "port": 9000, + "port": 8000, "remoteRoot": "/app", "request": "attach", "skipFiles": [ @@ -33,12 +33,12 @@ } }, { - "name": "Attach to QAService", + "name": "Attach to IntentClassifier", "type": "python", "request": "attach", "connect": { "host": "127.0.0.1", - "port": 8000 + "port": 9000 }, "pathMappings": [ { @@ -48,12 +48,12 @@ ] }, { - "name": "Attach to IntentClassifier", + "name": "Attach to QAService", "type": "python", "request": "attach", "connect": { "host": "127.0.0.1", - "port": 8001 + "port": 9001 }, "pathMappings": [ { diff --git a/Scripts/ForwardPorts.sh b/Scripts/ForwardPorts.sh index 4ca70d3..47cabf1 100644 --- a/Scripts/ForwardPorts.sh +++ b/Scripts/ForwardPorts.sh @@ -1,5 +1,5 @@ i=8000 -for dir in ./Source/Python/Services/*/ +for dir in ./Source/NodeJS/Services/*/ do dir_name=$(basename $dir) service_name=$(echo $dir_name | tr '[:upper:]' '[:lower:]') @@ -8,7 +8,7 @@ do done i=9000 -for dir in ./Source/NodeJS/Services/*/ +for dir in ./Source/Python/Services/*/ do dir_name=$(basename $dir) service_name=$(echo $dir_name | tr '[:upper:]' '[:lower:]') diff --git a/Source/NodeJS/Services/IntentEditor/app.js b/Source/NodeJS/Services/IntentEditor/app.js index e0c8a63..b094558 100644 --- a/Source/NodeJS/Services/IntentEditor/app.js +++ b/Source/NodeJS/Services/IntentEditor/app.js @@ -21,7 +21,7 @@ app.post('/:projectId', async (req, res) => { const { data } = req.body; await IntentProjectData.updateOne({projectId}, {data}, { upsert: true }); KafkaProducer.produceMessage("intents-updated", { projectId }); - res.status(200).json(); + res.status(200).json("Data was updated!!!!!!!!!!!!!!!!!!!"); }) app.get('/:projectId', async (req, res) => { diff --git a/SystemCharts/ServiceChart/templates/deployment.yaml b/SystemCharts/ServiceChart/templates/deployment.yaml index 0aecbd3..37e7db7 100644 --- a/SystemCharts/ServiceChart/templates/deployment.yaml +++ b/SystemCharts/ServiceChart/templates/deployment.yaml @@ -18,24 +18,12 @@ spec: - name: app-storage persistentVolumeClaim: claimName: app-volume-claim - {{ if .Values.commandTextInit }} - initContainers: - - name: install-modules + containers: + - name: {{ lower .Values.serviceName }} image: {{ .Values.image }} - imagePullPolicy: IfNotPresent - workingDir: "/app/{{ .Values.framework }}/Services/{{ .Values.serviceName }}" - command: - - "sh" - args: - - "-c" - - {{ .Values.commandTextInit }} volumeMounts: - mountPath: "/app" name: app-storage - {{ end }} - containers: - - name: {{ lower .Values.serviceName }} - image: {{ .Values.image }} workingDir: "/app/{{ .Values.framework }}/Services/{{ .Values.serviceName }}" command: - "sh" @@ -44,9 +32,6 @@ spec: - {{ .Values.commandText }} ports: - containerPort: 80 - volumeMounts: - - mountPath: "/app" - name: app-storage imagePullPolicy: IfNotPresent env: - name: SERVICE_NAME @@ -54,8 +39,4 @@ spec: {{- range .Values.env }} - name: {{ .name }} value: {{ .value }} - {{- end }} - {{- range .Values.envRuntime }} - - name: {{ .name }} - value: {{ .value }} {{- end }} \ No newline at end of file