From 639492e04fb25d56432f0f380d885ddb2193964a Mon Sep 17 00:00:00 2001 From: Apurb Rajdhan <103931815+apurbraj@users.noreply.github.com> Date: Sat, 30 Dec 2023 14:23:34 +0530 Subject: [PATCH] [GOV-83] Enable closed loop (#308) * Connector chart * Bug fix * Indentation fix * addressing review comments * Bug fix * fix * disable connector in phee-engine * Adding variables * Variable name change --- helm/g2p-sandbox/values.yaml | 22 +++++ .../templates/deployment.yaml | 4 + .../connector-bill-pay/values.yaml | 4 + .../connector-bulk-closedloop/Chart.yaml | 5 - .../templates/ingress.yaml | 26 ----- .../connector-bulk-closedloop/values.yaml | 73 -------------- helm/ph-ee-engine/connector-bulk/values.yaml | 2 +- helm/ph-ee-engine/connector/Chart.yaml | 5 + .../connector/templates/clusterrole.yaml | 11 +++ .../templates/clusterrolebinding.yaml | 15 +++ .../templates/deployment.yaml | 45 +++++---- .../connector/templates/ingress.yaml | 49 +++++++++ .../connector/templates/rolebinding.yaml | 15 +++ .../templates/secret.yaml | 4 +- .../templates/service.yaml | 13 ++- .../templates/serviceaccount.yaml | 6 +- helm/ph-ee-engine/connector/values.yaml | 65 ++++++++++++ helm/ph-ee-engine/requirements.yaml | 6 +- helm/ph-ee-engine/values.yaml | 99 ++++--------------- 19 files changed, 248 insertions(+), 221 deletions(-) delete mode 100644 helm/ph-ee-engine/connector-bulk-closedloop/Chart.yaml delete mode 100644 helm/ph-ee-engine/connector-bulk-closedloop/templates/ingress.yaml delete mode 100644 helm/ph-ee-engine/connector-bulk-closedloop/values.yaml create mode 100644 helm/ph-ee-engine/connector/Chart.yaml create mode 100644 helm/ph-ee-engine/connector/templates/clusterrole.yaml create mode 100644 helm/ph-ee-engine/connector/templates/clusterrolebinding.yaml rename helm/ph-ee-engine/{connector-bulk-closedloop => connector}/templates/deployment.yaml (64%) create mode 100644 helm/ph-ee-engine/connector/templates/ingress.yaml create mode 100644 helm/ph-ee-engine/connector/templates/rolebinding.yaml rename helm/ph-ee-engine/{connector-bulk-closedloop => connector}/templates/secret.yaml (65%) rename helm/ph-ee-engine/{connector-bulk-closedloop => connector}/templates/service.yaml (52%) rename helm/ph-ee-engine/{connector-bulk-closedloop => connector}/templates/serviceaccount.yaml (69%) create mode 100644 helm/ph-ee-engine/connector/values.yaml diff --git a/helm/g2p-sandbox/values.yaml b/helm/g2p-sandbox/values.yaml index 10ad8e142..ffff8bab6 100644 --- a/helm/g2p-sandbox/values.yaml +++ b/helm/g2p-sandbox/values.yaml @@ -568,6 +568,26 @@ ph-ee-engine: annotations: deployTime: "{{ .Values.deployTime }}" + connector: + enabled: true + image: docker.io/openmf/ph-ee-connector-bulk:latest + aws: + region: "ap-south-1" + access_key: "aws-access-key" + secret_key: "aws-secret-key" + hostname: "connector.sandbox.mifos.io" + ingress: + enabled: true + annotations: + nginx.ingress.kubernetes.io/access-control-allow-origin: 'true' + nginx.ingress.kubernetes.io/cors-allow-methods: PUT, GET, POST, OPTIONS, DELETE + nginx.ingress.kubernetes.io/cors-allow-origin: '*' + nginx.ingress.kubernetes.io/enable-cors: 'true' + + deployment: + annotations: + deployTime: "{{ .Values.deployTime }}" + account_mapper: enabled: true image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0 @@ -614,3 +634,5 @@ account_mapper: username: mifos password: password + + diff --git a/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml b/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml index 7ef011123..1c80a198f 100644 --- a/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml @@ -55,6 +55,10 @@ spec: value: "{{ .Release.Name }}-zeebe-gateway:26500" - name: "DFSPIDS" value: "{{ .Values.DFSPIDS }}" + - name: "CONNECTOR_CONTACTPOINT" + value: "{{ .Values.connector.contactpoint }}" + - name: "BILLPAY_CONTACTPOINT" + value: "{{ .Values.billpay.contactpoint }}" {{- if .Values.extraEnvs | default .Values.deployment.extraEnvs }} {{ toYaml ( .Values.extraEnvs | default .Values.deployment.extraEnvs ) | indent 10 }} {{- end }} diff --git a/helm/ph-ee-engine/connector-bill-pay/values.yaml b/helm/ph-ee-engine/connector-bill-pay/values.yaml index 0cf89d3db..742672541 100644 --- a/helm/ph-ee-engine/connector-bill-pay/values.yaml +++ b/helm/ph-ee-engine/connector-bill-pay/values.yaml @@ -14,6 +14,10 @@ imageTag: latest imagePullPolicy: "Always" SPRING_PROFILES_ACTIVE: "bb,tenants" LOGGING_LEVEL_ROOT: "INFO" +billpay: + contactpoint: "" +connector: + contactpoint: "" DFSPIDS: "" limits: cpu: "500m" diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/Chart.yaml b/helm/ph-ee-engine/connector-bulk-closedloop/Chart.yaml deleted file mode 100644 index 988e6f6eb..000000000 --- a/helm/ph-ee-engine/connector-bulk-closedloop/Chart.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -description: ph-ee-connector-bulk-closedloop -name: connector_bulk_closedloop -version: 1.0.0 -appVersion: "1.0.0" \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/templates/ingress.yaml b/helm/ph-ee-engine/connector-bulk-closedloop/templates/ingress.yaml deleted file mode 100644 index 5c52bc3ca..000000000 --- a/helm/ph-ee-engine/connector-bulk-closedloop/templates/ingress.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if .Values.ingress.enabled }} -apiVersion: {{ .Values.ingress.apiversion }} -kind: Ingress -metadata: - name: ph-ee-connector-bulk-closedloop - annotations: -{{- if .Values.ingress.annotations }} -{{ toYaml .Values.ingress.annotations | indent 4 }} -{{- end }} -spec: - rules: - - host: "{{ .Values.hostname }}" - http: - paths: - - path: "{{ .Values.ingress.path }}" - pathType: Prefix - backend: -{{- if .Values.ingress.backend }} -{{ toYaml .Values.ingress.backend | indent 14 }} -{{- end }} - - tls: - - hosts: - - "{{ .Values.wildcardhostname }}" - secretName: "{{ .Values.tls }}" -{{- end }} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/values.yaml b/helm/ph-ee-engine/connector-bulk-closedloop/values.yaml deleted file mode 100644 index a36943ae9..000000000 --- a/helm/ph-ee-engine/connector-bulk-closedloop/values.yaml +++ /dev/null @@ -1,73 +0,0 @@ -service: - apiversion: "v1" - -secret: - apiversion: "v1" - -configmap: - apiversion: "v1" - -enabled: true -image: "" -imageTag: "latest" -imagePullPolicy: "" -SPRING_PROFILES_ACTIVE: "" -camel_disable_ssl: true -tenants: "" -application: - bucket_name: "paymenthub-ee-dev" -hostname: "bulk-connector-closedloop.sandbox.mifos.io" -zeebe: - broker: - contactpoint: "" -operations_app: - contactpoint: "https://ops-bk.sandbox.fynarfin.io/" - endpoints: - batch-summary: "/api/v1/batch" - batch-detail: "/api/v1/batch/detail" -mock-payment-schema: - contactpoint: "" - endpoints: - batch-summary: "/mockapi/v1/batch" - batch-detail: "/mockapi/v1/batch/detail" -bulk-processor: - contactpoint: "https://bulk-connector.sandbox.fynarfin.io/" - endpoints: - batch-transaction: "/batchtransactions" -config: - completion_threshold_check: - completion-threshold: 90 - max-retry-count: 5 - wait-timer: PT30S -tenant: "" -aws: - region: "" - access_key: "" - secret_key: "" -limits: - cpu: "500m" - memory: "512M" -requests: - cpu: "100m" - memory: "256M" -wildcardhostname: bulk-connector-closedloop.sandbox.mifos.io -ingress: - apiversion: networking.k8s.io/v1 - enabled: true - className: "kong" - annotations: - kubernetes.io/ingress.class: "nginx" - konghq.com/plugins: cors - tls: - - hosts: "bulk-connector-closedloop.sandbox.mifos.io" - - secretName: sandbox-secret - path: "/" - backend: - service: - name: ph-ee-connector-bulk-closedloop - port: - number: 80 -deployment: - apiVersion: "apps/v1" - annotations: - deployTime: "{{ .Values.deployTime }}" \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk/values.yaml b/helm/ph-ee-engine/connector-bulk/values.yaml index 6a061f2dc..6ba621ce1 100644 --- a/helm/ph-ee-engine/connector-bulk/values.yaml +++ b/helm/ph-ee-engine/connector-bulk/values.yaml @@ -50,7 +50,7 @@ aws: access_key: "" secret_key: "" limits: - cpu: "500m" + cpu: "256m" memory: "512M" requests: cpu: "100m" diff --git a/helm/ph-ee-engine/connector/Chart.yaml b/helm/ph-ee-engine/connector/Chart.yaml new file mode 100644 index 000000000..05a23e2b4 --- /dev/null +++ b/helm/ph-ee-engine/connector/Chart.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +description: ph-ee-connector +name: connector +version: 1.0.0 +appVersion: "1.0.0" \ No newline at end of file diff --git a/helm/ph-ee-engine/connector/templates/clusterrole.yaml b/helm/ph-ee-engine/connector/templates/clusterrole.yaml new file mode 100644 index 000000000..560d9b44a --- /dev/null +++ b/helm/ph-ee-engine/connector/templates/clusterrole.yaml @@ -0,0 +1,11 @@ +{{- if .Values.managedServiceAccount }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + # "namespace" omitted since ClusterRoles are not namespaced + name: ph-ee-connector-c-role +rules: +- apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "watch", "list"] +{{- end -}} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector/templates/clusterrolebinding.yaml b/helm/ph-ee-engine/connector/templates/clusterrolebinding.yaml new file mode 100644 index 000000000..b5ad6355a --- /dev/null +++ b/helm/ph-ee-engine/connector/templates/clusterrolebinding.yaml @@ -0,0 +1,15 @@ +{{- if .Values.managedServiceAccount }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: ph-ee-connector-c-role-binding +subjects: +- kind: ServiceAccount + name: ph-ee-connector # name of your service account + namespace: paymenthub # this is the namespace your service account is in +roleRef: # referring to your ClusterRole + kind: ClusterRole + name: ph-ee-connector-c-role + apiGroup: rbac.authorization.k8s.io + +{{- end -}} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/templates/deployment.yaml b/helm/ph-ee-engine/connector/templates/deployment.yaml similarity index 64% rename from helm/ph-ee-engine/connector-bulk-closedloop/templates/deployment.yaml rename to helm/ph-ee-engine/connector/templates/deployment.yaml index 49b3d9a57..49a71818a 100644 --- a/helm/ph-ee-engine/connector-bulk-closedloop/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector/templates/deployment.yaml @@ -3,29 +3,29 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: ph-ee-connector-bulk-closedloop + name: ph-ee-connector labels: - app: ph-ee-connector-bulk-closedloop + app: ph-ee-connector spec: replicas: {{ .Values.replicas }} selector: matchLabels: - app: ph-ee-connector-bulk-closedloop + app: ph-ee-connector template: metadata: labels: - app: ph-ee-connector-bulk-closedloop + app: ph-ee-connector annotations: {{- if .Values.deployment.annotations }} {{ toYaml .Values.deployment.annotations | indent 8 }} {{- end }} spec: containers: - - name: ph-ee-connector-bulk-closedloop - image: "{{ .Values.image }}:{{ .Values.imageTag }}" - imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" + - name: ph-ee-connector + image: "{{ .Values.image }}" ports: - - containerPort: 5000 + - containerPort: 8080 + imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" resources: limits: memory: "{{ .Values.limits.memory }}" @@ -33,6 +33,7 @@ spec: requests: memory: "{{ .Values.requests.memory }}" cpu: "{{ .Values.requests.cpu }}" + env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}" @@ -40,32 +41,24 @@ spec: value: "{{ .Values.camel_disable_ssl }}" - name: "ZEEBE_BROKER_CONTACTPOINT" value: "{{ .Release.Name }}-zeebe-gateway:26500" - - name: "TENANTS" - value: "{{ .Values.tenants }}" - name: "APPLICATION_BUCKET-NAME" value: "{{ .Values.application.bucket_name }}" - name: "OPERATIONS-APP_CONTACTPOINT" value: "{{ .Values.operations_app.contactpoint }}" - name: "OPERATIONS-APP_ENDPOINTS_BATCH-SUMMARY" - value: "{{ .Values.operations_app.endpoints.batch-summary }}" + value: "{{ .Values.operations_app.endpoints.batch_summary }}" - name: "OPERATIONS-APP_ENDPOINTS_BATCH-DETAIL" - value: "{{ .Values.operations_app.endpoints.batch-detail }}" + value: "{{ .Values.operations_app.endpoints.batch_detail }}" - name: "MOCK-PAYMENT-SCHEMA_CONTACTPOINT" - value: "{{ .Values.mock-payment-schema.contactpoint }}" + value: "{{ .Values.mock_payment_schema.contactpoint }}" - name: "MOCK-PAYMENT-SCHEMA_ENDPOINTS_BATCH-SUMMARY" - value: "{{ .Values.mock-payment-schema.endpoints.batch-summary }}" + value: "{{ .Values.mock_payment_schema.endpoints.batch_summary }}" - name: "MOCK-PAYMENT-SCHEMA_ENDPOINTS_BATCH-DETAIL" - value: "{{ .Values.mock-payment-schema.endpoints.batch-detail }}" + value: "{{ .Values.mock_payment_schema.endpoints.batch_detail }}" - name: "BULK-PROCESSOR_CONTACTPOINT" - value: "{{ .Values.bulk-processor.contactpoint }}" + value: "{{ .Values.bulk_processor.contactpoint }}" - name: "BULK-PROCESSOR_ENDPOINTS_BATCH-TRANSACTION" - value: "{{ .Values.bulk-processor.endpoints.batch-transaction }}" - - name: "CONFIG_COMPLETION-THRESHOLD-CHECK_COMPLETION-THRESHOLD" - value: "{{ .Values.config.completion_threshold_check.completion-threshold }}" - - name: "CONFIG_COMPLETION-THRESHOLD-CHECK_MAX-RETRY-COUNT" - value: "{{ .Values.config.completion_threshold_check.max-retry-count }}" - - name: "CONFIG_COMPLETION-THRESHOLD-CHECK_WAIT-TIMER" - value: "{{ .Values.config.completion_threshold_check.wait-timer }}" + value: "{{ .Values.bulk_processor.endpoints.batch_transaction }}" - name: "TENANT" value: "{{ .Values.global.tenant }}" - name: "CLOUD_AWS_REGION_STATIC" @@ -80,6 +73,12 @@ spec: secretKeyRef: name: "bulk-processor-secret" key: "aws-secret-key" + +{{- if .Values.extraEnvs | default .Values.deployment.extraEnvs }} +{{ toYaml ( .Values.extraEnvs | default .Values.deployment.extraEnvs ) | indent 10 }} +{{- end }} + envFrom: {{ toYaml ( .Values.envFrom | default .Values.deployment.envFrom ) | nindent 12 }} + securityContext: {{ toYaml ( .Values.podSecurityContext | default .Values.deployment.securityContext ) | nindent 12 }} volumeMounts: - name: ph-ee-config mountPath: "/config" diff --git a/helm/ph-ee-engine/connector/templates/ingress.yaml b/helm/ph-ee-engine/connector/templates/ingress.yaml new file mode 100644 index 000000000..690e241f6 --- /dev/null +++ b/helm/ph-ee-engine/connector/templates/ingress.yaml @@ -0,0 +1,49 @@ +{{- if .Values.ingress.enabled -}} +{{- $pathtype := .Values.ingress.pathtype -}} +{{- $ingressPath := .Values.ingress.path -}} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: ph-ee-connector + labels: + app: {{ .Chart.Name }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +{{- with .Values.ingress.annotations }} + annotations: +{{ toYaml . | indent 4 }} +{{- end }} +spec: + {{- if .Values.ingress.className }} + ingressClassName: {{ .Values.ingress.className | quote }} + {{- end }} +{{- if .Values.ingress.tls }} + tls: + {{- if .ingressPath }} + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- else }} +{{ toYaml .Values.ingress.tls | indent 4 }} + {{- end }} +{{- end}} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + pathType: {{ $pathtype }} + backend: + service: + name: {{ .backend.service.name}} + port: + number: {{ .backend.service.port.number}} + {{- end }} + {{- end }} + {{- end }} diff --git a/helm/ph-ee-engine/connector/templates/rolebinding.yaml b/helm/ph-ee-engine/connector/templates/rolebinding.yaml new file mode 100644 index 000000000..68eea9b8b --- /dev/null +++ b/helm/ph-ee-engine/connector/templates/rolebinding.yaml @@ -0,0 +1,15 @@ +{{- if .Values.managedServiceAccount }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: ph-ee-operator-role-binding + namespace: {{ .Release.Namespace }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: ph-ee-operator-role +subjects: + - kind: ServiceAccount + name: payment-hub + namespace: {{ .Release.Namespace }} + {{- end -}} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/templates/secret.yaml b/helm/ph-ee-engine/connector/templates/secret.yaml similarity index 65% rename from helm/ph-ee-engine/connector-bulk-closedloop/templates/secret.yaml rename to helm/ph-ee-engine/connector/templates/secret.yaml index 90cc22e49..e7a3a32ce 100644 --- a/helm/ph-ee-engine/connector-bulk-closedloop/templates/secret.yaml +++ b/helm/ph-ee-engine/connector/templates/secret.yaml @@ -1,3 +1,4 @@ +{{- if .Values.enabled -}} apiVersion: {{ .Values.secret.apiversion }} kind: Secret metadata: @@ -5,4 +6,5 @@ metadata: type: Opaque data: aws-access-key: {{ .Values.aws.access_key | b64enc }} - aws-secret-key: {{ .Values.aws.secret_key | b64enc }} \ No newline at end of file + aws-secret-key: {{ .Values.aws.secret_key | b64enc }} +{{- end }} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/templates/service.yaml b/helm/ph-ee-engine/connector/templates/service.yaml similarity index 52% rename from helm/ph-ee-engine/connector-bulk-closedloop/templates/service.yaml rename to helm/ph-ee-engine/connector/templates/service.yaml index ef60959c3..f62c97b6a 100644 --- a/helm/ph-ee-engine/connector-bulk-closedloop/templates/service.yaml +++ b/helm/ph-ee-engine/connector/templates/service.yaml @@ -1,16 +1,19 @@ +{{- if .Values.enabled -}} apiVersion: {{ .Values.service.apiversion }} kind: Service metadata: labels: - app: ph-ee-connector-bulk-closedloop - name: ph-ee-connector-bulk-closedloop + app: ph-ee-connector + name: ph-ee-connector spec: ports: - name: port port: 80 protocol: TCP - targetPort: 5000 + targetPort: 8080 + selector: - app: ph-ee-connector-bulk-closedloop + app: ph-ee-connector sessionAffinity: None - type: ClusterIP \ No newline at end of file + type: ClusterIP +{{- end }} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector-bulk-closedloop/templates/serviceaccount.yaml b/helm/ph-ee-engine/connector/templates/serviceaccount.yaml similarity index 69% rename from helm/ph-ee-engine/connector-bulk-closedloop/templates/serviceaccount.yaml rename to helm/ph-ee-engine/connector/templates/serviceaccount.yaml index d5fa859b7..09cf6b2ab 100644 --- a/helm/ph-ee-engine/connector-bulk-closedloop/templates/serviceaccount.yaml +++ b/helm/ph-ee-engine/connector/templates/serviceaccount.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: ph-ee-connector-bulk-closedloop + name: ph-ee-connector annotations: {{- with .Values.serviceAccountAnnotations }} {{- toYaml . | nindent 4 }} {{- end }} labels: - app: ph-ee-connector-bulk-closedloop - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: ph-ee-connector + chart: "connector-{{ .Chart.Version }}" heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} {{- end -}} \ No newline at end of file diff --git a/helm/ph-ee-engine/connector/values.yaml b/helm/ph-ee-engine/connector/values.yaml new file mode 100644 index 000000000..f86b1a9af --- /dev/null +++ b/helm/ph-ee-engine/connector/values.yaml @@ -0,0 +1,65 @@ +service: + apiversion: "v1" + +secret: + apiversion: "v1" + +configmap: + apiversion: "v1" + +enabled: "" +image: "" +imagePullPolicy: "" +SPRING_PROFILES_ACTIVE: "" +LOGGING_LEVEL_ROOT: "INFO" +camel_disable_ssl: true +application: + bucket_name: "paymenthub-ee-dev" +zeebe: + broker: + contactpoint: "" +operations_app: + contactpoint: "http://ph-ee-operations-app:5000" + endpoints: + batch_summary: "/api/v1/batch" + batch_detail: "/api/v1/batch/detail" +mock_payment_schema: + contactpoint: "http://ph-ee-connector-mock-payment-schema:8080" + endpoints: + batch_summary: "/mockapi/v1/batch" + batch_detail: "/mockapi/v1/batch/detail" +bulk_processor: + contactpoint: "https://ph-ee-connector-bulk:8443" + endpoints: + batch_transaction: "/batchtransactions" +aws: + region: "" + access_key: "" + secret_key: "" +limits: + cpu: "500m" + memory: "512M" +requests: + cpu: "100m" + memory: "512M" + +# Enabling this will publicly expose your Elasticsearch instance. +# Only enable this if you have security enabled on your cluster +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: "nginx" + pathtype: ImplementationSpecific + hosts: + - host: "" + paths: + - path: / + tls: [] + # - secretName: sandbox-secret + # hosts: + # - chart-example.local + +deployment: + apiVersion: "apps/v1" + annotations: + deployTime: "{{ .Values.deployTime }}" diff --git a/helm/ph-ee-engine/requirements.yaml b/helm/ph-ee-engine/requirements.yaml index 88c2bd66f..dff4a0780 100644 --- a/helm/ph-ee-engine/requirements.yaml +++ b/helm/ph-ee-engine/requirements.yaml @@ -96,10 +96,10 @@ dependencies: version: 1.0.0 repository: "file://./kafka" condition: "kafka.enabled" - - name: connector_bulk_closedloop + - name: connector version: 1.0.0 - repository: "file://./connector-bulk-closedloop" - condition: "connector_bulk_closedloop.enabled" + repository: "file://./connector" + condition: "connector.enabled" - name: mockpayment version: 1.0.0 repository: "file://./connector-mock-payment-schema" diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 0ae54c08b..33d0c4e48 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1794,91 +1794,28 @@ ph-ee-connector_slcb: # ph_ee_connector_slcbConfig: {} # ph_ee_connector_slcb.yml: | -connector_bulk_closedloop: +connector: enabled: false replicas: 1 - channel: - hostname: "" - pollingApi: - timer: "180" - hostname: "" - livenessProbe: - httpGet: - path: /actuator/health/liveness - port: 9191 - initialDelaySeconds: 120 - periodSeconds: 30 - failureThreshold: 3 - timeoutSeconds: 5 - readinessProbe: - httpGet: - path: /actuator/health/readiness - port: 9191 - initialDelaySeconds: 120 - periodSeconds: 30 - failureThreshold: 3 - timeoutSeconds: 5 - # Whether this chart should self-manage its service account, role, and associated role binding. - managedServiceAccount: true - # Custom service account override that the pod will use - serviceAccount: "" - # Annotations to add to the ServiceAccount that is created if the serviceAccount value isn't set. - serviceAccountAnnotations: {} - # How long to wait for connector_bulk pods to stop gracefully - terminationGracePeriod: 30 - # Extra environment variables for connector_bulk container. - envFrom: [] - # - configMapRef: - # name: config-secret - extraEnvs: "" - # This is the PriorityClass settings as defined in - # https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass - priorityClassName: "" - # ph-ee-connector-bulkConfig: "" - # ph-ee-connector-bulk.yml: | - # - User that the container will execute as. - # Not necessary to run as root (0) as the connector_bulk Deployment use cases do not need access to Kubernetes Node internals - # - Typically not necessarily unless running within environments such as OpenShift. - securityContext: - runAsUser: 0 - privileged: false - resources: - limits: - memory: "512M" - cpu: "500m" - requests: - memory: "512M" - cpu: "100m" - # Enabling this will publicly expose your connector_bulk instance. - # Only enable this if you have security enabled on your cluster + image: docker.io/openmf/ph-ee-connector-bulk:v1.1.0 ingress: - enabled: false + enabled: true + annotations: + kubernetes.io/ingress.class: nginx + tls: + - secretName: sandbox-secret + hosts: + - host: connector.sandbox.mifos.io + paths: + - path: "/" + backend: + service: + name: ph-ee-connector + port: + number: 80 deployment: - annotations: {} - affinity: {} - nodeSelector: {} - tolerations: [] - envFrom: [] - # - configMapRef: - # name: config-secret - extraEnvs: "" - # - User that the container will execute as. - # Not necessary to run as root (0) as the connector_bulk Deployment use cases do not need access to Kubernetes Node internals - # - Typically not necessarily unless running within environments such as OpenShift. - securityContext: - runAsUser: 0 - privileged: false - resources: - limits: - memory: "512M" - cpu: "500m" - requests: - memory: "512M" - cpu: "100m" - # Allows you to add any config files in /usr/share/ - # such as ph-ee-connector-bulk.yml for deployment - # ph-ee-connector-bulkConfig: {} - # ph-ee-connector-bulk-mojaloop.yml: | + annotations: + deployTime: "{{ .Values.deployTime }}" mock_oracle: enabled: false