diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..4c6280e 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,5 +1,11 @@ + + + + + + diff --git a/flow-helm-chart-0.1.13.tgz b/flow-helm-chart-0.1.13.tgz new file mode 100644 index 0000000..18ed515 Binary files /dev/null and b/flow-helm-chart-0.1.13.tgz differ diff --git a/flow/Chart.yaml b/flow/Chart.yaml index c65fdff..7b37699 100644 --- a/flow/Chart.yaml +++ b/flow/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.12 +version: 0.1.13 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/flow/argocd-values.yml b/flow/argocd-values.yml new file mode 100644 index 0000000..6554c5e --- /dev/null +++ b/flow/argocd-values.yml @@ -0,0 +1,146 @@ +argocd: + name: 'flow' + enabled: false + namespace: 'default' + projectName: '' + sources: [ ] + sync: + automated: + prune: 'true' + selfHeal: 'true' + options: + - RespectIgnoreDifferences=true + - PruneLast=true + - Validate=false + - ServerSideApply=true + - ApplyOutOfSyncOnly=true + - CreateNamespace=true + retry: + limit: '2' + backoffDuration: '5s' + backOffMaxDuration: '3m0s' + backOffFactor: '2' + destination: + name: 'william' + namespace: 'default' + server: 'https://kubernetes.default.svc' + repository: + url: 'https://factory24.github.io/flow-helm-chart/' + path: '' + targetRevision: '0.1.12' + chart: 'flow-helm-chart' + valueFiles: + - values.yaml + - values.yaml + - values.yaml + - values.yaml + - values.yaml + - values.yaml + - values.yaml + - values.yaml + values: | + deployment: + name: billing-service + namespace: default + replicaCount: 1 + restartPolicy: Always + args: [] + image: + repository: athari/billing-service + tag: latest + pullPolicy: Never + ports: + - name: http + containerPort: 8080 + protocol: TCP + + + service: + name: billing-service + type: ClusterIP + namespace: default + protocol: TCP + port: 8080 + targetPort: 8080 + + resources: + enabled: true + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + + autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 10 + + configMap: + enabled: true + name: billing-service + namespace: default + data: { } + + secrets: + enabled: false + namespace: default + name: flow + data: { } + + certificate: + enabled: false + name: "flow" + namespace: istio-system + secretName: "flow" + issuerRef: letsencrypt + commonName: dev.everyflow.org + dnsNames: { } + + gateway: + enabled: false # Enable the Gateway deployment + name: my-istio-gateway # Name for the Gateway resource + namespace: istio-ingress # Namespace where the Gateway will be deployed + specSelector: ingressgateway + servers: + - port: + number: 80 + name: http + protocol: http + hosts: + - "1flow.org" + - port: + number: 443 + name: https + protocol: https + hosts: + - "1flow.org" + tls: + mode: SIMPLE + credentialName: keycloak-tls + + virtualService: + enabled: true + name: billing-service + host: api.hydrate.local + namespace: default + gateway: api-gateway + routeDefinitions: + - /v1/billing + destinationHost: billing-service.default.svc.cluster.local + destinationPort: 8080 + healthCheckPath: /health + allowOrigins: + exact: "*" + allowHeaders: + - Content-Type + - Authorization + allowMethods: + - GET + - POST + - PUT + - PATCH + + + diff --git a/flow/templates/argocd.yml b/flow/templates/argocd.yml new file mode 100644 index 0000000..179db87 --- /dev/null +++ b/flow/templates/argocd.yml @@ -0,0 +1,39 @@ +{{ if .Values.argocd.enabled }} +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: {{ .Values.argocd.name }} + namespace: {{ .Values.argocd.namespace }} +spec: + destination: + name: {{ .Values.argocd.destination.name }} + namespace: {{ .Values.argocd.destination.namespace }} + server: {{ .Values.argocd.destination.server }} + source: + path: {{ .Values.argocd.repository.path }} + repoURL: {{ .Values.argocd.repository.url }} + targetRevision: {{ .Values.argocd.repository.targetRevision }} + chart: {{ .Values.argocd.repository.chart }} + helm: + valueFiles: + {{- range .Values.argocd.repository.valueFiles }} + - {{ . }} + {{- end }} + values: {{ .Values.argocd.values | toYaml | indent 8 }} + sources: {{ .Values.argocd.sources }} + project: {{ .Values.argocd.projectName }} + syncPolicy: + automated: + prune: {{ .Values.argocd.sync.automated.prune }} + selfHeal: {{ .Values.argocd.sync.automated.selfHeal }} + syncOptions: + {{- range .Values.argocd.sync.options }} + - {{ . }} + {{- end }} + retry: + limit: {{ .Values.argocd.sync.retry.limit }} + backoff: + duration: {{ .Values.argocd.sync.retry.backoffDuration }} + maxDuration: {{ .Values.argocd.sync.retry.backOffMaxDuration }} + factor: {{ .Values.argocd.sync.retry.backOffFactor }} +{{ end }} \ No newline at end of file diff --git a/flow/templates/persistentvolume.yml b/flow/templates/persistentvolume.yml new file mode 100644 index 0000000..c403342 --- /dev/null +++ b/flow/templates/persistentvolume.yml @@ -0,0 +1,19 @@ +{{ if .Values.persistentVolume.enabled }} +apiVersion: v1 +kind: PersistentVolume +metadata: + name: {{ .Values.persistentVolume.name}} + namespace: {{ .Values.persistentVolume.namespace }} + labels: + type: {{ .Values.persistentVolume.labelType}} +spec: + storageClassName: {{ .Values.persistentVolume.storage.className}} + capacity: + storage: {{ .Values.persistentVolume.storage.capacity}} + accessModes: + {{- range .Values.persistentVolume.accessModes }} + - {{ . }} + {{- end }} + hostPath: + path: {{ .Values.persistentVolume.hostPath}} +{{- end }} \ No newline at end of file diff --git a/flow/templates/persistentvolumeclaim.yml b/flow/templates/persistentvolumeclaim.yml new file mode 100644 index 0000000..67ee2e0 --- /dev/null +++ b/flow/templates/persistentvolumeclaim.yml @@ -0,0 +1,15 @@ +{{ if .Values.persistentVolumeClaim.enabled }} +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ .Values.persistentVolumeClaim.name }} + namespace: {{ .Values.persistentVolumeClaim.namespace }} +spec: + accessModes: + {{- range .Values.persistentVolumeClaim.accessModes }} + - {{ . }} + {{- end }} + resources: + requests: + storage: {{ .Values.persistentVolumeClaim.storage }} +{{ end }} \ No newline at end of file diff --git a/flow/values.yaml b/flow/values.yaml index 26d28ef..8db34b7 100644 --- a/flow/values.yaml +++ b/flow/values.yaml @@ -1,26 +1,22 @@ -#imageTag: "" # Placeholder for image tag - - deployment: - name: billing-service - namespace: default + name: fraud-service + namespace: flow replicaCount: 1 restartPolicy: Always args: [] image: - repository: athari/billing-service + repository: gfacratharidazwe.azurecr.io/backend/athari-fraud-service tag: latest - pullPolicy: Never + pullPolicy: Always ports: - name: http containerPort: 8080 protocol: TCP - service: - name: billing-service + name: fraud-service type: ClusterIP - namespace: default + namespace: flow protocol: TCP port: 8080 targetPort: 8080 @@ -41,9 +37,21 @@ autoscaling: configMap: enabled: true - name: billing-service - namespace: default - data: { } + name: fraud-service + namespace: flow + data: + DB.HOST: "g-pgsql-p-we.postgres.database.azure.com" + DB.PORT: "5432" + DB.NAME: "hydrate_aqm_fraud_p_db" + DB.USER: "hydrate" + DB.PASS: "ujy5azp.xrn3CMV0get" + KC.REALM: "hydrate" + KC.BASE_URL: "https://accounts.hydrate.net/auth" + EUREKA_ENABLED: "false" + EUREKA_ZONE_URL: "" + EUREKA_PREFER_IP: "false" + EUREKA_REGISTER: "false" + EUREKA_FETCH_REGISTRY: "false" secrets: enabled: false @@ -61,9 +69,9 @@ certificate: dnsNames: { } gateway: - enabled: false # Enable the Gateway deployment - name: my-istio-gateway # Name for the Gateway resource - namespace: istio-ingress # Namespace where the Gateway will be deployed + enabled: false + name: my-istio-gateway + namespace: istio-ingress specSelector: ingressgateway servers: - port: @@ -72,8 +80,6 @@ gateway: protocol: http hosts: - "1flow.org" - tls: - httpsRedirect: true - port: number: 443 name: https @@ -82,17 +88,17 @@ gateway: - "1flow.org" tls: mode: SIMPLE - credentialName: flow-landing-tls + credentialName: keycloak-tls virtualService: enabled: true - name: billing-service + name: fraud-service host: api.hydrate.local - namespace: default - gateway: api-gateway + namespace: flow + gateway: hydrate-gateway routeDefinitions: - - /v1/billing - destinationHost: billing-service.default.svc.cluster.local + - /v1/fraud + destinationHost: fraud-service.athari-dev.svc.cluster.local destinationPort: 8080 healthCheckPath: /health allowOrigins: @@ -105,4 +111,173 @@ virtualService: - POST - PUT - PATCH + - DELETE + +persistentVolume: + enabled: false + name: bizops + namespace: default + labelType: '' + storage: + className: 'default' + capacity: '10Gi' + accessModes: + - ReadWriteOnce + hostPath: '/mnt/data' + +persistentVolumeClaim: + name: bizopsclaim + namespace: default + enabled: false + accessModes: + - ReadWriteOnce + storage: 16Gi + +argocd: + name: 'flow' + enabled: true + namespace: 'flow' + projectName: 'flow-production' + sources: [ ] + sync: + automated: + prune: 'true' + selfHeal: 'true' + options: + - RespectIgnoreDifferences=true + - PruneLast=true + - Validate=false + - ServerSideApply=true + - ApplyOutOfSyncOnly=true + - CreateNamespace=true + retry: + limit: '2' + backoffDuration: '5s' + backOffMaxDuration: '3m0s' + backOffFactor: '2' + destination: + name: '' + namespace: 'flow' + server: 'https://kubernetes.default.svc' + repository: + url: 'https://factory24.github.io/flow-helm-chart/' + path: '' + targetRevision: '0.1.12' + chart: 'flow-helm-chart' + valueFiles: + - values.yaml + values: | + deployment: + name: fraud-service + namespace: flow + replicaCount: 1 + restartPolicy: Always + args: [] + image: + repository: gfacratharidazwe.azurecr.io/backend/athari-fraud-service + tag: latest + pullPolicy: Always + ports: + - name: http + containerPort: 8080 + protocol: TCP + + service: + name: fraud-service + type: ClusterIP + namespace: flow + protocol: TCP + port: 8080 + targetPort: 8080 + + resources: + enabled: true + limits: + cpu: 100m + memory: 128Mi + requests: + cpu: 100m + memory: 128Mi + + autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 10 + + configMap: + enabled: true + name: fraud-service + namespace: flow + data: + DB.HOST: "g-pgsql-p-we.postgres.database.azure.com" + DB.PORT: "5432" + DB.NAME: "hydrate_aqm_fraud_p_db" + DB.USER: "hydrate" + DB.PASS: "ujy5azp.xrn3CMV0get" + KC.REALM: "hydrate" + KC.BASE_URL: "https://accounts.hydrate.net/auth" + EUREKA_ENABLED: "false" + EUREKA_ZONE_URL: "" + EUREKA_PREFER_IP: "false" + EUREKA_REGISTER: "false" + EUREKA_FETCH_REGISTRY: "false" + + secrets: + enabled: false + namespace: default + name: flow + data: { } + + certificate: + enabled: false + name: "flow" + namespace: istio-system + secretName: "flow" + issuerRef: letsencrypt + commonName: dev.everyflow.org + dnsNames: { } + + gateway: + enabled: false # Enable the Gateway deployment + name: my-istio-gateway # Name for the Gateway resource + namespace: istio-ingress # Namespace where the Gateway will be deployed + specSelector: ingressgateway + servers: + - port: + number: 80 + name: http + protocol: http + hosts: + - "1flow.org" + - port: + number: 443 + name: https + protocol: https + hosts: + - "1flow.org" + tls: + mode: SIMPLE + credentialName: keycloak-tls + virtualService: + enabled: true + name: fraud-service + host: api.hydrate.local + namespace: flow + gateway: hydrate-gateway + routeDefinitions: + - /v1/fraud + destinationHost: fraud-service.athari-dev.svc.cluster.local + destinationPort: 8080 + healthCheckPath: /health + allowOrigins: + exact: "*" + allowHeaders: + - Content-Type + - Authorization + allowMethods: + - GET + - POST + - PUT + - PATCH + - DELETE \ No newline at end of file diff --git a/index.yaml b/index.yaml index 9d0d301..2494fda 100644 --- a/index.yaml +++ b/index.yaml @@ -3,7 +3,17 @@ entries: flow-helm-chart: - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.202095Z" + created: "2024-08-26T12:24:12.102539Z" + description: A Helm chart for Kubernetes + digest: 2b87b2df16cc90e966ff07c09f304274584589f2523e0c8feec21fac35739c11 + name: flow-helm-chart + type: application + urls: + - flow-helm-chart-0.1.13.tgz + version: 0.1.13 + - apiVersion: v2 + appVersion: 1.16.0 + created: "2024-08-26T12:24:12.102145Z" description: A Helm chart for Kubernetes digest: 329fe95dfcd3871f07a6708084b3f5d9a545d87f443fc31552bec8bd192bd553 name: flow-helm-chart @@ -13,7 +23,7 @@ entries: version: 0.1.12 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.201847Z" + created: "2024-08-26T12:24:12.101641Z" description: A Helm chart for Kubernetes digest: 5d8b818672fd6d4d8a3edbbfd6934e777bddf996023157eb2ca7ec5975bc2256 name: flow-helm-chart @@ -23,7 +33,7 @@ entries: version: 0.1.11 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.201476Z" + created: "2024-08-26T12:24:12.101162Z" description: A Helm chart for Kubernetes digest: 58887e3a615c3f965fb7de502c398cfbd4f50b64726641b141ed494c393dad61 name: flow-helm-chart @@ -33,7 +43,7 @@ entries: version: 0.1.10 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.205414Z" + created: "2024-08-26T12:24:12.105458Z" description: A Helm chart for Kubernetes digest: db761f53e78fa7934eb33fef7d45ff805eb455044a6806f0289cfe9a97a19ccd name: flow-helm-chart @@ -43,7 +53,7 @@ entries: version: 0.1.9 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.20507Z" + created: "2024-08-26T12:24:12.105064Z" description: A Helm chart for Kubernetes digest: 28aa7c1af2a486bd3b5d0e945eddaed85e79998f40c697db636dbd2ebfea5b57 name: flow-helm-chart @@ -53,7 +63,7 @@ entries: version: 0.1.8 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.204588Z" + created: "2024-08-26T12:24:12.10471Z" description: A Helm chart for Kubernetes digest: 2f40b648b3abfa2709df5ee292ed7e87946813f1ec1ac0e4e60ed48883555a6e name: flow-helm-chart @@ -63,7 +73,7 @@ entries: version: 0.1.7 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.204106Z" + created: "2024-08-26T12:24:12.104329Z" description: A Helm chart for Kubernetes digest: e4237a98f59756faf926c9fdd699545f33f2cca7e78c223fc9dca9847fdc8806 name: flow-helm-chart @@ -73,7 +83,7 @@ entries: version: 0.1.6 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.203766Z" + created: "2024-08-26T12:24:12.10398Z" description: A Helm chart for Kubernetes digest: aebced81782c25722134fbd79c67032a271553961e28900b58349a929140645b name: flow-helm-chart @@ -83,7 +93,7 @@ entries: version: 0.1.5 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.203322Z" + created: "2024-08-26T12:24:12.103621Z" description: A Helm chart for Kubernetes digest: 9bcb41f21780c117fc5dddd630040953fd50d8598f8476f1da6335ef27641f0c name: flow-helm-chart @@ -93,7 +103,7 @@ entries: version: 0.1.4 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.203019Z" + created: "2024-08-26T12:24:12.10327Z" description: A Helm chart for Kubernetes digest: 75d9d6f6fba3bbe5c42260ef86c81b26d69f0134fc3511e4eedb9743f1edaf9a name: flow-helm-chart @@ -103,7 +113,7 @@ entries: version: 0.1.3 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.20257Z" + created: "2024-08-26T12:24:12.102887Z" description: A Helm chart for Kubernetes digest: fea51eefb8b730252916fac6373a35d61d44ba7c9cc8a527ac7b7cd4a6fb7571 name: flow-helm-chart @@ -113,7 +123,7 @@ entries: version: 0.1.2 - apiVersion: v2 appVersion: 1.16.0 - created: "2024-08-20T12:52:05.201045Z" + created: "2024-08-26T12:24:12.100186Z" description: A Helm chart for Kubernetes digest: 97190966ce1069b0188a7ad825ef070b3274d37d25841e1b9ee12415edf0e268 name: flow-helm-chart @@ -121,4 +131,4 @@ entries: urls: - flow-helm-chart-0.1.1.tgz version: 0.1.1 -generated: "2024-08-20T12:52:05.200498Z" +generated: "2024-08-26T12:24:12.099675Z"