diff --git a/.github/workflows/setup-k3s-with-existed-vhost.yml b/.github/workflows/setup-k3s-with-existed-vhost.yml index dc26202e..5fbdb8fe 100644 --- a/.github/workflows/setup-k3s-with-existed-vhost.yml +++ b/.github/workflows/setup-k3s-with-existed-vhost.yml @@ -11,11 +11,11 @@ env: AWS_SK: ${{ secrets.AWS_SECRET_KEY }} ALI_AK: ${{ secrets.ALI_AK }} ALI_SK: ${{ secrets.ALI_SK }} - SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + SSH_PUBLIC_KEY: ${{ secrets.SSH_PUBLIC_KEY }} SMTP_PASSWORD: ${{ secrets.SMTP_PASSWORD }} - OIDC_CLIENT_TOKEN: ${{ secrets.OIDC_CLIENT_TOKEN }} OIDC_ADMIN_PASSWORD: ${{ secrets.OIDC_ADMIN_PASSWORD }} + GITLAB_OIDC_CLIENT_TOKEN: ${{ secrets.GILAB_OIDC_CLIENT_TOKEN }} HARBOR_ADMIN_PASSWORD: ${{ secrets.HARBOR_ADMIN_PASSWORD }} defaults: @@ -55,7 +55,7 @@ jobs: dns_ak=$DNS_AK dns_sk=$DNS_SK ingress_ip=20.18.50.198 - OIDC_CLIENT_TOKEN=$OIDC_CLIENT_TOKEN + gitlab_odic_client_token=$GITLAB_OIDC_CLIENT_TOKEN EOF ansible-playbook -i hosts/inventory jobs/init_k3s_cluster -D ansible-playbook -i hosts/inventory jobs/init_gitlab -D @@ -98,6 +98,6 @@ jobs: dns_ak=$DNS_AK dns_sk=$DNS_SK ingress_ip=8.130.11.192 - HARBOR_ADMIN_PASSWORD=$HARBOR_ADMIN_PASSWORD + harbor_admin_password=$HARBOR_ADMIN_PASSWORD EOF ansible-playbook -i hosts/inventory jobs/init_harbor -D diff --git a/playbook/roles/gitlab/templates/provider.yaml b/playbook/roles/gitlab/templates/provider.yaml index 6d7b73a6..7c61a007 100644 --- a/playbook/roles/gitlab/templates/provider.yaml +++ b/playbook/roles/gitlab/templates/provider.yaml @@ -14,5 +14,5 @@ args: issuer: 'https://keycloak.onwalk.net/realms/cloud-sso' client_options: identifier: 'gitlab-oidc' - secret: 'xxxxxxxxxxxxxxx' + secret: '{{ gitlab_odic_client_token }}' redirect_uri: 'https://gitlab.onwalk.net/users/auth/openid_connect/callback' diff --git a/playbook/roles/harbor/tasks/main.yml b/playbook/roles/harbor/tasks/main.yml index 88833d1c..b84e82c0 100755 --- a/playbook/roles/harbor/tasks/main.yml +++ b/playbook/roles/harbor/tasks/main.yml @@ -31,4 +31,4 @@ - harbor-oidc-config.json - name: Setup harbor oidc config - script: files/post-setup.sh {{ HARBOR_ADMIN_PASSWORD }} + script: files/post-setup.sh {{ harbor_admin_password }}