Merge pull request #179 from sirius0xdev/feat/merge-solana-ingester-into-data-service

Merge solana-ingester into data-service

apps/base/customer1/trading-platform/configmaps/data-service-config.yaml

@@ -9,5 +9,10 @@ data:
   DB_NAME: "trading_data"
   REDIS_HOST: "trading-redis.customer1.svc.cluster.local"
   REDIS_PORT: "6379"
+  KAFKA_BROKER: "trading-kafka-kafka-bootstrap.customer1.svc.cluster.local:9092"
   KAFKA_BOOTSTRAP_SERVERS: "trading-kafka-kafka-bootstrap.customer1.svc.cluster.local:9092"
+  KAFKA_GROUP_ID: "data-service-consumer"
+  KAFKA_AUTO_OFFSET_RESET: "latest"
+  HELIUS_RPC_ENDPOINT: "https://mainnet.helius-rpc.com"
+  JUPITER_API_URL: "https://quote-api.jup.ag/v6"
   LOG_LEVEL: "info"

apps/base/customer1/trading-platform/configmaps/kustomization.yaml

@@ -5,5 +5,4 @@ resources:
   - data-service-config.yaml
   - execute-service-config.yaml
   - news-service-config.yaml
-  - solana-ingester-config.yaml
   - dashboard-config.yaml

apps/base/customer1/trading-platform/configmaps/solana-ingester-config.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: trading-solana-ingester-config
-  namespace: customer1
-data:
-  HELIUS_RPC_ENDPOINT: "https://mainnet.helius-rpc.com"
-  JUPITER_API_URL: "https://quote-api.jup.ag/v6"
-  KAFKA_BROKER: "trading-kafka.customer1.svc.cluster.local:9092"
-  KAFKA_TOPIC: "solana-market-data"
-  LOG_LEVEL: "info"

apps/base/customer1/trading-platform/data-service/deployment.yaml

@@ -60,6 +60,16 @@ spec:
                 secretKeyRef:
                   name: trading-db-credentials
                   key: password
+            - name: HELIUS_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: trading-platform-secrets
+                  key: helius-api-key
+            - name: JUPITER_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: trading-platform-secrets
+                  key: jupiter-api-key
           startupProbe:
             httpGet:
               path: /health/ready

apps/base/customer1/trading-platform/kustomization.yaml

@@ -6,7 +6,6 @@ resources:
   - data-service
   - execute-service
   - news-service
-  - solana-ingester
   - dashboard
   - configmaps
   - secrets

apps/base/customer1/trading-platform/solana-ingester/deployment.yaml

@@ -1,81 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: trading-solana-ingester
-  namespace: customer1
-  labels:
-    app: trading-solana-ingester
-spec:
-  replicas: 1
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: trading-solana-ingester
-  template:
-    metadata:
-      labels:
-        app: trading-solana-ingester
-      annotations:
-        checksum/config: trading-solana-ingester-config
-    spec:
-      terminationGracePeriodSeconds: 30
-      securityContext:
-        runAsNonRoot: true
-        runAsUser: 1000
-        fsGroup: 1000
-      containers:
-        - name: solana-ingester
-          image: ghcr.io/sirius0xdev/trading-data-service:latest
-          imagePullPolicy: Always
-          args:
-            - solana-ingester
-          ports:
-            - containerPort: 8002
-              name: http
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi
-            limits:
-              cpu: 500m
-              memory: 512Mi
-          securityContext:
-            allowPrivilegeEscalation: false
-            readOnlyRootFilesystem: true
-            capabilities:
-              drop:
-                - ALL
-          envFrom:
-            - configMapRef:
-                name: trading-solana-ingester-config
-          env:
-            - name: HELIUS_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: trading-platform-secrets
-                  key: helius-api-key
-            - name: JUPITER_API_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: trading-platform-secrets
-                  key: jupiter-api-key
-          startupProbe:
-            httpGet:
-              path: /health
-              port: 8002
-            initialDelaySeconds: 15
-            periodSeconds: 10
-            failureThreshold: 30
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8002
-            initialDelaySeconds: 30
-            periodSeconds: 30
-          readinessProbe:
-            httpGet:
-              path: /health
-              port: 8002
-            initialDelaySeconds: 5
-            periodSeconds: 10

apps/base/customer1/trading-platform/solana-ingester/kustomization.yaml

@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - deployment.yaml
-  - service.yaml

apps/base/customer1/trading-platform/solana-ingester/service.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: trading-solana-ingester
-  namespace: customer1
-  labels:
-    app: trading-solana-ingester
-spec:
-  selector:
-    app: trading-solana-ingester
-  ports:
-    - port: 80
-      targetPort: 8002
-      name: http
-  type: ClusterIP