From 6d3163ff397876357a7fa0a183a382e2071da352 Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Wed, 20 Dec 2023 23:05:01 +0800
Subject: [PATCH] add env: DNS_AK, DNS_SK

---
 .github/workflows/iac-pipeline-create.yml     | 20 ++++++++++++++-----
 .../workflows/use-ansible-playbook-role.yml   |  8 +++++++-
 playbook/init_k3s_cluster_with_gitops         |  1 +
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/iac-pipeline-create.yml b/.github/workflows/iac-pipeline-create.yml
index a930ad0c..91f6800e 100644
--- a/.github/workflows/iac-pipeline-create.yml
+++ b/.github/workflows/iac-pipeline-create.yml
@@ -32,8 +32,10 @@ jobs:
       ssh_host_name: 'monitor'
       config_task_name: 'init_k3s_cluster_with_gitops'
     secrets:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }}
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+      DNS_AK: ${{ secrets.DNS_AK }}
+      DNS_SK: ${{ secrets.DNS_SK }}
     needs:
       - apply-cluster-resources
 
@@ -45,8 +47,10 @@ jobs:
       ssh_host_name: 'devops'
       config_task_name: 'init_k3s_cluster_with_gitops'
     secrets:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }}
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+      DNS_AK: ${{ secrets.DNS_AK }}
+      DNS_SK: ${{ secrets.DNS_SK }}
     needs:
       - apply-cluster-resources
 
@@ -58,8 +62,10 @@ jobs:
       domain: 'svc-sit.ink'
       config_task_name: 'init_k3s_cluster_with_gitops'
     secrets:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }}
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+      DNS_AK: ${{ secrets.DNS_AK }}
+      DNS_SK: ${{ secrets.DNS_SK }}
     needs:
       - apply-cluster-resources
 
@@ -71,8 +77,10 @@ jobs:
       domain: 'svc-uat.ink'
       config_task_name: 'init_k3s_cluster_with_gitops'
     secrets:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }}
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+      DNS_AK: ${{ secrets.DNS_AK }}
+      DNS_SK: ${{ secrets.DNS_SK }}
     needs:
       - apply-cluster-resources
 
@@ -84,7 +92,9 @@ jobs:
       ssh_host_name: 'prod'
       config_task_name: 'init_k3s_cluster_with_gitops'
     secrets:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       GCP_CREDENTIALS_JSON: ${{ secrets.GCP_CREDENTIALS_JSON }}
+      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+      DNS_AK: ${{ secrets.DNS_AK }}
+      DNS_SK: ${{ secrets.DNS_SK }}
     needs:
       - apply-cluster-resources
diff --git a/.github/workflows/use-ansible-playbook-role.yml b/.github/workflows/use-ansible-playbook-role.yml
index c999a900..f4bb4d46 100644
--- a/.github/workflows/use-ansible-playbook-role.yml
+++ b/.github/workflows/use-ansible-playbook-role.yml
@@ -15,15 +15,21 @@ on:
         required: true
         type: string
     secrets:
+      GCP_CREDENTIALS_JSON:
+        required: true
       SSH_PRIVATE_KEY:
         required: true
-      GCP_CREDENTIALS_JSON:
+      DNS_AK:
+        required: true
+      DNS_SK:
         required: true
 
 jobs:
   setup-app-cluster:
     runs-on: ubuntu-latest
     env:
+      DNS_AK: ${{ secrets.DNS_AK }}
+      DNS_SK: ${{ secrets.DNS_SK }}
       SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
       SSH_HOST_DOMAIN: "${{ inputs.ssh_host_name }}.${{ inputs.domain }}"
     
diff --git a/playbook/init_k3s_cluster_with_gitops b/playbook/init_k3s_cluster_with_gitops
index 44ff0031..08e5c59b 100644
--- a/playbook/init_k3s_cluster_with_gitops
+++ b/playbook/init_k3s_cluster_with_gitops
@@ -22,4 +22,5 @@
       vars:
         group: master
         gitops: enable
+        external_dns: enable
         config_repo: https://github.com/svc-design/gitops.git