From dfe276a28ffa608506362b31790101af6b2e9729 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 27 Feb 2024 22:58:34 +0800 Subject: [PATCH 01/55] add iac-pipeline-signal-cluster-keycloak.yml: update --- .../iac-pipeline-signal-cluster-keycloak.yml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/iac-pipeline-signal-cluster-keycloak.yml diff --git a/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml b/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml new file mode 100644 index 00000000..67594046 --- /dev/null +++ b/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml @@ -0,0 +1,59 @@ +name: Signal K3S Cluster Pipeline Keycloak with IAC tools + +env: + STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy + CLOUD: "gcp" # 选择云服务商, 可选: gcp, aws, ali, azure + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + +on: + pull_request: + push: + paths: + - '.github/workflows/iac-pipeline-signal-cluster-keycloak.yml' + workflow_dispatch: + branches: + - main + +jobs: + apply-cluster-resources: + uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main + with: + config: 'signal-cluster-config.yaml' + secrets: + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + + setup-k3s-cluster: + uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main + with: + domain: 'svc-dev.ink' + cluster_name: 'monitor' + ssh_host_name: 'monitor' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + VAULT_URL: ${{ secrets.VAULT_URL }} + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - apply-cluster-resources + + setup-keycloak-server: + uses: svc-design/actions/.github/workflows/setup-keycloak-server.yml@main + with: + domain: 'svc-dev.ink' + cluster_name: 'monitor' + ssh_host_name: 'monitor' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - setup-k3s-cluster From e85d51acc41d828ac8cf98bbe8d83039678d360a Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 27 Feb 2024 23:06:23 +0800 Subject: [PATCH 02/55] sync all sub modules --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index c5f50570..78b17845 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit c5f505707fc18f81ab2c505f0c089ce435688099 +Subproject commit 78b178453d3c7229a03188fae55df7017009f98f From 2e3a3bdbd49b90718d704682b9c31d389c465e5c Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 27 Feb 2024 23:41:54 +0800 Subject: [PATCH 03/55] workflows/iac-pipeline-signal-cluster-keycloak.yml: add secrets.ADMIN_INIT_PASSWORD --- .github/workflows/iac-pipeline-signal-cluster-keycloak.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml b/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml index 67594046..010b58bb 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-keycloak.yml @@ -55,5 +55,6 @@ jobs: DNS_AK: ${{ secrets.DNS_AK }} DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }} + ADMIN_PASSWORD: ${{ secrets.ADMIN_INIT_PASSWORD }} needs: - setup-k3s-cluster From c1d8b9645b97af6d642b06180efdd3c509b87992 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Mon, 11 Mar 2024 19:10:09 +0800 Subject: [PATCH 04/55] playbook (new commits) --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 78b17845..cd864178 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 78b178453d3c7229a03188fae55df7017009f98f +Subproject commit cd8641786166fe8d42cf7fc0fc996ae61cba22f3 From ff0594c123ad228a590cbc99c69b98d716e5f9f9 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Mon, 11 Mar 2024 19:28:23 +0800 Subject: [PATCH 05/55] synced playbook (new commits) --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index cd864178..2d0b1a54 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit cd8641786166fe8d42cf7fc0fc996ae61cba22f3 +Subproject commit 2d0b1a547f7487c53021dc7730efc2b3409df38e From ed84fad98dda73523fe451329f7d292184d5de74 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 12 Mar 2024 19:24:55 +0800 Subject: [PATCH 06/55] playbook: update --- .../iac-pipeline-signal-cluster-create.yml | 17 +---------------- playbook | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-create.yml b/.github/workflows/iac-pipeline-signal-cluster-create.yml index 4ef90d86..c8eafbab 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-create.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-create.yml @@ -29,7 +29,7 @@ jobs: setup-k3s-cluster: uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main with: - domain: 'svc-dev.ink' + domain: 'onwalk.net' cluster_name: 'monitor' ssh_host_name: 'monitor' secrets: @@ -42,18 +42,3 @@ jobs: SSH_USER: ${{ secrets.HOST_USER }} needs: - apply-cluster-resources - - setup-observability-tools: - uses: svc-design/actions/.github/workflows/setup-observability-server.yml@main - with: - domain: 'svc-dev.ink' - cluster_name: 'monitor' - ssh_host_name: 'monitor' - secrets: - GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - DNS_AK: ${{ secrets.DNS_AK }} - DNS_SK: ${{ secrets.DNS_SK }} - SSH_USER: ${{ secrets.HOST_USER }} - needs: - - setup-k3s-cluster diff --git a/playbook b/playbook index 2d0b1a54..e98fe1dd 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 2d0b1a547f7487c53021dc7730efc2b3409df38e +Subproject commit e98fe1dd97eccf94d4c055115ae3850b61d62295 From 6648a5c1d3011e78a7c754735658a79fea8bc25d Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 12 Mar 2024 21:10:11 +0800 Subject: [PATCH 07/55] add deplay-app-with-argocd.yaml --- .github/workflows/deplay-app-with-argocd.yaml | 18 ++++++++++++++++++ .../iac-pipeline-signal-cluster-create.yml | 12 ++++++++++++ iac_modules | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/deplay-app-with-argocd.yaml diff --git a/.github/workflows/deplay-app-with-argocd.yaml b/.github/workflows/deplay-app-with-argocd.yaml new file mode 100644 index 00000000..6326eece --- /dev/null +++ b/.github/workflows/deplay-app-with-argocd.yaml @@ -0,0 +1,18 @@ +name: argocd job +on: + pull_request: + branches: ["main", "stable", "release/v*"] + workflow_dispatch: + branches: + - main + +jobs: + argocd-job: + name: + uses: svc-design/actions/.github/workflows/workflows-call-gitops.yaml@main + with: + namespace: "itsm-dev" + helmfile: "helm_releases/apps/redis" + config_repo: "https://github.com/svc-design/gitops.git" + secrets: + KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} diff --git a/.github/workflows/iac-pipeline-signal-cluster-create.yml b/.github/workflows/iac-pipeline-signal-cluster-create.yml index c8eafbab..ba063d0a 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-create.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-create.yml @@ -42,3 +42,15 @@ jobs: SSH_USER: ${{ secrets.HOST_USER }} needs: - apply-cluster-resources + + argocd-job: + name: + uses: svc-design/actions/.github/workflows/workflows-call-gitops.yaml@main + with: + namespace: "itsm-dev" + helmfile: "helm_releases/apps/redis" + config_repo: "https://github.com/svc-design/gitops.git" + secrets: + KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} + needs: + - setup-k3s-cluster diff --git a/iac_modules b/iac_modules index dc0d88f7..6d376699 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit dc0d88f7d05e244765524effe3e2f9489f0cccbd +Subproject commit 6d3766995da2780ea64ea4fabf6aefecee92bfee From 1bf7532e1a1a761f482fb5a05f5a2f3ef7a2eece Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 12 Mar 2024 21:55:11 +0800 Subject: [PATCH 08/55] add apiserver --- .github/workflows/deplay-app-with-argocd.yaml | 1 + .github/workflows/iac-pipeline-signal-cluster-create.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/deplay-app-with-argocd.yaml b/.github/workflows/deplay-app-with-argocd.yaml index 6326eece..b156e692 100644 --- a/.github/workflows/deplay-app-with-argocd.yaml +++ b/.github/workflows/deplay-app-with-argocd.yaml @@ -11,6 +11,7 @@ jobs: name: uses: svc-design/actions/.github/workflows/workflows-call-gitops.yaml@main with: + apiserver: "https://35.200.69.238:6443" namespace: "itsm-dev" helmfile: "helm_releases/apps/redis" config_repo: "https://github.com/svc-design/gitops.git" diff --git a/.github/workflows/iac-pipeline-signal-cluster-create.yml b/.github/workflows/iac-pipeline-signal-cluster-create.yml index ba063d0a..5f87022a 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-create.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-create.yml @@ -47,6 +47,7 @@ jobs: name: uses: svc-design/actions/.github/workflows/workflows-call-gitops.yaml@main with: + apiserver: "https://35.200.69.238:6443" namespace: "itsm-dev" helmfile: "helm_releases/apps/redis" config_repo: "https://github.com/svc-design/gitops.git" From 1d11742ce7303c7d4831e36e4e16377b8f60a955 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 12 Mar 2024 23:45:22 +0800 Subject: [PATCH 09/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index e98fe1dd..c3121d88 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit e98fe1dd97eccf94d4c055115ae3850b61d62295 +Subproject commit c3121d884431dd2b82c6cda35aa7d2b402018659 From 389e00c8b607cda697a78ad5e0534ee76489ba4d Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 19 Mar 2024 19:07:26 +0800 Subject: [PATCH 10/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index c3121d88..4bb6782b 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit c3121d884431dd2b82c6cda35aa7d2b402018659 +Subproject commit 4bb6782b737b69d6b35b7e1f05d5da2ec6ec25a3 From b774ab7937a84a74f93eaaf36d13d18b07a6e247 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 19 Mar 2024 21:58:42 +0800 Subject: [PATCH 11/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 4bb6782b..9d24af3c 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 4bb6782b737b69d6b35b7e1f05d5da2ec6ec25a3 +Subproject commit 9d24af3c8fef52c0e8edce74056a1ded79ff0895 From b0eb38228adcfecbab74313f9d6dabbd4815e101 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Tue, 19 Mar 2024 22:23:09 +0800 Subject: [PATCH 12/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 9d24af3c..e78f354f 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 9d24af3c8fef52c0e8edce74056a1ded79ff0895 +Subproject commit e78f354fed45eda7d94a01367f0eb8ef5ce84afa From 81bcf189832085db59bcc7660129f7cde0449b05 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 20 Mar 2024 19:11:12 +0800 Subject: [PATCH 13/55] update --- .../iac-pipeline-signal-cluster-create.yml | 24 +++++++++---------- playbook | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-create.yml b/.github/workflows/iac-pipeline-signal-cluster-create.yml index 5f87022a..238c5465 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-create.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-create.yml @@ -43,15 +43,15 @@ jobs: needs: - apply-cluster-resources - argocd-job: - name: - uses: svc-design/actions/.github/workflows/workflows-call-gitops.yaml@main - with: - apiserver: "https://35.200.69.238:6443" - namespace: "itsm-dev" - helmfile: "helm_releases/apps/redis" - config_repo: "https://github.com/svc-design/gitops.git" - secrets: - KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} - needs: - - setup-k3s-cluster +# argocd-job: +# name: +# uses: svc-design/actions/.github/workflows/workflows-call-gitops.yaml@main +# with: +# apiserver: "https://35.200.69.238:6443" +# namespace: "itsm-dev" +# helmfile: "helm_releases/apps/redis" +# config_repo: "https://github.com/svc-design/gitops.git" +# secrets: +# KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }} +# needs: +# - setup-k3s-cluster diff --git a/playbook b/playbook index e78f354f..a5c638cb 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit e78f354fed45eda7d94a01367f0eb8ef5ce84afa +Subproject commit a5c638cb5b3f6a583959c792ced39d8647045966 From e30f0934a63617015d6bc42b96003c27f6252934 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 20 Mar 2024 23:02:06 +0800 Subject: [PATCH 14/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index a5c638cb..c135b501 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit a5c638cb5b3f6a583959c792ced39d8647045966 +Subproject commit c135b501c34e71798976bd67f6da78be9d144f16 From f0b42dcfe7dbe3d8508078d1cf595f18652d1134 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 20 Mar 2024 23:04:46 +0800 Subject: [PATCH 15/55] README.md: update --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 2440aab5..d998df48 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ Follow the links above to the documentation in your preferred language to get st We welcome contributions to this project. If you have suggestions, improvements, or find any issues, feel free to submit a pull request. + + ## License This project is released under the GPL V3 license. For more details, see the LICENSE file. From 8f9304eaa3917b21bc1026d27024e34e36f81c06 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 12:30:22 +0800 Subject: [PATCH 16/55] update --- ...ac-pipeline-signal-cluster-argo-server.yml | 44 ++++++++++++++ .../iac-pipeline-signal-cluster-jenkins.yml | 60 +++++++++++++++++++ iac_modules | 2 +- playbook | 2 +- 4 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/iac-pipeline-signal-cluster-argo-server.yml create mode 100644 .github/workflows/iac-pipeline-signal-cluster-jenkins.yml diff --git a/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml b/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml new file mode 100644 index 00000000..ef4111e5 --- /dev/null +++ b/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml @@ -0,0 +1,44 @@ +name: Signal K3S Cluster Pipeline Jenkins with IAC tools + +env: + STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy + CLOUD: "gcp" # 选择云服务商, 可选: gcp, aws, ali, azure + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + +on: + pull_request: + push: + paths: + - '.github/workflows/iac-pipeline-signal-cluster-argo-server.yml' + workflow_dispatch: + branches: + - main + +jobs: + apply-cluster-resources: + uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main + with: + config: 'signal-cluster-config-argo-server.yaml' + secrets: + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + + setup-k3s-cluster-with-argo-server: + uses: svc-design/actions/.github/workflows/init_k3s_cluster_with_argo_server@main + with: + domain: 'onwalk.net' + cluster_name: 'argocd' + ssh_host_name: 'argocd' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + VAULT_URL: ${{ secrets.VAULT_URL }} + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - apply-cluster-resources diff --git a/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml b/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml new file mode 100644 index 00000000..9f8ba4ea --- /dev/null +++ b/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml @@ -0,0 +1,60 @@ +name: Signal K3S Cluster Pipeline Jenkins with IAC tools + +env: + STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy + CLOUD: "gcp" # 选择云服务商, 可选: gcp, aws, ali, azure + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + +on: + pull_request: + push: + paths: + - '.github/workflows/iac-pipeline-signal-cluster-jenkins.yml' + workflow_dispatch: + branches: + - main + +jobs: + apply-cluster-resources: + uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main + with: + config: 'signal-cluster-config.yaml' + secrets: + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + + setup-k3s-cluster: + uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main + with: + domain: 'onwalk.net' + cluster_name: 'monitor' + ssh_host_name: 'monitor' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + VAULT_URL: ${{ secrets.VAULT_URL }} + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - apply-cluster-resources + + setup-jenkins-server: + uses: svc-design/actions/.github/workflows/setup-jenkins-server.yaml@main + with: + domain: 'onwalk.net' + cluster_name: 'jenkins' + ssh_host_name: 'jenkins' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + ADMIN_PASSWORD: ${{ secrets.ADMIN_INIT_PASSWORD }} + needs: + - setup-k3s-cluster diff --git a/iac_modules b/iac_modules index 6d376699..4458121c 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit 6d3766995da2780ea64ea4fabf6aefecee92bfee +Subproject commit 4458121c2a6df36ecb000bf3514b83fa461edf9c diff --git a/playbook b/playbook index c135b501..de536a12 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit c135b501c34e71798976bd67f6da78be9d144f16 +Subproject commit de536a12a560c4dc877f8f8ca3ecd7be8a6e5deb From 18b72303472ef53d172c56a7fb4906a3ba3d34ca Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 12:43:21 +0800 Subject: [PATCH 17/55] .github/workflows/iac-pipeline-signal-cluster-argo-server.yml: update --- .github/workflows/iac-pipeline-signal-cluster-argo-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml b/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml index ef4111e5..bfa5b8bf 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml @@ -27,7 +27,7 @@ jobs: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} setup-k3s-cluster-with-argo-server: - uses: svc-design/actions/.github/workflows/init_k3s_cluster_with_argo_server@main + uses: svc-design/actions/.github/workflows/setup-k3s-cluster-argocd.yml@main with: domain: 'onwalk.net' cluster_name: 'argocd' From 8050c81b00f66d469ea07ff588f24fdb8224f9f8 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 12:45:07 +0800 Subject: [PATCH 18/55] update --- .github/workflows/iac-pipeline-signal-cluster-argo-server.yml | 2 +- .github/workflows/iac-pipeline-signal-cluster-jenkins.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml b/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml index bfa5b8bf..6d408f88 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-argo-server.yml @@ -1,4 +1,4 @@ -name: Signal K3S Cluster Pipeline Jenkins with IAC tools +name: Setup ArgoCD Server env: STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy diff --git a/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml b/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml index 9f8ba4ea..02d0112b 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml @@ -1,4 +1,4 @@ -name: Signal K3S Cluster Pipeline Jenkins with IAC tools +name: Setup Jenkins Server env: STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy From e4c939a52b1a9b355a3c78f2a1f7686f2de9e092 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 13:06:44 +0800 Subject: [PATCH 19/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index de536a12..34de248a 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit de536a12a560c4dc877f8f8ca3ecd7be8a6e5deb +Subproject commit 34de248a2841f9d23176651350316eb03427529f From a6dcb0182eccf3472e6eff35d551619014756123 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 13:13:08 +0800 Subject: [PATCH 20/55] .github/workflows/iac-pipeline-signal-cluster-jenkins.yml: update --- .github/workflows/iac-pipeline-signal-cluster-jenkins.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml b/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml index 02d0112b..02e368e8 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-jenkins.yml @@ -21,7 +21,7 @@ jobs: apply-cluster-resources: uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main with: - config: 'signal-cluster-config.yaml' + config: 'signal-cluster-config-jenkins-server.yaml' secrets: SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} @@ -30,8 +30,8 @@ jobs: uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main with: domain: 'onwalk.net' - cluster_name: 'monitor' - ssh_host_name: 'monitor' + cluster_name: 'jenkins' + ssh_host_name: 'jenkins' secrets: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} From a3bdc1c6fb8a494d81e3aa27f5c0a7b8d3bfe6e9 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 14:22:30 +0800 Subject: [PATCH 21/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 34de248a..81990320 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 34de248a2841f9d23176651350316eb03427529f +Subproject commit 81990320a0555f68fe79fde6e8d821aca83fca77 From 32eba69bb48fade9d54a7f2edd8cd1c1c65aff3a Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 23 Mar 2024 18:40:26 +0800 Subject: [PATCH 22/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 81990320..795a5a33 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 81990320a0555f68fe79fde6e8d821aca83fca77 +Subproject commit 795a5a331f63ee14894d60744816657cb7945d92 From 8f4f22159a6c1046b8fbd61c83f3da5f69412cba Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 4 Apr 2024 21:12:31 +0800 Subject: [PATCH 23/55] workflows: add chaos-mesh iac-pipeline --- ...iac-pipeline-signal-cluster-chaos-mesh.yml | 60 +++++++++++++++++++ iac_modules | 2 +- playbook | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml new file mode 100644 index 00000000..76ceecb0 --- /dev/null +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -0,0 +1,60 @@ +name: Setup Chaos-mesh Server + +env: + STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy + CLOUD: "gcp" # 选择云服务商, 可选: gcp, aws, ali, azure + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + +on: + pull_request: + push: + paths: + - '.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml' + workflow_dispatch: + branches: + - main + +jobs: + apply-cluster-resources: + uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main + with: + config: 'signal-cluster-config-jenkins-server.yaml' + secrets: + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + + setup-k3s-cluster: + uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main + with: + domain: 'onwalk.net' + cluster_name: 'jenkins' + ssh_host_name: 'jenkins' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + VAULT_URL: ${{ secrets.VAULT_URL }} + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - apply-cluster-resources + + setup-iac-pipeline-signal-cluster-chaos-mesh-server: + uses: svc-design/actions/.github/workflows/setup-chaos-mesh-server.yaml@main + with: + domain: 'onwalk.net' + cluster_name: 'chaos-mesh' + ssh_host_name: 'chaos-mesh' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + ADMIN_PASSWORD: ${{ secrets.ADMIN_INIT_PASSWORD }} + needs: + - setup-k3s-cluster diff --git a/iac_modules b/iac_modules index 4458121c..15b60fd3 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit 4458121c2a6df36ecb000bf3514b83fa461edf9c +Subproject commit 15b60fd3662513e94eebf717bf553819518b1629 diff --git a/playbook b/playbook index 795a5a33..6a4edb76 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 795a5a331f63ee14894d60744816657cb7945d92 +Subproject commit 6a4edb762eabd86a4275529d376a102b1c602a0a From 1c8c75053650227682e3189ae461206a3fe61f48 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 4 Apr 2024 21:18:19 +0800 Subject: [PATCH 24/55] workflows: update chaos-mesh iac-pipeline --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 76ceecb0..9fdaba0a 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -44,7 +44,7 @@ jobs: - apply-cluster-resources setup-iac-pipeline-signal-cluster-chaos-mesh-server: - uses: svc-design/actions/.github/workflows/setup-chaos-mesh-server.yaml@main + uses: svc-design/actions/.github/workflows/setup-chaos-mesh.yaml@main with: domain: 'onwalk.net' cluster_name: 'chaos-mesh' From 2a2aa7cf05668e2c38603d017d3639adf2ec763a Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 4 Apr 2024 21:20:04 +0800 Subject: [PATCH 25/55] workflows: remove ADMIN_PASSWORD chaos-mesh iac-pipeline --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 9fdaba0a..04d6fbe7 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -55,6 +55,5 @@ jobs: DNS_AK: ${{ secrets.DNS_AK }} DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }} - ADMIN_PASSWORD: ${{ secrets.ADMIN_INIT_PASSWORD }} needs: - setup-k3s-cluster From cfbc686d9715b056070fd2cc762ef6dc80a940c4 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 15:46:55 +0800 Subject: [PATCH 26/55] workflows: set chaos-mesh server hostname --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 4 ++-- playbook | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 04d6fbe7..bb717a7d 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -30,8 +30,8 @@ jobs: uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main with: domain: 'onwalk.net' - cluster_name: 'jenkins' - ssh_host_name: 'jenkins' + cluster_name: 'chaosmesh' + ssh_host_name: 'chaosmesh' secrets: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/playbook b/playbook index 6a4edb76..370d85c9 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 6a4edb762eabd86a4275529d376a102b1c602a0a +Subproject commit 370d85c9e391e02206a4328392e105b65ac2f167 From 24aa3bfdc86ebf790ea63eebf607e88b5dbd7758 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 15:56:08 +0800 Subject: [PATCH 27/55] workflows/iac-pipeline-signal-cluster-chaos-mesh: update iac config --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index bb717a7d..22bfea93 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -21,7 +21,7 @@ jobs: apply-cluster-resources: uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main with: - config: 'signal-cluster-config-jenkins-server.yaml' + config: 'signal-cluster-config-chaosmesh-server.yaml' secrets: SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} From f1bae9af927cc9a200541b770acf9bf73a52b68a Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 15:57:07 +0800 Subject: [PATCH 28/55] sync iac_modules --- iac_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac_modules b/iac_modules index 15b60fd3..e5afce1f 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit 15b60fd3662513e94eebf717bf553819518b1629 +Subproject commit e5afce1f5d1c7dd3f2c767efd6a627c6b55a261e From f450c95f778d675fda9b73dd310e1cfc63509798 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 16:14:41 +0800 Subject: [PATCH 29/55] workflows/iac-pipeline-signal-cluster-chaos-mesh: update --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 22bfea93..4df98a11 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -47,8 +47,8 @@ jobs: uses: svc-design/actions/.github/workflows/setup-chaos-mesh.yaml@main with: domain: 'onwalk.net' - cluster_name: 'chaos-mesh' - ssh_host_name: 'chaos-mesh' + cluster_name: 'chaosmesh' + ssh_host_name: 'chaosmesh' secrets: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} From 5fef1382cf51cf0969888e0f762cb324542fa0bf Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 19:22:28 +0800 Subject: [PATCH 30/55] playbook: update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 370d85c9..8e9c4e11 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 370d85c9e391e02206a4328392e105b65ac2f167 +Subproject commit 8e9c4e11c9de38ba6bcd7653077f0512e0af0ce4 From b53c1fc293069f12db93b9ab423b2f7b0e9f04ed Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 20:22:51 +0800 Subject: [PATCH 31/55] workflows/iac-pipeline-signal-cluster-chaos-mesh: add setup-observability-server --- .../iac-pipeline-signal-cluster-chaos-mesh.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 4df98a11..57914396 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -57,3 +57,18 @@ jobs: SSH_USER: ${{ secrets.HOST_USER }} needs: - setup-k3s-cluster + + setup-observability-server: + uses: svc-design/actions/.github/workflows/setup-observability-server.yml@main + with: + domain: 'onwalk.net' + cluster_name: 'chaosmesh' + ssh_host_name: 'chaosmesh' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - setup-k3s-cluster From 0b7918ba0ed3ca7c33f46588333db8f73d7a48fd Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 20:37:15 +0800 Subject: [PATCH 32/55] playbook: update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 8e9c4e11..e66b3b94 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 8e9c4e11c9de38ba6bcd7653077f0512e0af0ce4 +Subproject commit e66b3b94983de1f26ccd6b4ecd5eba4d8fe23e1c From 7354fb7b861a44384ddeb3f9ff38e04df5e8b154 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 20:46:49 +0800 Subject: [PATCH 33/55] roles/observability-server: remove dependencies cert-manager --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index e66b3b94..f8d7748c 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit e66b3b94983de1f26ccd6b4ecd5eba4d8fe23e1c +Subproject commit f8d7748c3a3de4a70c85c98fcfed59e2faf143bd From a4acaf21e083cf8ff65a7f457eb6548da800ae90 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 20:57:19 +0800 Subject: [PATCH 34/55] playbook: update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index f8d7748c..9cf77ae7 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit f8d7748c3a3de4a70c85c98fcfed59e2faf143bd +Subproject commit 9cf77ae7ba048006861bf40af671ec09e0ddc33e From 939b131eecbd6a291f1333ee20950d3784654332 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 21:11:51 +0800 Subject: [PATCH 35/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 9cf77ae7..4982282e 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 9cf77ae7ba048006861bf40af671ec09e0ddc33e +Subproject commit 4982282e50ce49e98f7e10ee51881ca20ace4426 From 67cc94ded6d2b9bb131d5f9c54b963e88be64267 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 22:14:31 +0800 Subject: [PATCH 36/55] playbook: update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 4982282e..99b3d6bb 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 4982282e50ce49e98f7e10ee51881ca20ace4426 +Subproject commit 99b3d6bbddd23c82ff0c0df502038bfe866a7f56 From a3147325c16fdb46293553f0e8576c87178a9cd7 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Fri, 5 Apr 2024 22:31:56 +0800 Subject: [PATCH 37/55] roles/observability-server: update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 99b3d6bb..ee1991da 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 99b3d6bbddd23c82ff0c0df502038bfe866a7f56 +Subproject commit ee1991da240168bebbe83ae9917543638b9fce04 From 209c6808b6aa7f506d55dd4f08899b37987ac4a0 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 06:54:53 +0800 Subject: [PATCH 38/55] workflows/iac-pipeline-signal-cluster-chaos-mesh: update --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 4 ++-- playbook | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 57914396..4746a155 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -58,8 +58,8 @@ jobs: needs: - setup-k3s-cluster - setup-observability-server: - uses: svc-design/actions/.github/workflows/setup-observability-server.yml@main + setup-deepflow-server: + uses: svc-design/actions/.github/workflows/setup-deepflow-server.yml@main with: domain: 'onwalk.net' cluster_name: 'chaosmesh' diff --git a/playbook b/playbook index ee1991da..3fc20fb2 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit ee1991da240168bebbe83ae9917543638b9fce04 +Subproject commit 3fc20fb27999b0a56d5d01fe29f8f94476518672 From 389a9ee6b99e4027e8aac600e8c55ca24f1b7b76 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 07:15:02 +0800 Subject: [PATCH 39/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 3fc20fb2..4af57899 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 3fc20fb27999b0a56d5d01fe29f8f94476518672 +Subproject commit 4af578997e7908b0f13b30f5efc496e8b7b28a25 From 67dfe7d58f29c90b296ef41840bb648273f1ae74 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 07:22:55 +0800 Subject: [PATCH 40/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 4af57899..a25fc060 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 4af578997e7908b0f13b30f5efc496e8b7b28a25 +Subproject commit a25fc060c6b583094417590569cc4980213fdb22 From 8b3983866e3651fddf58447a4a117518e73cb2ee Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 07:49:57 +0800 Subject: [PATCH 41/55] update --- iac_modules | 2 +- playbook | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iac_modules b/iac_modules index e5afce1f..a8aa0b19 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit e5afce1f5d1c7dd3f2c767efd6a627c6b55a261e +Subproject commit a8aa0b197e1b18b59a7922d7239e4f99889e2333 diff --git a/playbook b/playbook index a25fc060..4ba957bb 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit a25fc060c6b583094417590569cc4980213fdb22 +Subproject commit 4ba957bb355763ac8574acabdc5056475ec907de From e811264cd2f8744c55a84e90206b38696911bdbe Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 10:28:36 +0800 Subject: [PATCH 42/55] update --- .github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml | 4 ++-- iac_modules | 2 +- playbook | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 4746a155..04076b37 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -62,8 +62,8 @@ jobs: uses: svc-design/actions/.github/workflows/setup-deepflow-server.yml@main with: domain: 'onwalk.net' - cluster_name: 'chaosmesh' - ssh_host_name: 'chaosmesh' + cluster_name: 'deepflow' + ssh_host_name: 'deepflow' secrets: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/iac_modules b/iac_modules index a8aa0b19..0353fa96 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit a8aa0b197e1b18b59a7922d7239e4f99889e2333 +Subproject commit 0353fa96ca59091fa6bfe9fd6a02e08804074fd2 diff --git a/playbook b/playbook index 4ba957bb..07010045 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 4ba957bb355763ac8574acabdc5056475ec907de +Subproject commit 070100452796212feff6fd96dca59f3478f11b55 From f017e4120ddf9828126b61ee81a2f88f0e7ec487 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 11:17:07 +0800 Subject: [PATCH 43/55] update --- ...iac-pipeline-signal-cluster-chaos-mesh.yml | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 04076b37..64a1bf9f 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -26,7 +26,7 @@ jobs: SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} - setup-k3s-cluster: + setup-k3s-cluster-chaosmesh: uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main with: domain: 'onwalk.net' @@ -56,7 +56,24 @@ jobs: DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }} needs: - - setup-k3s-cluster + - setup-k3s-cluster-chaosmesh + + setup-k3s-cluster-deepflow: + uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main + with: + domain: 'onwalk.net' + cluster_name: 'deepflow' + ssh_host_name: 'deepflow' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + VAULT_URL: ${{ secrets.VAULT_URL }} + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - apply-cluster-resources setup-deepflow-server: uses: svc-design/actions/.github/workflows/setup-deepflow-server.yml@main @@ -71,4 +88,4 @@ jobs: DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }} needs: - - setup-k3s-cluster + - setup-k3s-cluster-deepflow From a0aee55747c9ce01aa021d8526f34e3485297c93 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 13:11:08 +0800 Subject: [PATCH 44/55] update --- iac_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac_modules b/iac_modules index 0353fa96..62f95b25 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit 0353fa96ca59091fa6bfe9fd6a02e08804074fd2 +Subproject commit 62f95b25b4cca7d6f44dbe7938fe40bd01ea56c6 From ce7a418162563b750d911a22d58ab7b0baae7703 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 14:25:17 +0800 Subject: [PATCH 45/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 07010045..6814c30f 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 070100452796212feff6fd96dca59f3478f11b55 +Subproject commit 6814c30fcdc76e13f2e3e6038feb3cedf4fd078f From 22711f51d7136e01a2bed845dc2158a13c1c8640 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 14:36:39 +0800 Subject: [PATCH 46/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 6814c30f..24440790 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 6814c30fcdc76e13f2e3e6038feb3cedf4fd078f +Subproject commit 244407905242af9184637f9a550c73757f7e32b2 From 2ee2db43553fa731f7ff14abd36e2985018d7e26 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 14:39:23 +0800 Subject: [PATCH 47/55] update --- ...iac-pipeline-signal-cluster-chaos-mesh.yml | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml index 64a1bf9f..4746a155 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-chaos-mesh.yml @@ -26,7 +26,7 @@ jobs: SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} - setup-k3s-cluster-chaosmesh: + setup-k3s-cluster: uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main with: domain: 'onwalk.net' @@ -56,31 +56,14 @@ jobs: DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }} needs: - - setup-k3s-cluster-chaosmesh - - setup-k3s-cluster-deepflow: - uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main - with: - domain: 'onwalk.net' - cluster_name: 'deepflow' - ssh_host_name: 'deepflow' - secrets: - GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} - SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} - DNS_AK: ${{ secrets.DNS_AK }} - DNS_SK: ${{ secrets.DNS_SK }} - VAULT_URL: ${{ secrets.VAULT_URL }} - VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} - SSH_USER: ${{ secrets.HOST_USER }} - needs: - - apply-cluster-resources + - setup-k3s-cluster setup-deepflow-server: uses: svc-design/actions/.github/workflows/setup-deepflow-server.yml@main with: domain: 'onwalk.net' - cluster_name: 'deepflow' - ssh_host_name: 'deepflow' + cluster_name: 'chaosmesh' + ssh_host_name: 'chaosmesh' secrets: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} @@ -88,4 +71,4 @@ jobs: DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }} needs: - - setup-k3s-cluster-deepflow + - setup-k3s-cluster From 0c3748cce2a05523d9a99313d053692a7d6a7c63 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 14:41:19 +0800 Subject: [PATCH 48/55] update --- iac_modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac_modules b/iac_modules index 62f95b25..5128bb76 160000 --- a/iac_modules +++ b/iac_modules @@ -1 +1 @@ -Subproject commit 62f95b25b4cca7d6f44dbe7938fe40bd01ea56c6 +Subproject commit 5128bb769bbb35400b0869776b36b14a86219ac7 From 0fb85c0da2a2050b6e4e482149a960945d19eb8c Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 17:25:42 +0800 Subject: [PATCH 49/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 24440790..e6a9f7b9 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 244407905242af9184637f9a550c73757f7e32b2 +Subproject commit e6a9f7b9c32a13e261c787f4c1063ff59b105a15 From a60b0cde1c43895c684cfa2515fb2f01a7c12273 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Sat, 6 Apr 2024 19:25:13 +0800 Subject: [PATCH 50/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index e6a9f7b9..61f3a865 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit e6a9f7b9c32a13e261c787f4c1063ff59b105a15 +Subproject commit 61f3a8654e521d4cc7bfbb3580fbbabe79d10349 From 40cae85859a2a7af6ba27e0140843e375a557aee Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 11 Apr 2024 22:21:40 +0800 Subject: [PATCH 51/55] add workflows/iac-pipeline-signal-cluster-harbor.yml --- .../iac-pipeline-signal-cluster-harbor.yml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/iac-pipeline-signal-cluster-harbor.yml diff --git a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml new file mode 100644 index 00000000..56307e6c --- /dev/null +++ b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml @@ -0,0 +1,59 @@ +name: Setup harbor Server + +env: + STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy + CLOUD: "gcp" # 选择云服务商, 可选: gcp, aws, ali, azure + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + +on: + pull_request: + push: + paths: + - '.github/workflows/setup-harbor-server.yml' + workflow_dispatch: + branches: + - main + +jobs: + apply-cluster-resources: + uses: svc-design/actions/.github/workflows/setup-gcp-cloud.yml@main + with: + config: 'signal-cluster-config-chaosmesh-server.yaml' + secrets: + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + + setup-k3s-cluster: + uses: svc-design/actions/.github/workflows/setup-k3s-cluster.yml@main + with: + domain: 'onwalk.net' + cluster_name: 'chaosmesh' + ssh_host_name: 'chaosmesh' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + VAULT_URL: ${{ secrets.VAULT_URL }} + VAULT_TOKEN: ${{ secrets.VAULT_TOKEN }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - apply-cluster-resources + + setup-iac-pipeline-signal-cluster-chaos-mesh-server: + uses: svc-design/actions/.github/workflows/harbor-server.yml@main + with: + domain: 'onwalk.net' + cluster_name: 'chaosmesh' + ssh_host_name: 'chaosmesh' + secrets: + GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + DNS_AK: ${{ secrets.DNS_AK }} + DNS_SK: ${{ secrets.DNS_SK }} + SSH_USER: ${{ secrets.HOST_USER }} + needs: + - setup-k3s-cluster From a42fe369f98fccc344bf3f067faa81e34eb3f46c Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 11 Apr 2024 22:26:16 +0800 Subject: [PATCH 52/55] update --- .github/workflows/iac-pipeline-signal-cluster-harbor.yml | 2 +- playbook | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml index 56307e6c..c008e5ee 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml @@ -1,4 +1,4 @@ -name: Setup harbor Server +name: Setup harbor Server with IAC env: STATE: "create" # 可以根据需要更改初始状态, 可选create，update, destroy diff --git a/playbook b/playbook index 61f3a865..24440790 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 61f3a8654e521d4cc7bfbb3580fbbabe79d10349 +Subproject commit 244407905242af9184637f9a550c73757f7e32b2 From 4d4f582ad759a493db888a54c6ba7ae075cb2b78 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 11 Apr 2024 22:29:24 +0800 Subject: [PATCH 53/55] update --- .github/workflows/iac-pipeline-signal-cluster-harbor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml index c008e5ee..e1c0f5ea 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml @@ -44,7 +44,7 @@ jobs: - apply-cluster-resources setup-iac-pipeline-signal-cluster-chaos-mesh-server: - uses: svc-design/actions/.github/workflows/harbor-server.yml@main + uses: svc-design/actions/.github/workflows/setup-harbor-server.yml@main with: domain: 'onwalk.net' cluster_name: 'chaosmesh' From 7daa19fae8cf58afc8d3189e5f2dd7f313da9cf7 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 11 Apr 2024 22:40:58 +0800 Subject: [PATCH 54/55] update --- playbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbook b/playbook index 24440790..40f06865 160000 --- a/playbook +++ b/playbook @@ -1 +1 @@ -Subproject commit 244407905242af9184637f9a550c73757f7e32b2 +Subproject commit 40f0686585d90960df67b7c85f54dbbbe13cc118 From df86a2a53589e1604fe88b59016b46d836fda12e Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Thu, 11 Apr 2024 23:05:14 +0800 Subject: [PATCH 55/55] update --- .github/workflows/iac-pipeline-signal-cluster-harbor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml index e1c0f5ea..292e3387 100644 --- a/.github/workflows/iac-pipeline-signal-cluster-harbor.yml +++ b/.github/workflows/iac-pipeline-signal-cluster-harbor.yml @@ -43,7 +43,7 @@ jobs: needs: - apply-cluster-resources - setup-iac-pipeline-signal-cluster-chaos-mesh-server: + setup-iac-pipeline-signal-cluster-harbor-server: uses: svc-design/actions/.github/workflows/setup-harbor-server.yml@main with: domain: 'onwalk.net' @@ -52,6 +52,8 @@ jobs: secrets: GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + OSS_AK: ${{ secrets.OSS_AK }} + OSS_SK: ${{ secrets.OSS_SK }} DNS_AK: ${{ secrets.DNS_AK }} DNS_SK: ${{ secrets.DNS_SK }} SSH_USER: ${{ secrets.HOST_USER }}