From a0fece2cf8b623a46676116bb62ffe7d8e63d299 Mon Sep 17 00:00:00 2001 From: ytshih Date: Fri, 18 Oct 2024 16:42:19 +0000 Subject: [PATCH] Change: kubectl and service image --- .gitea/workflows/image.yaml | 8 ++++++-- init/load-commands.ts | 4 ++-- k8s/deploy.amane-backend.yaml | 2 +- rootca.pem | 29 ----------------------------- 4 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 rootca.pem diff --git a/.gitea/workflows/image.yaml b/.gitea/workflows/image.yaml index ae6f1a0..8546914 100644 --- a/.gitea/workflows/image.yaml +++ b/.gitea/workflows/image.yaml @@ -1,4 +1,4 @@ -name: Release +name: Build image and deploy on: [push] jobs: @@ -14,6 +14,10 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 + - name: Set up Root CA + run: | + echo "${{ vars.ROOTCA }}" | tee rootca.pem + - name: Set up Docker BuildX uses: docker/setup-buildx-action@v3 with: @@ -49,7 +53,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 }} diff --git a/init/load-commands.ts b/init/load-commands.ts index 3a29f5a..fe3f9c9 100644 --- a/init/load-commands.ts +++ b/init/load-commands.ts @@ -11,8 +11,8 @@ export async function loadCommands(client: ExtendedClient): Promise file.endsWith('.ts')) - : (await readdir(commandsPath)).filter(file => file.endsWith('.js')); + ? (await readdir(commandsPath)).filter(file => file.endsWith('.ts')) + : (await readdir(commandsPath)).filter(file => file.endsWith('.js')); for(const file of commandsFiles){ const filePath = path.join(commandsPath, file); const data = await import(filePath); diff --git a/k8s/deploy.amane-backend.yaml b/k8s/deploy.amane-backend.yaml index 891706b..a1f08d6 100644 --- a/k8s/deploy.amane-backend.yaml +++ b/k8s/deploy.amane-backend.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: dcbot - image: 'gitea.konchin.com/services/amane-tanikaze-dcbot:latest' + image: gitea.konchin.com/service/amane-tanikaze-dcbot:latest env: - name: DC_TOKEN valueFrom: diff --git a/rootca.pem b/rootca.pem deleted file mode 100644 index 2f7ceaf..0000000 --- a/rootca.pem +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFAjCCAuqgAwIBAgIUQGFtCLSyk55KvnESvDfNJqGWX4EwDQYJKoZIhvcNAQEL -BQAwGTEXMBUGA1UEAwwOS29uY2hpbi5jb20gQ0EwHhcNMjQwOTEzMTcyMzMyWhcN -MzQwOTExMTcyMzMyWjAZMRcwFQYDVQQDDA5Lb25jaGluLmNvbSBDQTCCAiIwDQYJ -KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJDrd5hz7FZdNxGCUQt7gv+KDO/GRIbN -Lg31AD0AOY2CdSKUoHoDa6RRI0jZrZr7HqvDKXnfz4FAfydCFggVzLSY7dxhr571 -FcjezP1Y5Ft2ColAVbmUuftRf0mMV0pRgI+4evQTLIKJh35aw/ggarbhKn1Hf/6b -OoV05OmmHc1tUghOrafW7Qp2HSgdMRlyQPr+6j791aCEFSU19h7JKCOhcHbtGWDV -xsA0gWO+hGyiAhtvWYF1dgLZ7odKrV7gcm5r0+dDv8deBnfxZKaPDgGHT+ED4AeY -kRncWIhqILYNiD/xLwLAj3zeUi+REUiPcMaAGLxuriXmrUxRYeP4EaTxbjtLEKjI -OV3uOxOmHFpMHUqBC9IAuFdwdTEmPwvikSTgxfTjjcQr4Lq6maZqOynZK5Cfhxkw -slS1FhJw/wHe1z2kjykgV4Erp3oNOV5bdQYu1f4bz2R37sI4XEGRlPDVBr1KgCFB -jUcwCy/zFk4xdnayZD7MRMo3IOetDspuntkpOkwBrJTV9fJPhgikPUrFujMfojQs -aMttHLBFQN7ssDYVnw3FWJnpxD1eIbW1/2EG/18j/qpVi+N5QiFKoKLMiQcSltHi -Sg+BvEZXu6wlJI62LGzEwcdqv8b3XJJDObECI7NTj5RSW6EnLNKr9ryf/au9Aank -Y6/bjCB5peMvAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwICBDAPBgNVHRMBAf8EBTAD -AQH/MB0GA1UdDgQWBBRkNAxKfd3zytl/MIxhaPUIlfsolzANBgkqhkiG9w0BAQsF -AAOCAgEAD/S2hQok24RAsbu6FVIC1j9C+I+l9aQKljcLmdO8vCE4umSAPWiGXzro -HKGiR5rfghg4G0k5x8y3FDv475l4YodbZ1QGOZMWicLl9lA9KjO5BE/5FGZG6gCO -fHp1um/CdfoSsIRnzXQ46Alt/jo1il5flv3vnA3C4Zy+YmQ3EsOea+pezz31/a8I -XFDhjGZN4+viIE04EmcpQWGa46zeOkcweN23m92jnPN+Yi85Z+YnPXssyJTZKgvz -eA3Ww5wlGArph+w8qNOJAo/wibDElwks80/p744IhW0nNfRkPj3erphmGHnlcAjL -EMl3X9zglLjtV27WXXYhHp8luilcBsdZWOGN+OUX3uP+rcOowP93wW9yBiD68rF3 -0oG9zq0WLWOfPDSmM6mHDjI3Hwmx+VEL9cNMlm3h9UOQtJKnbUxbrrTkUzv4y9zE -fgOUvICOWRvdz0HnF5Dg4XyGQhMq+cqj0fD18Fl/KKTtU5CUXI66fmdNFdjePPcm -/FUI+7DFjum+WWOTdlJsYIPiH0MTDWrAdduzcEuQHo4Z9+FimgPBpyBQIhivF2WO -ACzQLzK++utdy7fp92WV1hyF14DTyVC/KwvF3vI0BycLXBoYhwubIRb5fCQxDm7q -UxhDKxf83XaYEu0LjfORZodfM4dQDdwsX4wHlHsLLdRWni6SwGw= ------END CERTIFICATE-----