From 8464b1e2a8fc55354ba4e01e8f1acb507bfc0f8e Mon Sep 17 00:00:00 2001 From: ytshih Date: Thu, 5 Sep 2024 11:44:17 +0000 Subject: [PATCH] Fix: Change namespace to algo-dcbot --- docker-compose.yml | 3 +- k8s/deploy.algo-dcbot.yml | 21 ++-- ...cbot-config.yml => secret.algo-dcbot.yaml} | 9 +- k8s/secret.regcred.yaml | 8 ++ package-lock.json | 95 +------------------ package.json | 3 +- 6 files changed, 27 insertions(+), 112 deletions(-) rename k8s/{cm.algo-dcbot-config.yml => secret.algo-dcbot.yaml} (60%) create mode 100644 k8s/secret.regcred.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 7362726..3b4a9c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,5 @@ services: service: - build: . + image: gitea.konchin.com/services/algo-dcbot:latest + env_file: ./.env restart: always diff --git a/k8s/deploy.algo-dcbot.yml b/k8s/deploy.algo-dcbot.yml index edf7ea1..430b54f 100644 --- a/k8s/deploy.algo-dcbot.yml +++ b/k8s/deploy.algo-dcbot.yml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: algo-dcbot + namespace: algo-dcbot labels: app: algo-dcbot spec: @@ -24,27 +25,23 @@ spec: env: - name: DC_TOKEN valueFrom: - configMapKeyRef: - name: algo-dcbot-config + secretKeyRef: + name: algo-dcbot-secret key: dcbot-token - optional: false - name: DC_CLIENTID valueFrom: - configMapKeyRef: - name: algo-dcbot-config + secretKeyRef: + name: algo-dcbot-secret key: dcbot-id - optional: false - name: ADMIN_ID valueFrom: - configMapKeyRef: - name: algo-dcbot-config + secretKeyRef: + name: algo-dcbot-secret key: maintainer-id - optional: true - name: DEFAULT_ROLE valueFrom: - configMapKeyRef: - name: algo-dcbot-config + secretKeyRef: + name: algo-dcbot-secret key: default-role-id - optional: true imagePullSecrets: - name: regcred diff --git a/k8s/cm.algo-dcbot-config.yml b/k8s/secret.algo-dcbot.yaml similarity index 60% rename from k8s/cm.algo-dcbot-config.yml rename to k8s/secret.algo-dcbot.yaml index 8793d67..dd8d62a 100644 --- a/k8s/cm.algo-dcbot-config.yml +++ b/k8s/secret.algo-dcbot.yaml @@ -1,10 +1,11 @@ --- apiVersion: v1 -kind: ConfigMap +kind: Secret metadata: - name: algo-dcbot-config + name: algo-dcbot-secret + namespace: algo-dcbot data: - dcbot-token: dcbot-id: - maintainer-id: + dcbot-token: default-role-id: + maintainer-id: diff --git a/k8s/secret.regcred.yaml b/k8s/secret.regcred.yaml new file mode 100644 index 0000000..da2736e --- /dev/null +++ b/k8s/secret.regcred.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + name: regcred + namespace: algo-dcbot +type: kubernetes.io/dockerconfigjson +data: + .dockerconfigjson: diff --git a/package-lock.json b/package-lock.json index de89cd4..c6a7bdf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,15 @@ { - "name": "tanikaze-amane", + "name": "arisu-tachibana", "version": "1.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "tanikaze-amane", + "name": "arisu-tachibana", "version": "1.0.1", "license": "ISC", "dependencies": { "@types/node": "^20.3.2", - "axios": "^1.6.2", "discord.js": "^14.11.0", "dotenv": "^16.3.1", "fs": "^0.0.1-security", @@ -181,40 +180,6 @@ "npm": ">=7.0.0" } }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "node_modules/axios": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz", - "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==", - "dependencies": { - "follow-redirects": "^1.15.0", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/discord-api-types": { "version": "0.37.61", "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.61.tgz", @@ -260,38 +225,6 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, - "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/fs": { "version": "0.0.1-security", "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", @@ -317,25 +250,6 @@ "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.5.0.tgz", "integrity": "sha512-wJkXvutRbNWcc37tt5j1HyOK1nosspdh3dj6LUYYAvF6JYNqs53IfRvK9oEpcwiDA1NdoIi64yAMfdivPeVAyw==" }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, "node_modules/moment": { "version": "2.29.4", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", @@ -372,11 +286,6 @@ "node": ">= 0.6.0" } }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, "node_modules/ts-mixer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz", diff --git a/package.json b/package.json index 8d4142b..588d9fc 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "main": "index.ts", "scripts": { "test": "ts-node index.ts", - "build": "npx tsc --build", + "build": "npx tsc --build", "clean": "npx tsc --build --clean" }, "repository": { @@ -19,7 +19,6 @@ "homepage": "https://github.com/konchinshih/algo-dcbot", "dependencies": { "@types/node": "^20.3.2", - "axios": "^1.6.2", "discord.js": "^14.11.0", "dotenv": "^16.3.1", "fs": "^0.0.1-security",