Update ff changes to dev-5.2.0 (#407)

* test imagetsream * update the formsflow-ai-charts folder with 5.2.0v * commiting new ff changes * merge comments resolved * removing the secrets * removing the secrets * removing code owners * deleting the file
bcgov · Jul 31, 2023 · bf9249e · bf9249e
1 parent 24aca83
commit bf9249e
Show file tree

Hide file tree

Showing 70 changed files with 951 additions and 168 deletions.
diff --git a/openshift/forms-flow-ai-charts/.github/workflows/package.yaml b/openshift/forms-flow-ai-charts/.github/workflows/package.yaml
@@ -0,0 +1,32 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      - name: Package Formsflow 
+        uses: helm/[email protected]
+        with:
+          charts_dir: charts
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-admin/templates/deployment.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-admin/templates/deployment.yaml
@@ -158,3 +158,5 @@ spec:
         stdin: true
         tty: true
       restartPolicy: Always
+      imagePullSecrets:
+      - name: "{{ .Chart.Name }}"
diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-admin/templates/ingress.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-admin/templates/ingress.yaml
@@ -4,15 +4,24 @@ metadata:
   labels:
     app: {{ .Chart.Name }}
   name: {{ .Chart.Name }}
+  annotations:
+{{ toYaml .Values.ingress.annotations | indent 4 }}
 spec:
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- if or (and .Values.ingress.tls (or ( dict "annotations" .Values.ingress.annotations ) .Values.ingress.selfSigned .Values.ingress.secrets )) .Values.ingress.extraTls }}
   tls:
-    - {}
+  {{- if and .Values.ingress.tls (or ( dict "annotations" .Values.ingress.annotations ) .Values.ingress.secrets .Values.ingress.selfSigned) }}
+    - hosts:
+        - {{ (tpl .Values.ingress.hostname .) | quote }}
+      secretName: {{ printf "%s-tls" (tpl .Values.ingress.hostname .) }}
+    {{- end }}
+  {{- end }}
   rules:
     -
-      host: "{{tpl .Values.ingress.hostname .}}"
+      host: "{{ tpl .Values.ingress.hostname .}}"
       http:
         paths:
-          - path: {{ .Values.ingress.path }}
+          - path: /
             pathType: Prefix
             backend:
               service:

diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-admin/templates/secret.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-admin/templates/secret.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    app: "{{ .Chart.Name }}"
+  name: "{{ .Chart.Name }}"
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: **"MUST CHANGE"**
diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-admin/values.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-admin/values.yaml
@@ -1,7 +1,7 @@
 ---
 Domain: #<DEFINE ME>
 postgresql:
-  url: "postgresql://postgres:postgres@forms-flow-ai-postgresql:5432/{{.Chart.Name}}"
+  url: "postgresql://postgres:postgres@forms-flow-ai-postgresql-ha-pgpool:5432/{{.Chart.Name}}"
 
 resources:
   limits:
@@ -17,13 +17,24 @@ formsflow:
   analytics: forms-flow-analytics #name of analytics component 
 
 
-ingress: 
+ingress:
+  ingressClassName: ""
+  annotations:
+#    kubernetes.io/ingress.class: nginx
   enabled: true # create an ingress for this component 
   hostname: "{{.Chart.Name}}-{{.Release.Namespace}}.{{tpl .Values.Domain .}}"
   port: 5000
+  tls: true
+  selfSigned: false
+  extraTls:
+   - {}
+#    - secretName: "{{.Chart.Name}}-{{.Release.Namespace}}.{{tpl .Values.Domain .}}-tls"
+#      hosts:
+#        - "{{.Chart.Name}}-{{.Release.Namespace}}.{{tpl .Values.Domain .}}"
   path: /
 
 image:
   registry: docker.io
   repository: formsflow/forms-flow-ai-admin
-  tag: v5.0.1 #The image tag to pull from
+  tag: v5.1.0 #The image tag to pull from
+
diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-ai/Chart.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-ai/Chart.yaml
@@ -2,13 +2,12 @@
 apiVersion: v2
 name: forms-flow-ai
 dependencies:
-  - name: postgresql
-    condition: postgresql.enabled 
-    repository: https://charts.bitnami.com/bitnami/postgresql
-    version: 11.6.15
+  - name: postgresql-ha 
+    repository: https://charts.bitnami.com/bitnami
+    version: 10.0.9
   - name: mongodb
     condition: mongodb.enabled 
-    repository: https://charts.bitnami.com/bitnami/mongodb
-    version: 11.1.10
+    repository: https://charts.bitnami.com/bitnami
+    version: 13.6.3
 version: v2.1.5
 icon: "https://raw.githubusercontent.com/AOT-Technologies/forms-flow-ai/develop/.images/logo.png"
diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-ai/templates/configmap.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-ai/templates/configmap.yaml
@@ -4,9 +4,9 @@ kind: ConfigMap
 metadata:
   name: {{ .Chart.Name }}
 data:
-  DATABASE_NAME: {{ ternary (tpl .Values.postgresql.auth.database .) "<DEFINE_ME>" .Values.postgresql.enabled | quote }}
-  DATABASE_PORT: {{ ternary .Values.postgresql.primary.service.ports.postgresql "<DEFINE_ME>" .Values.postgresql.enabled | quote }}
-  DATABASE_SERVICE_NAME: {{ ternary (tpl .Values.postgresql.fullnameOverride .) "<DEFINE_ME>" .Values.postgresql.enabled | quote }}
+  DATABASE_NAME: {{ ternary (tpl .Values.formsflowdb.postgresql.database .) "<DEFINE_ME>" .Values.formsflowdb.postgresql.enabled | quote }}
+  DATABASE_PORT: {{ ternary .Values.formsflowdb.service.ports.postgresql "<DEFINE_ME>" .Values.formsflowdb.postgresql.enabled | quote }}
+  DATABASE_SERVICE_NAME: {{ ternary (tpl .Values.formsflowdb.postgresql.fullnameOverride .) "<DEFINE_ME>" .Values.formsflowdb.postgresql.enabled | quote }}
   BPM_API_URL: https://forms-flow-bpm-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}/camunda
   KEYCLOAK_JWT_OIDC_ALGORITHMS: "RS256"
   KEYCLOAK_JWT_OIDC_CACHING_ENABLED: "True"
@@ -20,9 +20,9 @@ data:
   FORMIO_URL: https://forms-flow-forms-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}
   FORMIO_DOMAIN: https://forms-flow-forms-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}
   WEB_API_URL: https://forms-flow-api-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}
-  MONGODB_URI:  {{ ternary (tpl "mongodb://{{ .Values.mongodb.auth.usernames | first }}:{{ .Values.mongodb.auth.passwords | first }}@{{ .Values.mongodb.service.nameOverride }}:{{ .Values.mongodb.service.port }}/{{ .Values.mongodb.auth.databases | first }}" .) "<DEFINE_ME>" .Values.mongodb.enabled | quote }} 
+  MONGODB_URI:  {{ ternary (tpl "mongodb://{{ .Values.mongodb.auth.usernames | first }}:{{ .Values.mongodb.auth.passwords | first }}@{{ .Values.mongodb.service.nameOverride }}:{{ .Values.mongodb.service.ports.mongodb }}/{{ .Values.mongodb.auth.databases | first }}" .) "<DEFINE_ME>" .Values.mongodb.enabled | quote }} 
   {{- if .Values.mongodb.enabled }} 
-  NODE_CONFIG: '{"mongo":"mongodb://{{ .Values.mongodb.auth.usernames | first }}:{{ .Values.mongodb.auth.passwords | first }}@{{ .Values.mongodb.service.nameOverride }}:{{ .Values.mongodb.service.port }}/{{ .Values.mongodb.auth.databases | first }}"}'
+  NODE_CONFIG: '{"mongo":"mongodb://{{ .Values.mongodb.auth.usernames | first }}:{{ .Values.mongodb.auth.passwords | first }}@{{ .Values.mongodb.service.nameOverride }}:{{ .Values.mongodb.service.ports.mongodb }}/{{ .Values.mongodb.auth.databases | first }}"}'
   {{- else }}
   NODE_CONFIG: "<DEFINE_ME>"
   {{- end }}
@@ -31,7 +31,7 @@ data:
   FORMSFLOW_ADMIN_BASE: https://forms-flow-admin-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}/api
   MODEL_ID: "Seethal/sentiment_analysis_generic_dataset"
   INSIGHT_API_URL: https://forms-flow-analytics-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}
-  KEYCLOAK_ENABLE_CLIENT_AUTH: "True"
+  KEYCLOAK_ENABLE_CLIENT_AUTH: "false"
   MULTI_TENANCY_ENABLED: "False"
   DATA_ANALYSIS_URL:  https://forms-flow-data-analysis-{{.Release.Namespace}}.{{tpl (.Values.Domain) .}}
   NODE_ENV: "production"
@@ -44,5 +44,5 @@ data:
   REDIS_HOST: "{{.Values.redis_host}}"
   REDIS_PORT: "{{.Values.redis_port}}"
   REDIS_ENABLED: "false"
-
+  CHROME_DRIVER_PATH: "/usr/local/bin/chromedriver"
 
diff --git a/openshift/forms-flow-ai-charts/charts/forms-flow-ai/templates/secret.yaml b/openshift/forms-flow-ai-charts/charts/forms-flow-ai/templates/secret.yaml
@@ -15,3 +15,13 @@ stringData:
   ADMIN_WEB_CLIENTID: {{ index .Values "forms-flow-web" "clientid"}}
   INSIGHT_API_KEY:  "{{.Values.insight_api_key}}"
   REDIS_PASSCODE: "{{.Values.redis_pass_code}}"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  labels:
+    app: {{ .Chart.Name }}-auth
+  name: {{ .Chart.Name }}-auth
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ index .Values "forms-flow-auth" "imagesecret" }}