From b758624ce42744f66c46708d7a082d4c3a3b8191 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Mon, 7 Apr 2025 22:16:34 +0800 Subject: [PATCH 1/2] Update roles/vhosts/k3s-cluster --- ansible/playbooks/roles/vhosts/k3s-cluster/files/set-registry.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/playbooks/roles/vhosts/k3s-cluster/files/set-registry.sh b/ansible/playbooks/roles/vhosts/k3s-cluster/files/set-registry.sh index 521b91d4..5bd446db 100644 --- a/ansible/playbooks/roles/vhosts/k3s-cluster/files/set-registry.sh +++ b/ansible/playbooks/roles/vhosts/k3s-cluster/files/set-registry.sh @@ -87,6 +87,7 @@ if [ ! -f "ssl_certificates.tar.gz" ]; then else if [ -f "ssl_certificates.tar.gz" ]; then mkdir -p "$CERT_DIR" + tar -xvpf ssl_certificates.tar.gz tar -xvpf ssl_certificates.tar.gz -C "$CERT_DIR" echo "✅ 证书已解压至: $CERT_DIR" fi From 5b1401e43998f2b3a864cda03d8d1e26eb522859 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Mon, 7 Apr 2025 22:20:14 +0800 Subject: [PATCH 2/2] removed workflows: deplay-app-with-argocd.yaml --- .github/workflows/app-pipeline-vault.yml | 1 - .github/workflows/deplay-app-with-argocd.yaml | 19 ------------------- 2 files changed, 20 deletions(-) delete mode 100644 .github/workflows/deplay-app-with-argocd.yaml diff --git a/.github/workflows/app-pipeline-vault.yml b/.github/workflows/app-pipeline-vault.yml index 097b511f..def487e3 100644 --- a/.github/workflows/app-pipeline-vault.yml +++ b/.github/workflows/app-pipeline-vault.yml @@ -2,7 +2,6 @@ name: Setup Vault Server on: pull_request: - push: paths: - '.github/workflows/app-pipeline-vault.yml' workflow_dispatch: diff --git a/.github/workflows/deplay-app-with-argocd.yaml b/.github/workflows/deplay-app-with-argocd.yaml deleted file mode 100644 index b156e692..00000000 --- a/.github/workflows/deplay-app-with-argocd.yaml +++ /dev/null @@ -1,19 +0,0 @@ -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: - 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 }}