Checkpoint 10-24 fill in structure more, a couple more services need …

…refactoring

Signed-off-by: Tanner Lewis <lewijacn@amazon.com>

deployment/k8/migration-assistant/Chart.lock

@@ -1,9 +1,15 @@
 dependencies:
+- name: opensearch
+  repository: https://opensearch-project.github.io/helm-charts/
+  version: 2.23.1
+- name: kafka-op
+  repository: file://../services/kafka-op
+  version: 0.1.0
 - name: migration-console
   repository: file://../services/migration-console
   version: 0.1.0
 - name: capture-proxy
   repository: file://../services/capture-proxy
   version: 0.1.0
-digest: sha256:7897ada3193d874398b7fdc67a8f45eeb650302c190fe07ef9b29494d678e2f2
-generated: "2024-10-23T20:35:14.098691-05:00"
+digest: sha256:3dcd125d6e968ddfc212318128d5f4222822bf33d0593f061f3c2eed40cea144
+generated: "2024-10-24T15:36:04.42393-05:00"

deployment/k8/migration-assistant/Chart.yaml

@@ -5,21 +5,26 @@ dependencies:
 #  - name: elasticsearch
 #    version: "0.1.0"
 #    repository: "file://../services/elasticsearch"
-#  - name: opensearch-helm
-#    version: "0.1.0"
-#    repository: "file://../services/opensearch-helm"
-#  - name: kafka-op
-#    version: "0.1.0"
-#    repository: "file://../services/kafka-op"
+  - name: opensearch
+    version: "2.23.1"
+    repository: "https://opensearch-project.github.io/helm-charts/"
+    alias: opensearch-helm
+    condition: opensearch-helm-enabled
+  - name: kafka-op
+    version: "0.1.0"
+    repository: "file://../services/kafka-op"
+    condition: kafka-op-enabled
   - name: migration-console
     version: "0.1.0"
     repository: "file://../services/migration-console"
+    condition: migration-console-enabled
 #  - name: replayer
 #    version: "0.1.0"
 #    repository: "file://../services/replayer"
   - name: capture-proxy
     version: "0.1.0"
     repository: "file://../services/capture-proxy"
+    condition: capture-proxy-enabled
 #  - name: reindex-from-snapshot
 #    version: "0.1.0"
 #    repository: "file://../services/reindex-from-snapshot"
@@ -29,12 +34,3 @@ dependencies:
 #  - name: snapshot-vol
 #    version: "0.1.0"
 #    repository: "file://../services/shared/snapshot-vol"
-#  - name: jaeger
-#    version: "0.1.0"
-#    repository: "file://../services/jaeger"
-#  - name: prometheus
-#    version: "0.1.0"
-#    repository: "file://../services/prometheus"
-#  - name: grafana
-#    version: "0.1.0"
-#    repository: "file://../services/grafana"

deployment/k8/migration-assistant/values.yaml

@@ -1,6 +1,11 @@
+# Define all enabled/disabled migration services
+migration-console-enabled: false
+capture-proxy-enabled: false
+kafka-op-enabled: true
+opensearch-helm-enabled: false
 
+# Define migration service configuration
 migration-console:
-  enabled: true
   replicaCount: 1
   image:
     repository: migrations/migration_console
@@ -36,7 +41,6 @@ migration-console:
       mountPath: /storage
 
 capture-proxy:
-  enabled: true
   replicaCount: 1
   image:
     repository: migrations/capture_proxy
@@ -63,3 +67,26 @@ capture-proxy:
       cpu: 100m
       memory: 128Mi
 
+kafka-op:
+  clusterName: kafka-cluster
+  kafkaVersion: 3.8.0
+  kafkaMetadataVersion: 3.8-IV0
+  nodePool:
+    replicas: 1
+    volume:
+      size: 10Gi
+      deleteClaim: true
+
+opensearch-helm:
+  fullnameOverride: "opensearch"
+  image:
+    tag: "2.17.0"
+  replicas: 1
+  singleNode: true
+  config:
+    discovery.type: single-node
+  extraEnvs:
+    - name: OPENSEARCH_INITIAL_ADMIN_PASSWORD
+      value: myStrongPassword123!
+  service:
+    type: LoadBalancer

deployment/k8/services/capture-proxy/values.yaml

@@ -1,3 +1 @@
 # Default values for capture proxy.
-
-enabled: false

deployment/k8/services/common-lib/templates/_deployment.yaml

@@ -1,5 +1,4 @@
 {{- define "common-lib.deployment.yml" -}}
-{{- if .Values.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -61,4 +60,3 @@ spec:
           {{- end }}
         {{- end }}
 {{- end }}
-{{- end -}}

deployment/k8/services/common-lib/templates/_service.yaml

@@ -1,5 +1,4 @@
 {{- define "common-lib.service.yml" -}}
-{{- if .Values.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -15,4 +14,3 @@ spec:
   selector:
     app: {{ .Chart.Name }}
 {{- end }}
-{{- end -}}