single-server-binary

Makefile

@@ -97,9 +97,8 @@ run-dev: ## run the dev server
 	@./scripts/run-dev.sh
 
 CLI = dispatch
-SERVICES = api-manager application-manager event-manager \
-           function-manager identity-manager image-manager secret-store event-sidecar \
-           service-manager
+
+SERVICES = dispatch-server event-sidecar
 
 DARWIN_BINS = $(foreach bin,$(SERVICES),$(bin)-darwin)
 LINUX_BINS = $(foreach bin,$(SERVICES),$(bin)-linux)

charts/dispatch/charts/api-manager/templates/deployment.yaml

@@ -23,20 +23,17 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ default .Values.global.image.host .Values.image.host }}/{{ .Values.image.repository }}:{{ default .Values.global.image.tag .Values.image.tag }}"
+          image: "{{ default .Values.global.image.host .Values.image.host }}/{{ default .Values.global.image.repository .Values.image.repository }}:{{ default .Values.global.image.tag .Values.image.tag }}"
           imagePullPolicy: {{ default .Values.global.pullPolicy .Values.image.pullPolicy }}
           args:
+            - "api-manager"
             - "--host=0.0.0.0"
             - "--port={{ .Values.service.internalPort }}"
             - "--db-file={{ default .Release.Name .Values.global.db.release }}-{{ .Values.global.db.host }}.{{ default .Release.Namespace .Values.global.db.namespace }}:{{ .Values.global.db.port }}"
             - "--db-backend={{ .Values.global.db.backend }}"
             - "--db-username={{ .Values.global.db.user }}"
             - "--db-password={{ .Values.global.db.password }}"
             - "--db-database={{ .Values.global.db.database }}"
-            - "--tls-port=443"
-            - "--tls-certificate=/data/tls/tls.crt"
-            - "--tls-key=/data/tls/tls.key"
-            - "--gateway={{ .Values.gateway.name }}"
             - "--gateway-host={{ .Values.gateway.host }}"
             - "--function-manager={{ .Release.Name }}-function-manager.{{ .Release.Namespace }}"
             - "--resync-period={{ .Values.resyncPeriod }}"
@@ -64,28 +61,8 @@ spec:
                 value: cookie
             initialDelaySeconds: 10
             periodSeconds: 3
-          volumeMounts:
-            - mountPath: "/data/{{ template "name" . }}"
-              name: {{ template "fullname" . }}
-            - mountPath: "/var/run/docker.sock"
-              name: {{ template "fullname" . }}-docker
-            - mountPath: "/data/tls"
-              name: tls
-              readOnly: true
-          env:
-            - name: DOCKER_API_VERSION
-              value: "1.24"
           resources:
 {{ toYaml .Values.resources | default .Values.global.resources | indent 12 }}
-      volumes:
-        - name: {{ template "fullname" . }}
-          emptyDir: {}
-        - name: {{ template "fullname" . }}-docker
-          hostPath:
-            path: /var/run/docker.sock
-        - name: tls
-          secret:
-            secretName: {{ default .Values.global.tls.secretName .Values.ingress.tls.secretName }}
 {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}

charts/dispatch/charts/api-manager/values.yaml

@@ -6,12 +6,11 @@ maxUnavailable: 0
 maxSurge: 1
 image:
   # host: vmware
-  repository: dispatch-api-manager
+  # repository: dispatch-server
   # tag: latest
   # pullPolicy: Always
 
 gateway:
-  name: kong
   host: "http://api-gateway-kongadmin.kong:8001"
 
 service:

charts/dispatch/charts/event-manager/templates/cluster-role.yaml

@@ -1,5 +1,4 @@
 {{- if .Values.global.rbac.create -}}
-# A cluster role for create/get/list/delete/update secrets
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:

charts/dispatch/charts/event-manager/templates/config-map.yaml

@@ -4,11 +4,7 @@ metadata:
   name: {{ template "fullname" . }}
   namespace: {{ .Release.Namespace }}
 data:
-  organization: {{ .Values.global.organization }}
-  config.json: |-
-    {
-      "rabbitmq": {
-        "url": "{{ .Values.queue.rabbitmq.url }}",
-        "exchangeName": "{{ .Values.queue.rabbitmq.exchangeName }}"
-      }
-    }
+  config.yaml: |-
+    ---
+    events:
+      rabbitmq-url: {{ .Values.queue.rabbitmq.url }}