From 8acd160af5fdb4a7db636caf638350d9313b4e51 Mon Sep 17 00:00:00 2001 From: Monet Lee Date: Sat, 7 Dec 2024 18:10:58 +0800 Subject: [PATCH] update deploy yaml. --- deployments/deploy/clusterRole.yml | 25 +++++++++++ deployments/deploy/kafka-statefulset.yml | 7 +--- deployments/deploy/mongo-statefulset.yml | 42 +++++++++---------- deployments/deploy/openim-api-deployment.yml | 6 +-- .../deploy/openim-crontask-deployment.yml | 5 +-- .../deploy/openim-msggateway-deployment.yml | 4 +- .../deploy/openim-msgtransfer-deployment.yml | 4 +- deployments/deploy/openim-push-deployment.yml | 4 +- .../deploy/openim-rpc-auth-deployment.yml | 4 +- .../openim-rpc-conversation-deployment.yml | 4 +- .../deploy/openim-rpc-friend-deployment.yml | 7 ++-- .../deploy/openim-rpc-group-deployment.yml | 6 +-- .../deploy/openim-rpc-msg-deployment.yml | 6 +-- .../deploy/openim-rpc-third-deployment.yml | 6 +-- .../deploy/openim-rpc-user-deployment.yml | 6 +-- 15 files changed, 67 insertions(+), 69 deletions(-) create mode 100644 deployments/deploy/clusterRole.yml diff --git a/deployments/deploy/clusterRole.yml b/deployments/deploy/clusterRole.yml new file mode 100644 index 000000000..328cb6c7e --- /dev/null +++ b/deployments/deploy/clusterRole.yml @@ -0,0 +1,25 @@ +# ClusterRole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + # role name + name: service-reader +rules: + - apiGroups: [""] + resources: ["services"] + verbs: ["get", "list", "watch"] + +--- +# ClusterRoleBinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: default-service-reader-binding +subjects: + - kind: ServiceAccount + name: default + namespace: default +roleRef: + kind: ClusterRole + name: service-reader + apiGroup: rbac.authorization.k8s.io diff --git a/deployments/deploy/kafka-statefulset.yml b/deployments/deploy/kafka-statefulset.yml index 5672e6680..cad5525fb 100644 --- a/deployments/deploy/kafka-statefulset.yml +++ b/deployments/deploy/kafka-statefulset.yml @@ -47,18 +47,13 @@ spec: value: "CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT,PLAINTEXT:PLAINTEXT" - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES value: "CONTROLLER" - - name: KAFKA_NUM_PARTITIONS - value: "8" - name: KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE value: "true" volumeMounts: - name: kafka-data mountPath: /bitnami/kafka + volumes: - - name: kafka-scripts - configMap: - name: openim-config - defaultMode: 0755 - name: kafka-data persistentVolumeClaim: claimName: kafka-pvc diff --git a/deployments/deploy/mongo-statefulset.yml b/deployments/deploy/mongo-statefulset.yml index 77702fb46..e4ea598ec 100644 --- a/deployments/deploy/mongo-statefulset.yml +++ b/deployments/deploy/mongo-statefulset.yml @@ -16,35 +16,31 @@ spec: containers: - name: mongo image: mongo:7.0 - command: - [ - "/bin/bash", - "-c", - ' - docker-entrypoint.sh mongod --wiredTigerCacheSizeGB $wiredTigerCacheSizeGB --auth & - until mongosh -u $MONGO_INITDB_ROOT_USERNAME -p $MONGO_INITDB_ROOT_PASSWORD --authenticationDatabase admin --eval "db.runCommand({ ping: 1 })" &>/dev/null; do - echo "Waiting for MongoDB to start..." - sleep 1 + command: ["/bin/bash", "-c"] + args: + - > + docker-entrypoint.sh mongod --wiredTigerCacheSizeGB ${wiredTigerCacheSizeGB} --auth & + until mongosh -u ${MONGO_INITDB_ROOT_USERNAME} -p ${MONGO_INITDB_ROOT_PASSWORD} --authenticationDatabase admin --eval "db.runCommand({ ping: 1 })" &>/dev/null; do + echo "Waiting for MongoDB to start..."; + sleep 1; done && - mongosh -u $MONGO_INITDB_ROOT_USERNAME -p $MONGO_INITDB_ROOT_PASSWORD --authenticationDatabase admin --eval " - db = db.getSiblingDB(\"$MONGO_INITDB_DATABASE\"); - if (!db.getUser(\"$MONGO_OPENIM_USERNAME\")) { + mongosh -u ${MONGO_INITDB_ROOT_USERNAME} -p ${MONGO_INITDB_ROOT_PASSWORD} --authenticationDatabase admin --eval " + db = db.getSiblingDB(\"${MONGO_INITDB_DATABASE}\"); + if (!db.getUser(\"${MONGO_OPENIM_USERNAME}\")) { db.createUser({ - user: \"$MONGO_OPENIM_USERNAME\", - pwd: \"$MONGO_OPENIM_PASSWORD\", - roles: [{role: \"readWrite\", db: \"$MONGO_INITDB_DATABASE\"}] + user: \"${MONGO_OPENIM_USERNAME}\", + pwd: \"${MONGO_OPENIM_PASSWORD}\", + roles: [{role: \"readWrite\", db: \"${MONGO_INITDB_DATABASE}\"}] }); print(\"User created successfully: \"); - print(\"Username: $MONGO_OPENIM_USERNAME\"); - print(\"Password: $MONGO_OPENIM_PASSWORD\"); - print(\"Database: $MONGO_INITDB_DATABASE\"); + print(\"Username: ${MONGO_OPENIM_USERNAME}\"); + print(\"Password: ${MONGO_OPENIM_PASSWORD}\"); + print(\"Database: ${MONGO_INITDB_DATABASE}\"); } else { - print(\"User already exists in database: $MONGO_INITDB_DATABASE, Username: $MONGO_OPENIM_USERNAME\"); + print(\"User already exists in database: ${MONGO_INITDB_DATABASE}, Username: ${MONGO_OPENIM_USERNAME}\"); } " && tail -f /dev/null - ' - ] ports: - containerPort: 27017 env: @@ -73,6 +69,10 @@ spec: secretKeyRef: name: mongo-secret key: mongo_openim_password + - name: TZ + value: "Asia/Shanghai" + - name: wiredTigerCacheSizeGB + value: "1" volumeMounts: - name: mongo-storage mountPath: /data/db diff --git a/deployments/deploy/openim-api-deployment.yml b/deployments/deploy/openim-api-deployment.yml index 0ae628fb0..b0d815d2d 100644 --- a/deployments/deploy/openim-api-deployment.yml +++ b/deployments/deploy/openim-api-deployment.yml @@ -14,13 +14,11 @@ spec: spec: containers: - name: openim-api-container - image: openim/openim-api:v3.9 - # imagePullPolicy: Never + image: openim/openim-api:v3.8.3 + env: - name: CONFIG_PATH value: "/config" - - name: DEPLOYMENT_TYPE - value: "kubernetes" volumeMounts: - name: openim-config mountPath: "/config" diff --git a/deployments/deploy/openim-crontask-deployment.yml b/deployments/deploy/openim-crontask-deployment.yml index bdbff149c..35fc08ace 100644 --- a/deployments/deploy/openim-crontask-deployment.yml +++ b/deployments/deploy/openim-crontask-deployment.yml @@ -14,12 +14,11 @@ spec: spec: containers: - name: crontask-container - image: openim/openim-crontask:v3.9 + image: openim/openim-crontask:v3.8.3 env: - name: CONFIG_PATH value: "/config" - - name: DEPLOYMENT_TYPE - value: "kubernetes" + volumeMounts: - name: openim-config mountPath: "/config" diff --git a/deployments/deploy/openim-msggateway-deployment.yml b/deployments/deploy/openim-msggateway-deployment.yml index a2ce2ef16..e053a8a41 100644 --- a/deployments/deploy/openim-msggateway-deployment.yml +++ b/deployments/deploy/openim-msggateway-deployment.yml @@ -14,12 +14,10 @@ spec: spec: containers: - name: openim-msggateway-container - image: openim/openim-msggateway:v3.9 + image: openim/openim-msggateway:v3.8.3 env: - name: CONFIG_PATH value: "/config" - - name: DEPLOYMENT_TYPE - value: "kubernetes" volumeMounts: - name: openim-config mountPath: "/config" diff --git a/deployments/deploy/openim-msgtransfer-deployment.yml b/deployments/deploy/openim-msgtransfer-deployment.yml index 264b478fa..e2bcd754e 100644 --- a/deployments/deploy/openim-msgtransfer-deployment.yml +++ b/deployments/deploy/openim-msgtransfer-deployment.yml @@ -14,12 +14,10 @@ spec: spec: containers: - name: openim-msgtransfer-container - image: openim/openim-msgtransfer:v3.9 + image: openim/openim-msgtransfer:v3.8.3 env: - name: CONFIG_PATH value: "/config" - - name: DEPLOYMENT_TYPE - value: "kubernetes" volumeMounts: - name: openim-config mountPath: "/config" diff --git a/deployments/deploy/openim-push-deployment.yml b/deployments/deploy/openim-push-deployment.yml index 8c01eefc8..bd8d67424 100644 --- a/deployments/deploy/openim-push-deployment.yml +++ b/deployments/deploy/openim-push-deployment.yml @@ -14,12 +14,10 @@ spec: spec: containers: - name: openim-push-container - image: openim/openim-push:v3.9 + image: openim/openim-push:v3.8.3 env: - name: CONFIG_PATH value: "/config" - - name: DEPLOYMENT_TYPE - value: "kubernetes" volumeMounts: - name: openim-config mountPath: "/config" diff --git a/deployments/deploy/openim-rpc-auth-deployment.yml b/deployments/deploy/openim-rpc-auth-deployment.yml index 89022a085..e43d0cb56 100644 --- a/deployments/deploy/openim-rpc-auth-deployment.yml +++ b/deployments/deploy/openim-rpc-auth-deployment.yml @@ -14,11 +14,9 @@ spec: spec: containers: - name: auth-rpc-server-container - image: openim/openim-rpc-auth:v3.9 + image: openim/openim-rpc-auth:v3.8.3 imagePullPolicy: Never env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" - name: CONFIG_PATH value: "/config" volumeMounts: diff --git a/deployments/deploy/openim-rpc-conversation-deployment.yml b/deployments/deploy/openim-rpc-conversation-deployment.yml index 4c09dee83..579079b17 100644 --- a/deployments/deploy/openim-rpc-conversation-deployment.yml +++ b/deployments/deploy/openim-rpc-conversation-deployment.yml @@ -14,11 +14,9 @@ spec: spec: containers: - name: conversation-rpc-server-container - image: openim/openim-rpc-conversation:v3.9 + image: openim/openim-rpc-conversation:v3.8.3 imagePullPolicy: Never env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" - name: CONFIG_PATH value: "/config" volumeMounts: diff --git a/deployments/deploy/openim-rpc-friend-deployment.yml b/deployments/deploy/openim-rpc-friend-deployment.yml index 4829f7abd..efc94cc55 100644 --- a/deployments/deploy/openim-rpc-friend-deployment.yml +++ b/deployments/deploy/openim-rpc-friend-deployment.yml @@ -14,11 +14,10 @@ spec: spec: containers: - name: friend-rpc-server-container - image: openim/openim-rpc-friend:v3.9 - # imagePullPolicy: Never + image: openim/openim-rpc-friend:v3.8.3 + env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" + - name: CONFIG_PATH value: "/config" - name: REDIS_PASSWORD diff --git a/deployments/deploy/openim-rpc-group-deployment.yml b/deployments/deploy/openim-rpc-group-deployment.yml index b4bb9792d..c5fbf0586 100644 --- a/deployments/deploy/openim-rpc-group-deployment.yml +++ b/deployments/deploy/openim-rpc-group-deployment.yml @@ -14,11 +14,9 @@ spec: spec: containers: - name: group-rpc-server-container - image: openim/openim-rpc-group:v3.9 - # imagePullPolicy: Never + image: openim/openim-rpc-group:v3.8.3 + env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" - name: CONFIG_PATH value: "/config" volumeMounts: diff --git a/deployments/deploy/openim-rpc-msg-deployment.yml b/deployments/deploy/openim-rpc-msg-deployment.yml index ea9ff2131..0001748f7 100644 --- a/deployments/deploy/openim-rpc-msg-deployment.yml +++ b/deployments/deploy/openim-rpc-msg-deployment.yml @@ -14,11 +14,9 @@ spec: spec: containers: - name: msg-rpc-server-container - image: openim/openim-rpc-msg:v3.9 - # imagePullPolicy: Never + image: openim/openim-rpc-msg:v3.8.3 + env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" - name: CONFIG_PATH value: "/config" volumeMounts: diff --git a/deployments/deploy/openim-rpc-third-deployment.yml b/deployments/deploy/openim-rpc-third-deployment.yml index e1a33c780..18fc83e3c 100644 --- a/deployments/deploy/openim-rpc-third-deployment.yml +++ b/deployments/deploy/openim-rpc-third-deployment.yml @@ -14,11 +14,9 @@ spec: spec: containers: - name: third-rpc-server-container - image: openim/openim-rpc-third:v3.9 - # imagePullPolicy: Never + image: openim/openim-rpc-third:v3.8.3 + env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" - name: CONFIG_PATH value: "/config" - name: MINIO_ACCESS_KEY diff --git a/deployments/deploy/openim-rpc-user-deployment.yml b/deployments/deploy/openim-rpc-user-deployment.yml index 102faa3be..b00f10b93 100644 --- a/deployments/deploy/openim-rpc-user-deployment.yml +++ b/deployments/deploy/openim-rpc-user-deployment.yml @@ -14,11 +14,9 @@ spec: spec: containers: - name: user-rpc-server-container - image: openim/openim-rpc-user:v3.9 - # imagePullPolicy: Never + image: openim/openim-rpc-user:v3.8.3 + env: - - name: DEPLOYMENT_TYPE - value: "kubernetes" - name: CONFIG_PATH value: "/config" volumeMounts: