From 9d91629479df04890b75b12c28d676b5b0a5e5e5 Mon Sep 17 00:00:00 2001
From: Konstantin Skaburskas <konstantin.skaburskas@gmail.com>
Date: Sun, 1 Dec 2024 22:25:54 +0100
Subject: [PATCH] refactor: remove data gw and system manager from Helm chart

---
 helm/templates/data-gateway-configmap.yaml    |  9 ---
 helm/templates/data-gateway-deployment.yaml   | 40 -------------
 helm/templates/data-gateway-service.yaml      | 14 -----
 helm/templates/system-manager-deployment.yaml | 58 -------------------
 helm/values.yaml                              |  7 ---
 5 files changed, 128 deletions(-)
 delete mode 100644 helm/templates/data-gateway-configmap.yaml
 delete mode 100644 helm/templates/data-gateway-deployment.yaml
 delete mode 100644 helm/templates/data-gateway-service.yaml
 delete mode 100644 helm/templates/system-manager-deployment.yaml

diff --git a/helm/templates/data-gateway-configmap.yaml b/helm/templates/data-gateway-configmap.yaml
deleted file mode 100644
index 138e8a1..0000000
--- a/helm/templates/data-gateway-configmap.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: data-gateway
-  namespace: {{ include "nuvlaedge.namespace" . }}
-data:
-  mosquitto.conf: |-
-    port 1883
-    allow_anonymous true
diff --git a/helm/templates/data-gateway-deployment.yaml b/helm/templates/data-gateway-deployment.yaml
deleted file mode 100644
index 6592774..0000000
--- a/helm/templates/data-gateway-deployment.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: data-gateway
-  namespace: {{ include "nuvlaedge.namespace" . }}
-  labels:
-    {{- include "nuvlaedge.labels" . | nindent 4 }}
-spec:
-  selector:
-    matchLabels:
-      component: data-gateway
-  revisionHistoryLimit: {{ .Values.deploymentRevHistLimit }} 
-  template:
-    metadata:
-      labels:
-        component: data-gateway
-        {{- include "nuvlaedge.labels" . | nindent 8 }}
-    spec:
-      serviceAccountName: {{ .Values.serviceAccount.name }}
-      nodeSelector:
-        kubernetes.io/hostname: {{ .Values.kubernetesNode }}
-      containers:
-        - name: data-gateway
-          image: "{{ .Values.nuvlaedge.dataGateway.repository }}:{{ .Values.nuvlaedge.dataGateway.tag }}"
-          imagePullPolicy: {{ .Values.nuvlaedge.pullPolicy }}
-          command:
-            - sh
-            - -c
-            - "sleep 10 && /usr/sbin/mosquitto -c /mosquitto/config/mosquitto.conf"
-          ports:
-            - containerPort: 1883
-          volumeMounts:
-            - mountPath: /mosquitto/config/
-              name: data-gateway-config
-
-      ## VOLUMES
-      volumes:
-        - name: data-gateway-config
-          configMap:
-            name: data-gateway
diff --git a/helm/templates/data-gateway-service.yaml b/helm/templates/data-gateway-service.yaml
deleted file mode 100644
index 2d2fe20..0000000
--- a/helm/templates/data-gateway-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: data-gateway
-  namespace: {{ include "nuvlaedge.namespace" . }}
-  labels:
-    {{- include "nuvlaedge.labels" . | nindent 4 }}
-spec:
-  publishNotReadyAddresses: True
-  ports:
-    - port: 1883
-      targetPort: 1883
-  selector:
-    component: data-gateway
diff --git a/helm/templates/system-manager-deployment.yaml b/helm/templates/system-manager-deployment.yaml
deleted file mode 100644
index 52c1ef9..0000000
--- a/helm/templates/system-manager-deployment.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: system-manager
-  namespace: {{ include "nuvlaedge.namespace" . }}
-  labels:
-    {{- include "nuvlaedge.labels" . | nindent 4 }}
-spec:
-  selector:
-    matchLabels:
-      component: system-manager
-  revisionHistoryLimit: {{ .Values.deploymentRevHistLimit }} 
-  template:
-    metadata:
-      labels:
-        component: system-manager
-        {{- include "nuvlaedge.labels" . | nindent 8 }}
-    spec:
-      serviceAccountName: {{ .Values.serviceAccount.name }}
-      nodeSelector:
-        kubernetes.io/hostname: {{ .Values.kubernetesNode }}
-      containers:
-        - name: system-manager
-          command: ["system-manager"]
-          image: "{{ .Values.nuvlaedge.image.registry }}{{ .Values.nuvlaedge.image.organization }}/{{ .Values.nuvlaedge.image.repository }}:{{ .Values.nuvlaedge.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.nuvlaedge.pullPolicy }}
-          env:
-            - name: SKIP_MINIMUM_REQUIREMENTS
-              value: {{ .Values.SKIP_MINIMUM_REQUIREMENTS | default "False" | quote }}
-            - name: NUVLAEDGE_IMAGE
-              value: {{ .Values.nuvlaedge.image.registry }}{{ .Values.nuvlaedge.image.organization }}/{{ .Values.nuvlaedge.image.repository }}:{{ .Values.nuvlaedge.image.tag | default .Chart.AppVersion }}
-            - name: MY_HOST_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-            - name: MY_NAMESPACE
-              value: {{ include "nuvlaedge.namespace" . }}
-          volumeMounts:
-            - mountPath: /rootfs
-              name: rootfs
-              readOnly: true
-            - mountPath: /srv/nuvlaedge/shared
-              name: nuvlaedge-db
-            - mountPath: /var/lib/nuvlaedge
-              name: nuvlaedge-data
-
-
-      ## VOLUMES
-      volumes:
-        - name: rootfs
-          hostPath:
-            path: /
-        - name: nuvlaedge-data
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}/data
-        - name: nuvlaedge-db
-          hostPath:
-            path: {{ .Values.nuvlaedgeVolumeHostPath }}/{{ include "nuvlaedge.namespace" . }}
diff --git a/helm/values.yaml b/helm/values.yaml
index bc6077d..2e47406 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -1,7 +1,3 @@
-# Default values for nuvlaedge.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
 replicaCount: 1
 
 vpnClientComponentName: vpn-client
@@ -17,9 +13,6 @@ nuvlaedge:
     organization: sixsq
     repository: nuvlaedge
     #tag: "latest"
-  dataGateway:
-    repository: eclipse-mosquitto
-    tag: "2.0.15-openssl"
   pullPolicy: Always
 
 agentConfig: