Revert "translate env vars for k8s"

This reverts commit 4071ba232a96af7ecada44b04c1466f8a98cfe7f.

19 files changed, 41 insertions, 177 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index 434d3721..76fa0f3d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,8 @@
 version: '3.6'
 services:
   ui:
+    depends_on:
+      - app
     container_name: ui
     image: asoltys/coinos-ui
     ports:
@@ -8,6 +10,8 @@ services:
     environment:
       NODE_ENV: production
   app:
+    depends_on:
+      - maria
     container_name: app
     image: asoltys/coinos-server
     ports:
@@ -75,6 +79,8 @@ services:
       - 0.0.0.0:60401
       - --cors
       - "*"
+    depends_on:
+      - liquid
     ports:
       - ${LIQUID_ELECTRS_RPC_PORT}:60401
       - ${LIQUID_ELECTRS_PORT}:3002
diff --git a/k8s/app-deployment.yaml b/k8s/app-deployment.yaml
index 8dc491fa..c3a4ed2b 100644
--- a/k8s/app-deployment.yaml
+++ b/k8s/app-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
diff --git a/k8s/app-service.yaml b/k8s/app-service.yaml
index 38a3b515..e23d7abf 100644
--- a/k8s/app-service.yaml
+++ b/k8s/app-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
diff --git a/k8s/bitcoin-deployment.yaml b/k8s/bitcoin-deployment.yaml
index 2192ece4..21ae250f 100644
--- a/k8s/bitcoin-deployment.yaml
+++ b/k8s/bitcoin-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
diff --git a/k8s/bitcoin-service.yaml b/k8s/bitcoin-service.yaml
index 1d6a6c12..eac299be 100644
--- a/k8s/bitcoin-service.yaml
+++ b/k8s/bitcoin-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
diff --git a/k8s/docker-compose-resolved.yaml b/k8s/docker-compose-resolved.yaml
deleted file mode 100644
index 8ec00d5e..00000000
--- a/k8s/docker-compose-resolved.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-services:
-  app:
-    container_name: app
-    environment:
-      NODE_ENV: development
-    image: asoltys/coinos-server
-    ports:
-    - published: 3119
-      target: 3119
-    volumes:
-    - /home/adam/coinos-server:/app:rw
-  bitcoin:
-    container_name: bitcoin
-    image: asoltys/bitcoin:latest
-    ports:
-    - published: 18442
-      target: 18442
-    - published: 18443
-      target: 18443
-    restart: unless-stopped
-    volumes:
-    - /home/adam/coinos-server/config/bitcoin:/config:rw
-  electrs-liquid:
-    command:
-    - -vvvv
-    - --parent-network
-    - regtest
-    - --network
-    - liquidregtest
-    - --daemon-dir
-    - /config
-    - --daemon-rpc-addr
-    - liquid:7040
-    - --cookie
-    - admin1:123
-    - --http-addr
-    - 0.0.0.0:3002
-    - --electrum-rpc-addr
-    - 0.0.0.0:60401
-    - --cors
-    - '*'
-    container_name: electrs-liquid
-    entrypoint:
-    - /build/electrs
-    image: vulpemventures/electrs-liquid:latest
-    ports:
-    - published: 3013
-      target: 3002
-    - published: 60402
-      target: 60401
-    restart: unless-stopped
-    volumes:
-    - /home/adam/coinos-server/liquid:/config:rw
-  esplora-liquid:
-    container_name: esplora-liquid
-    environment:
-      API_URL: http://localhost:3012
-      IS_ELEMENTS: 1
-      NATIVE_ASSET_ID: 5ac9f65c0efcc4775e0baec4ec03abdde22473cd3cf33c0419ca290e0751b225
-    image: vulpemventures/esplora:latest
-    ports:
-    - published: 5006
-      target: 5000
-    restart: unless-stopped
-  la:
-    container_name: la
-    environment:
-      LIGHTNINGD_NETWORK: regtest
-    image: elementsproject/lightningd:latest
-    restart: unless-stopped
-    volumes:
-    - /home/adam/coinos-server/config/lightning:/root/.lightning:rw
-  lb:
-    container_name: lb
-    environment:
-      LIGHTNINGD_NETWORK: regtest
-    image: elementsproject/lightningd:latest
-    restart: unless-stopped
-    volumes:
-    - /home/adam/coinos-server/config/lightningb:/root/.lightning:rw
-  liquid:
-    container_name: liquid
-    image: asoltys/liquid:latest
-    ports:
-    - published: 7040
-      target: 7040
-    - published: 18444
-      target: 18444
-    - published: 18602
-      target: 18602
-    - published: 18603
-      target: 18603
-    restart: unless-stopped
-    volumes:
-    - /home/adam/coinos-server/config/liquid:/config:rw
-  maria:
-    container_name: mariadb
-    environment:
-      MARIADB_ROOT_PASSWORD: password
-    image: mariadb:10.6.1
-    ports:
-    - published: 3307
-      target: 3306
-    restart: always
-    volumes:
-    - /home/adam/coinos-server/mysql:/var/lib/mysql:rw
-  ui:
-    container_name: ui
-    environment:
-      NODE_ENV: development
-    image: asoltys/coinos-ui
-    ports:
-    - published: 8085
-      target: 8085
-    volumes:
-    - /home/adam/coinos-ui:/coinos:rw
-version: '3.6'
-
diff --git a/k8s/electrs-liquid-deployment.yaml b/k8s/electrs-liquid-deployment.yaml
index e33098f2..186f468d 100644
--- a/k8s/electrs-liquid-deployment.yaml
+++ b/k8s/electrs-liquid-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
@@ -48,8 +48,8 @@ spec:
           image: vulpemventures/electrs-liquid:latest
           name: electrs-liquid
           ports:
-            - containerPort: 3002
             - containerPort: 60401
+            - containerPort: 3002
           resources: {}
           volumeMounts:
             - mountPath: /config
diff --git a/k8s/electrs-liquid-service.yaml b/k8s/electrs-liquid-service.yaml
index 83e57bd1..89289c9b 100644
--- a/k8s/electrs-liquid-service.yaml
+++ b/k8s/electrs-liquid-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -10,12 +10,12 @@ metadata:
   name: electrs-liquid
 spec:
   ports:
-    - name: "3013"
-      port: 3013
-      targetPort: 3002
-    - name: "60402"
-      port: 60402
+    - name: "60401"
+      port: 60401
       targetPort: 60401
+    - name: "3002"
+      port: 3002
+      targetPort: 3002
   selector:
     io.kompose.service: electrs-liquid
 status:
diff --git a/k8s/esplora-liquid-deployment.yaml b/k8s/esplora-liquid-deployment.yaml
index 4606a416..3d9c4204 100644
--- a/k8s/esplora-liquid-deployment.yaml
+++ b/k8s/esplora-liquid-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -17,7 +17,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
@@ -26,7 +26,6 @@ spec:
       containers:
         - env:
             - name: API_URL
-              value: http://localhost:3012
             - name: IS_ELEMENTS
               value: "1"
             - name: NATIVE_ASSET_ID
diff --git a/k8s/esplora-liquid-service.yaml b/k8s/esplora-liquid-service.yaml
index 17875690..530f2d96 100644
--- a/k8s/esplora-liquid-service.yaml
+++ b/k8s/esplora-liquid-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -10,8 +10,8 @@ metadata:
   name: esplora-liquid
 spec:
   ports:
-    - name: "5006"
-      port: 5006
+    - name: "5000"
+      port: 5000
       targetPort: 5000
   selector:
     io.kompose.service: esplora-liquid
diff --git a/k8s/la-deployment.yaml b/k8s/la-deployment.yaml
index a42eee8c..2446eb36 100644
--- a/k8s/la-deployment.yaml
+++ b/k8s/la-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
diff --git a/k8s/lb-deployment.yaml b/k8s/lb-deployment.yaml
index 064df112..40f2462d 100644
--- a/k8s/lb-deployment.yaml
+++ b/k8s/lb-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
diff --git a/k8s/liquid-deployment.yaml b/k8s/liquid-deployment.yaml
index 006a06e6..560e14e1 100644
--- a/k8s/liquid-deployment.yaml
+++ b/k8s/liquid-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
diff --git a/k8s/liquid-service.yaml b/k8s/liquid-service.yaml
index d3b56800..7ed4a542 100644
--- a/k8s/liquid-service.yaml
+++ b/k8s/liquid-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
diff --git a/k8s/maria-deployment.yaml b/k8s/maria-deployment.yaml
index 75d6153f..2d2de2a1 100644
--- a/k8s/maria-deployment.yaml
+++ b/k8s/maria-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -18,7 +18,7 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
@@ -27,7 +27,6 @@ spec:
       containers:
         - env:
             - name: MARIADB_ROOT_PASSWORD
-              value: password
           image: mariadb:10.6.1
           name: mariadb
           ports:
diff --git a/k8s/maria-service.yaml b/k8s/maria-service.yaml
index 31789fe1..f4b7841b 100644
--- a/k8s/maria-service.yaml
+++ b/k8s/maria-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
diff --git a/k8s/ui-claim0-persistentvolumeclaim.yaml b/k8s/ui-claim0-persistentvolumeclaim.yaml
deleted file mode 100644
index aafbd9b4..00000000
--- a/k8s/ui-claim0-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: ui-claim0
-  name: ui-claim0
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/k8s/ui-deployment.yaml b/k8s/ui-deployment.yaml
index 86912390..363808ce 100644
--- a/k8s/ui-deployment.yaml
+++ b/k8s/ui-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels:
@@ -13,12 +13,11 @@ spec:
   selector:
     matchLabels:
       io.kompose.service: ui
-  strategy:
-    type: Recreate
+  strategy: {}
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+        kompose.cmd: kompose convert
         kompose.version: 1.22.0 (955b78124)
       creationTimestamp: null
       labels:
@@ -27,18 +26,11 @@ spec:
       containers:
         - env:
             - name: NODE_ENV
-              value: development
+              value: production
           image: asoltys/coinos-ui
           name: ui
           ports:
             - containerPort: 8085
           resources: {}
-          volumeMounts:
-            - mountPath: /coinos
-              name: ui-claim0
       restartPolicy: Always
-      volumes:
-        - name: ui-claim0
-          persistentVolumeClaim:
-            claimName: ui-claim0
 status: {}
diff --git a/k8s/ui-service.yaml b/k8s/ui-service.yaml
index 21019ff6..52029050 100644
--- a/k8s/ui-service.yaml
+++ b/k8s/ui-service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    kompose.cmd: kompose convert -f docker-compose-resolved.yaml
+    kompose.cmd: kompose convert
     kompose.version: 1.22.0 (955b78124)
   creationTimestamp: null
   labels: