diff --git a/.github/workflows/setup-k3s-with-existed-vhost.yml b/.github/workflows/setup-k3s-with-existed-vhost.yml index 398eeb4a..db7ad3d5 100644 --- a/.github/workflows/setup-k3s-with-existed-vhost.yml +++ b/.github/workflows/setup-k3s-with-existed-vhost.yml @@ -59,8 +59,8 @@ jobs: smtp_password=$SMTP_PASSWORD gitlab_odic_client_token=$GITLAB_OIDC_CLIENT_TOKEN EOF - #ansible-playbook -i hosts/inventory jobs/init_ssl_cert -D - #ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D + ansible-playbook -i hosts/inventory jobs/init_ssl_cert -D + ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D ansible-playbook -i hosts/inventory jobs/init_gitlab -D #ansible-playbook -i hosts/inventory jobs/init_chatwithgpt -D #ansible-playbook -i hosts/inventory jobs/init_harbor -D diff --git a/playbook/roles/gitlab/tasks/main.yml b/playbook/roles/gitlab/tasks/main.yml index 49fd6bfe..f14015ee 100755 --- a/playbook/roles/gitlab/tasks/main.yml +++ b/playbook/roles/gitlab/tasks/main.yml @@ -28,7 +28,7 @@ - name: "cluster {{ ClusterContext }} Create New Generic Secret from Key/Vaule" shell: 'kubectl delete secret {{ item.secret_name }} -n {{ namespace }} || echo true; kubectl create secret generic {{ item.secret_name }} --from-literal={{ item.key }}="{{ item.value }}" -n {{ namespace }}' loop: - - { secret_name: 'gitlab-sso-secret', key: 'password', value: "provider=/tmp/provider.yaml" } + - { secret_name: 'gitlab-sso-secret', key: 'provider', value: "provider=/tmp/provider.yaml" } - { secret_name: 'gitlab-db-secret', key: 'password', value: 'hostvars[groups[group][0]].pg_db_password' } - { secret_name: 'gitlab-redis-secret', key: 'password', value: 'hostvars[groups[group][0]].redis_password' }