From 840b6694792abbf747b56f17327692cc0354b3aa Mon Sep 17 00:00:00 2001 From: ytshih Date: Fri, 18 Oct 2024 16:27:15 +0000 Subject: [PATCH] Change: kubectl and service image --- .gitea/workflows/image.yaml | 17 +++++++---------- k8s/deploy.archrepo.yaml | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/image.yaml b/.gitea/workflows/image.yaml index 99ad8e1..3bc41ba 100644 --- a/.gitea/workflows/image.yaml +++ b/.gitea/workflows/image.yaml @@ -1,4 +1,4 @@ -name: release-tag +name: Build image and deploy on: push @@ -6,9 +6,6 @@ on: jobs: release-image: runs-on: imgbuilder - # seems broken (2024/06/26) - # container: - # image: gitea/act_runner env: CONTAINER_REGISTRY: gitea.konchin.com GITEA_TAG: latest @@ -16,14 +13,14 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - - name: Setup Root CA + - name: Set up Root CA run: | echo "${{ vars.ROOTCA }}" | tee rootca.pem - - name: Setup Docker BuildX + - name: Set up Docker BuildX uses: docker/setup-buildx-action@v3 with: config-inline: | @@ -38,7 +35,7 @@ jobs: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_PASSWORD }} - - name: Setup env + - name: Set up env run: | echo "GITEA_REPO=${GITHUB_REPOSITORY}" | tr '[:upper:]' '[:lower:]' >> $GITHUB_ENV echo "GITEA_REF_NAME=${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' >> $GITHUB_ENV @@ -59,7 +56,7 @@ jobs: needs: release-image runs-on: imgbuilder container: - image: gitea.konchin.com/system/kubectl-image + image: gitea.konchin.com/image/kubectl credentials: username: ${{ secrets.REGISTRY_USERNAME }} password: ${{ secrets.REGISTRY_PASSWORD }} @@ -67,7 +64,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup kubeconfig + - name: Set up kubeconfig run: | echo "${{ secrets.KUBE_CONFIG }}" > .kubeconfig cat .kubeconfig diff --git a/k8s/deploy.archrepo.yaml b/k8s/deploy.archrepo.yaml index 18cc651..89e9cdd 100644 --- a/k8s/deploy.archrepo.yaml +++ b/k8s/deploy.archrepo.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: repo - image: 'gitea.konchin.com/services/archrepo:latest' + image: gitea.konchin.com/service/archrepo:latest ports: - name: http containerPort: 80