From 941df5ee22e52670285518996e83a0d9d07805da Mon Sep 17 00:00:00 2001 From: ytshih Date: Wed, 6 Nov 2024 01:56:47 +0000 Subject: [PATCH] Refactor: Use flux instead of kubectl --- .gitea/workflows/image.yaml | 24 ------------------------ {k8s => flux}/deploy.mafuyu.yaml | 1 - flux/kustomization.yaml | 9 +++++++++ flux/ns.mafuyu.yaml | 5 +++++ 4 files changed, 14 insertions(+), 25 deletions(-) rename {k8s => flux}/deploy.mafuyu.yaml (97%) create mode 100644 flux/kustomization.yaml create mode 100644 flux/ns.mafuyu.yaml diff --git a/.gitea/workflows/image.yaml b/.gitea/workflows/image.yaml index 8a81ad5..999f864 100644 --- a/.gitea/workflows/image.yaml +++ b/.gitea/workflows/image.yaml @@ -49,27 +49,3 @@ jobs: tags: | ${{ env.CONTAINER_REGISTRY }}/${{ env.GITEA_REPO }}:${{ env.GITEA_REF_NAME }} ${{ env.CONTAINER_REGISTRY }}/${{ env.GITEA_REPO }}:${{ env.GITEA_TAG }} - deploy: - needs: release-image - runs-on: imgbuilder - container: - image: gitea.konchin.com/image/kubectl - credentials: - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup kubeconfig - run: | - echo "${{ secrets.KUBE_CONFIG }}" > .kubeconfig - cat .kubeconfig - - - name: Deploy - run: | - kubectl --kubeconfig .kubeconfig apply -Rf k8s/ - - - name: Rollout restart - run: | - kubectl --kubeconfig .kubeconfig -n mafuyu-kirisu rollout restart deployment mafuyu diff --git a/k8s/deploy.mafuyu.yaml b/flux/deploy.mafuyu.yaml similarity index 97% rename from k8s/deploy.mafuyu.yaml rename to flux/deploy.mafuyu.yaml index 28edbcc..8002b07 100644 --- a/k8s/deploy.mafuyu.yaml +++ b/flux/deploy.mafuyu.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: mafuyu - namespace: mafuyu-kirisu labels: app: mafuyu spec: diff --git a/flux/kustomization.yaml b/flux/kustomization.yaml new file mode 100644 index 0000000..99fbb1f --- /dev/null +++ b/flux/kustomization.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: mafuyu-kirisu +generatorOptions: + disableNameSuffixHash: true +resources: + - ns.mafuyu.yaml + - deploy.mafuyu.yaml diff --git a/flux/ns.mafuyu.yaml b/flux/ns.mafuyu.yaml new file mode 100644 index 0000000..be7cf1d --- /dev/null +++ b/flux/ns.mafuyu.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: mafuyu-kirisu