removed namspace fields and enable check for mysql (#35)

fynarfin · May 22, 2023 · 62e2e8a · 62e2e8a
1 parent 4c12ca9
commit 62e2e8a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 18 deletions.
diff --git a/helm/fineract/Chart.yaml b/helm/fineract/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: v2
 appVersion: "1.0.0"
 description: Fineract Engine
 name: fin-engine
@@ -8,5 +8,5 @@ dependencies:
  version: 11.5.0
  repository: "https://charts.bitnami.com/bitnami"
  alias: mysql
- condition: mysql.enabled
+ condition: mariadb.enabled, mysql.enabled
 
diff --git a/helm/fineract/templates/fineract-mifoscommunity-deployment.yml b/helm/fineract/templates/fineract-mifoscommunity-deployment.yml
@@ -23,7 +23,6 @@ metadata:
  labels:
  app: mifos-community
  name: mifos-community
- namespace: {{ .Values.namespace }}
 spec:
  ports:
  - protocol: TCP
@@ -40,7 +39,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: mifos-community
- namespace: {{ .Values.namespace }}
  labels:
  app: mifos-community
 spec:
@@ -91,7 +89,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: mifos-community
- namespace: "{{ .Values.namespace }}"
  annotations:
 {{- if .Values.communityapp.ingress.annotations }}
 {{ toYaml .Values.communityapp.ingress.annotations | indent 4 }}

diff --git a/helm/fineract/templates/fineract-server-deployment.yml b/helm/fineract/templates/fineract-server-deployment.yml
@@ -16,14 +16,13 @@
 # under the License.
 #
 
-
+{{- if .Values.fineract.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
  labels:
  app: fineract-server
  name: fineract-server
- namespace: "{{ .Values.namespace }}"
 spec:
  ports:
  - protocol: TCP
@@ -40,7 +39,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: fineract-server
- namespace: "{{ .Values.namespace }}"
  labels:
  app: fineract-server
 spec:
@@ -124,7 +122,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: fineract-server
- namespace: "{{ .Values.namespace }}"
  annotations:
 {{- if .Values.fineract.ingress.annotations }}
 {{ toYaml .Values.fineract.ingress.annotations | indent 4 }}
@@ -151,9 +148,9 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: fineract-tenants-db-secret
- namespace: "{{ .Values.namespace }}"
 type: Opaque
 data:
  username: "bWlmb3M="
  password: "cGFzc3dvcmQ="
+{{- end}}
 
diff --git a/helm/fineract/templates/web-app-deployment.yml b/helm/fineract/templates/web-app-deployment.yml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: web-app-deployment
- namespace: "{{ .Values.namespace }}"
  labels:
  app: web-app
 spec:

diff --git a/helm/fineract/templates/web-app-service.yml b/helm/fineract/templates/web-app-service.yml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
  name: webapp
- namespace: {{ .Values.namespace }}
 spec:
  ports:
  - protocol: TCP
@@ -19,7 +18,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: webapp
- namespace: {{ .Values.namespace }}
  annotations:
 {{- if .Values.webapp.ingress.annotations }}
 {{ toYaml .Values.webapp.ingress.annotations | indent 4 }}
@@ -35,7 +33,7 @@ spec:
  service:
  name: webapp
  port: 
- namespace: "{{ .Values.namespace }}"  number: 80
+ number: 80
  tls:
  - hosts:
  - "{{ .Values.wildcardhostname }}"

diff --git a/helm/fineract/templates/web-self-service-app-deployment.yml b/helm/fineract/templates/web-self-service-app-deployment.yml
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: self-service
- namespace: "{{ .Values.namespace }}"
  labels:
  app: self-service
 spec:

diff --git a/helm/fineract/templates/web-self-service-app-service.yml b/helm/fineract/templates/web-self-service-app-service.yml
@@ -3,7 +3,6 @@ apiVersion: v1
 kind: Service
 metadata:
  name: self-service
- namespace: "{{ .Values.namespace }}"
 spec:
  ports:
  - protocol: TCP
@@ -19,7 +18,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
  name: selfservice
- namespace: "{{ .Values.namespace }}"
  annotations:
 {{- if .Values.selfservice.ingress.annotations }}
 {{ toYaml .Values.selfservice.ingress.annotations | indent 4 }}

diff --git a/helm/fineract/values.yaml b/helm/fineract/values.yaml
@@ -1,5 +1,5 @@
-namespace: "fineract"
 fineract:
+ enabled: true
  db: fineract-mysql
  DFSPIDS: ""
  SPRING_PROFILES_ACTIVE: "bb"
@@ -78,6 +78,7 @@ selfservice:
 
 
 mysql:
+ fullnameOverride: fineract-mysql
  enabled: false
  image:
  tag: "10.5.16-debian-11-r22"