fix: sync the Helm chart with the source of truth in the UI repo (#56)

Signed-off-by: Harikrishnan Balagopal <[email protected]>

Author: HarikrishnanBalagopal

helm-charts/move2kube/templates/auth-server-service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.deployment.authServer.enable }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,3 +13,4 @@ spec:
       targetPort: 8080
   selector:
     move2kube.konveyor.io/service: "{{ .Release.Name }}-auth-server"
+{{- end }}

helm-charts/move2kube/templates/database-service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.deployment.database.enable }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,3 +11,4 @@ spec:
       targetPort: 5432
   selector:
     move2kube.konveyor.io/service: "{{ .Release.Name }}-database"
+{{- end }}

helm-charts/move2kube/templates/move2kube-api-stateful-set.yaml

@@ -21,31 +21,45 @@ spec:
           image: quay.io/konveyor/busybox
           command: ["/bin/sh", "-c"]
           args:
-            - chown -R 12345:root /move2kube-api/data && chmod -R 770 /move2kube-api/data
+            - 'chown -R "$(id -u)":root /move2kube-api/data && chmod -R 770 /move2kube-api/data'
           volumeMounts:
             - name: common-volume
               mountPath: /move2kube-api/data
               subPath: move2kube-api/data
       containers:
-        - image: "quay.io/konveyor/move2kube-ui:{{ .Values.deployment.api.imageTag | default .Chart.AppVersion }}"
+        - name: move2kubeapi
+          image: "quay.io/konveyor/move2kube-ui:{{ .Values.deployment.api.imageTag | default .Chart.AppVersion }}"
           command:
             - move2kube-api
           args:
-            - --config=config.yaml
+            - '--log-level=trace'
+            - '--static-files-dir=build'
+            {{- if .Values.secret.api.enable }}
+            - '--config=config.yaml'
+            {{- end }}
+            - '--host=$(MY_POD).$(MY_SERVICE)'
           imagePullPolicy: Always
-          name: move2kubeapi
           ports:
             - containerPort: 8080
               protocol: TCP
+          env:
+            - name: MY_POD
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: MY_SERVICE
+              value: "{{ .Release.Name }}-move2kubeapiheadless"
           {{- if .Values.deployment.api.privilegedPods }}
           securityContext:
             privileged: true
           {{- end }}
           volumeMounts:
+            {{- if .Values.secret.api.enable }}
             - name: api-config
               mountPath: /move2kube-api/config.yaml
               subPath: config.yaml
               readOnly: true
+            {{- end }}
             - name: common-volume
               mountPath: /move2kube-api/data
               subPath: move2kube-api/data

helm-charts/move2kube/values.yaml

@@ -20,7 +20,7 @@ ingress:
   enable: true
   preferRoute: false # if true we will use an Openshift Route instead of an K8s Ingress
   host: mydomain.com
-  tlsSecretName: myTLSSecret # not necessary when using Openshift Route
+  tlsSecretName: "" # not necessary when using Openshift Route
 persistentVolumeClaim:
   enable: false # set this to true to get persistent storage
   createNew: true