diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 6b499ce..fdf43cb 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -54,10 +54,10 @@ jobs: chmod +x kubectl mv kubectl /usr/local/bin/ - - name: Deploy to Volcengine VKE + - name: Deploy to K3s run: | mkdir -p ~/.kube - echo "${{ secrets.KUBE_CONFIG_VKE }}" > ~/.kube/config + echo "${{ secrets.KUBE_CONFIG_K3S }}" > ~/.kube/config - name: Create or Update Secrets run: | diff --git a/k8s/backend-deployment.yaml b/k8s/backend-deployment.yaml index dfc03f9..73b1bf6 100644 --- a/k8s/backend-deployment.yaml +++ b/k8s/backend-deployment.yaml @@ -13,9 +13,9 @@ spec: metadata: labels: app: video-backend - annotations: - vke.volcengine.com/burst-to-vci: "enforce" spec: + imagePullSecrets: + - name: swr-secret containers: - name: video-backend image: ${CI_REGISTRY_IMAGE}/video-backend:latest diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml index 071f433..28c2890 100644 --- a/k8s/ingress.yaml +++ b/k8s/ingress.yaml @@ -3,9 +3,7 @@ kind: Ingress metadata: name: video-huoshan-ingress annotations: - kubernetes.io/ingress.class: "alb" - alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]' - alb.ingress.kubernetes.io/ssl-redirect: "true" + kubernetes.io/ingress.class: "traefik" cert-manager.io/cluster-issuer: "letsencrypt-prod" spec: tls: diff --git a/k8s/web-deployment.yaml b/k8s/web-deployment.yaml index a8b2bdb..572da96 100644 --- a/k8s/web-deployment.yaml +++ b/k8s/web-deployment.yaml @@ -13,9 +13,9 @@ spec: metadata: labels: app: video-web - annotations: - vke.volcengine.com/burst-to-vci: "enforce" spec: + imagePullSecrets: + - name: swr-secret containers: - name: video-web image: ${CI_REGISTRY_IMAGE}/video-web:latest