diff --git a/.github/workflows/pulumi-cloud-resource-create.yml b/.github/workflows/pulumi-cloud-resource-create.yml index a349e81f..dcfef9f7 100644 --- a/.github/workflows/pulumi-cloud-resource-create.yml +++ b/.github/workflows/pulumi-cloud-resource-create.yml @@ -98,7 +98,6 @@ jobs: dns_ak=$DNS_AK dns_sk=$DNS_SK ingress_ip=$k3s_server_public_ip - k3s_public_ip=$k3s_server_public_ip EOF ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D #ansible-playbook -i hosts/inventory jobs/init_mysql -D diff --git a/.github/workflows/setup-k3s-with-existed-vhost.yml b/.github/workflows/setup-k3s-with-existed-vhost.yml index e73f4724..343bd8a6 100644 --- a/.github/workflows/setup-k3s-with-existed-vhost.yml +++ b/.github/workflows/setup-k3s-with-existed-vhost.yml @@ -47,7 +47,7 @@ jobs: dns_ak=$DNS_AK dns_sk=$DNS_SK ingress_ip=18.162.44.15 - k3s_public_ip=18.162.44.15 + keycloak_ui_password=$OIDC_ADMIN_PASSWORD EOF #ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D #ansible-playbook -i hosts/inventory jobs/init_chatwithgpt -D diff --git a/playbook/roles/k3s/files/setup-k3s-with-hostpath-sc.sh b/playbook/roles/k3s/files/setup-k3s-with-hostpath-sc.sh index 7cead248..a354e5bb 100644 --- a/playbook/roles/k3s/files/setup-k3s-with-hostpath-sc.sh +++ b/playbook/roles/k3s/files/setup-k3s-with-hostpath-sc.sh @@ -1,7 +1,5 @@ #!/bin/bash -export k3s_public_ip=$1 - mkdir -pv /opt/rancher/k3s curl -sfL https://get.k3s.io | sh -s - \ --disable=traefik,servicelb \ diff --git a/playbook/roles/k3s/tasks/main.yml b/playbook/roles/k3s/tasks/main.yml index 83dc4aaf..21f39305 100755 --- a/playbook/roles/k3s/tasks/main.yml +++ b/playbook/roles/k3s/tasks/main.yml @@ -1,5 +1,5 @@ - name: Setup K3S Server - script: files/setup-k3s-with-hostpath-sc.sh {{ k3s_public_ip }} + script: files/setup-k3s-with-hostpath-sc.sh when: inventory_hostname in groups[group] - name: Setup Ingress