diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0202092..26b51b9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - feat/deploy-over-argocd jobs: release: @@ -28,7 +29,7 @@ jobs: - name: Add repos to Helm run: | - helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add bitnami https://repo.broadcom.com/bitnami-files/ helm repo add webank https://ADORSYS-GIS.github.io/webank-devops helm repo update diff --git a/Docs/Provisioning_k8s_PostgreSQL.md b/Docs/Provisioning_k8s_PostgreSQL.md index d2dac4e..a0578e7 100644 --- a/Docs/Provisioning_k8s_PostgreSQL.md +++ b/Docs/Provisioning_k8s_PostgreSQL.md @@ -19,7 +19,7 @@ The Bitnami PostgreSQL Helm chart simplifies the process of deploying and managi ### Add the Bitnami Helm Repository ```bash -helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo add bitnamihttps://repo.broadcom.com/bitnami-files/ helm repo update ``` diff --git a/Docs/Versioning_Convention.md b/Docs/Versioning_Convention.md index f48ba0a..ecc8b84 100644 --- a/Docs/Versioning_Convention.md +++ b/Docs/Versioning_Convention.md @@ -35,7 +35,7 @@ dependencies: condition: db.enabled - name: common version: 2.27.0 <-------------------------(6) same as above - repository: https://charts.bitnami.com/bitnami + repository:https://repo.broadcom.com/bitnami-files/ ``` ### Explanation @@ -70,7 +70,7 @@ appVersion: "1.0.0" <---------------------------(8) version for obs(docker dependencies: <------- Same as (5) and (6) above ----------> - name: common version: 2.27.0 - repository: https://charts.bitnami.com/bitnami + repository:https://repo.broadcom.com/bitnami-files/ ``` ### Chart for webank-userapp @@ -88,7 +88,7 @@ appVersion: "1.0.0" <---------------------------(10) version for obs helm dependencies: <------- Same as (5) and (6) above ----------> - name: common version: 2.27.0 - repository: https://charts.bitnami.com/bitnami + repository:https://repo.broadcom.com/bitnami-files/ ``` ### Explanation diff --git a/Docs/deploy_helm_charts.md b/Docs/deploy_helm_charts.md index e8e713f..b54a6b1 100644 --- a/Docs/deploy_helm_charts.md +++ b/Docs/deploy_helm_charts.md @@ -73,7 +73,7 @@ runs-on: ubuntu-latest ```yaml - name: Add repos to Helm run: | - helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add bitnamihttps://repo.broadcom.com/bitnami-files/ helm repo add webank https://ADORSYS-GIS.github.io/webank-devops helm repo update ``` diff --git a/charts/webank-obs/Chart.lock b/charts/webank-obs/Chart.lock deleted file mode 100644 index d6f88e9..0000000 --- a/charts/webank-obs/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://charts.bitnami.com/bitnami - version: 2.27.0 -digest: sha256:725ba9a398f9d90490c43eef0211c4404fef0ce30cfba1144f93eb5aacb572fb -generated: "2024-12-02T16:32:22.200999+01:00" diff --git a/charts/webank-obs/Chart.yaml b/charts/webank-obs/Chart.yaml index 45ec8f0..a34d950 100644 --- a/charts/webank-obs/Chart.yaml +++ b/charts/webank-obs/Chart.yaml @@ -11,4 +11,4 @@ appVersion: "1.0.0" dependencies: - name: common version: 2.27.0 - repository: https://charts.bitnami.com/bitnami \ No newline at end of file + repository: https://repo.broadcom.com/bitnami-files/ \ No newline at end of file diff --git a/charts/webank-userapp/Chart.lock b/charts/webank-userapp/Chart.lock deleted file mode 100644 index eb8aad3..0000000 --- a/charts/webank-userapp/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: https://charts.bitnami.com/bitnami - version: 2.27.0 -digest: sha256:725ba9a398f9d90490c43eef0211c4404fef0ce30cfba1144f93eb5aacb572fb -generated: "2024-12-02T19:55:44.232858+01:00" diff --git a/charts/webank-userapp/Chart.yaml b/charts/webank-userapp/Chart.yaml index b6555ae..2c74cce 100644 --- a/charts/webank-userapp/Chart.yaml +++ b/charts/webank-userapp/Chart.yaml @@ -11,4 +11,4 @@ appVersion: "1.0.0" dependencies: - name: common version: 2.27.0 - repository: https://charts.bitnami.com/bitnami \ No newline at end of file + repository: https://repo.broadcom.com/bitnami-files/ \ No newline at end of file diff --git a/charts/webank/Chart.yaml b/charts/webank/Chart.yaml index 31a7818..71a33ff 100644 --- a/charts/webank/Chart.yaml +++ b/charts/webank/Chart.yaml @@ -18,10 +18,10 @@ dependencies: version: 1.0.1 alias: userapp - name: postgresql - repository: "https://charts.bitnami.com/bitnami" + repository: "https://repo.broadcom.com/bitnami-files/" version: 16.2.3 alias: db condition: db.enabled - name: common version: 2.27.0 - repository: https://charts.bitnami.com/bitnami \ No newline at end of file + repository: "https://repo.broadcom.com/bitnami-files/" \ No newline at end of file diff --git a/deploy/dev/kustomization.yaml b/deploy/dev/kustomization.yaml new file mode 100644 index 0000000..2c87ee8 --- /dev/null +++ b/deploy/dev/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - webank.yaml \ No newline at end of file diff --git a/deploy/dev/webank.yaml b/deploy/dev/webank.yaml new file mode 100644 index 0000000..02e18b3 --- /dev/null +++ b/deploy/dev/webank.yaml @@ -0,0 +1,65 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: webank + namespace: argocd +spec: + project: application + source: + repoURL: https://adorsys-gis.github.io/webank-devops + chart: webank + targetRevision: 1.0.2-rc.2 + helm: + releaseName: webank + valueFiles: + - values.yaml + valuesObject: + userapp: + image: + pullPolicy: Always + env: + - name: VITE_BACKEND_URL + value: '/api' + obs: + image: + tag: '4badba0d3c3b98f0d5a132b3b9e5b78bed2d451c' + database: + host: webank-dev-env-db.cp4v71vs2xe2.eu-central-1.rds.amazonaws.com + name: webank_dev_env + user: webank + secretName: rds-secret + + ingress: + host: dev.webank.gis.ssegning.com + className: alb + annotations: + alb.ingress.kubernetes.io/tags: Environment=dev,Owner=webank + alb.ingress.kubernetes.io/load-balancer-name: webank-dev + alb.ingress.kubernetes.io/listen-ports: | + [ + { + "HTTP":80 + }, + { + "HTTPS": 443 + } + ] + alb.ingress.kubernetes.io/ssl-redirect: '443' + alb.ingress.kubernetes.io/scheme: "internet-facing" + alb.ingress.kubernetes.io/target-type: "ip" + alb.ingress.kubernetes.io/certificate-arn: "arn:aws:acm:eu-central-1:571075516563:certificate/1cee4019-ba69-40a8-a888-95f62a376f88" + external-dns.alpha.kubernetes.io/hostname: "dev.webank.gis.ssegning.com" + alb.ingress.kubernetes.io/healthcheck-interval-seconds: '15' + alb.ingress.kubernetes.io/healthcheck-timeout-seconds: '5' + alb.ingress.kubernetes.io/healthy-threshold-count: '2' + alb.ingress.kubernetes.io/unhealthy-threshold-count: '2' + destination: + server: https://kubernetes.default.svc + namespace: webank + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true + revisionHistoryLimit: 4 \ No newline at end of file