From 60763a8417f0801fa2d1fc660280e91338fafc37 Mon Sep 17 00:00:00 2001 From: "lin.huang" Date: Fri, 6 Oct 2023 02:00:06 +0800 Subject: [PATCH] change chart script:Submit a stable version script --- manifest/helm-charts/infra/kafka/config.yaml | 43 +++++++++++- .../templates/deployment.yaml | 16 ++--- .../charts/openim-msggateway/values.yaml | 4 +- .../templates/deployment.yaml | 16 ++--- .../openim-push/templates/deployment.yaml | 16 ++--- .../openim-rpc-auth/templates/deployment.yaml | 16 ++--- .../templates/deployment.yaml | 16 ++--- .../templates/deployment.yaml | 16 ++--- .../templates/deployment.yaml | 16 ++--- .../openim-rpc-msg/templates/deployment.yaml | 16 ++--- .../templates/deployment.yaml | 16 ++--- .../openim-rpc-user/templates/deployment.yaml | 16 ++--- manifest/helm-charts/services/config.yaml | 70 +++++++++---------- .../services/templates/deployment.yaml | 16 ++--- manifest/helm-charts/services/values.yaml | 4 +- 15 files changed, 169 insertions(+), 128 deletions(-) diff --git a/manifest/helm-charts/infra/kafka/config.yaml b/manifest/helm-charts/infra/kafka/config.yaml index 5c989e7de..b1d53d5c8 100644 --- a/manifest/helm-charts/infra/kafka/config.yaml +++ b/manifest/helm-charts/infra/kafka/config.yaml @@ -1,2 +1,43 @@ global: - storageClass: "nfs-client" \ No newline at end of file + storageClass: "nfs-client" +controller: + replicaCount: 1 + zookeeperMigrationMode: true +broker: + zookeeperMigrationMode: true +sasl: + interbroker: + user: inter_broker_user + password: "" + controller: + user: controller_user + password: "" + client: + users: + - root + passwords: "proot" + + +provisioning: + enabled: true + numPartitions: 1 + replicationFactor: 1 + topics: + - name: latestMsgToRedis + partitions: 1 + replicationFactor: 1 + config: + max.message.bytes: 64000 + flush.messages: 1 + - name: msgToPush + partitions: 1 + replicationFactor: 1 + config: + max.message.bytes: 64000 + flush.messages: 1 + - name: offlineMsgToMongoMysql + partitions: 1 + replicationFactor: 1 + config: + max.message.bytes: 64000 + flush.messages: 1 \ No newline at end of file diff --git a/manifest/helm-charts/services/charts/openim-msggateway/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-msggateway/templates/deployment.yaml index 5bde8c969..ca361e76b 100644 --- a/manifest/helm-charts/services/charts/openim-msggateway/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-msggateway/templates/deployment.yaml @@ -40,14 +40,14 @@ spec: - name: rpc containerPort: 88 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-msggateway/values.yaml b/manifest/helm-charts/services/charts/openim-msggateway/values.yaml index bec5d4f46..678035905 100644 --- a/manifest/helm-charts/services/charts/openim-msggateway/values.yaml +++ b/manifest/helm-charts/services/charts/openim-msggateway/values.yaml @@ -49,10 +49,10 @@ ingress: nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/rewrite-target: /$2 hosts: - - host: + - host: openim1.nsddd.top paths: - path: /msg_gateway(/|$)(.*) - pathType: Prefix + pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls # hosts: diff --git a/manifest/helm-charts/services/charts/openim-msgtransfer/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-msgtransfer/templates/deployment.yaml index f7ec7bdaf..ba7bcabd0 100644 --- a/manifest/helm-charts/services/charts/openim-msgtransfer/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-msgtransfer/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-push/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-push/templates/deployment.yaml index 21aa3ccd6..9a94a03c6 100644 --- a/manifest/helm-charts/services/charts/openim-push/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-push/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-auth/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-auth/templates/deployment.yaml index c13bba76e..9cfb750c2 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-auth/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-auth/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-conversation/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-conversation/templates/deployment.yaml index 07c2baa1b..e0f71a0a8 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-conversation/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-conversation/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-friend/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-friend/templates/deployment.yaml index c9c25a55c..0f677aa9f 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-friend/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-friend/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-group/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-group/templates/deployment.yaml index 9538962e3..2883b17ee 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-group/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-group/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-msg/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-msg/templates/deployment.yaml index f15ca3052..8fed86a0b 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-msg/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-msg/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-third/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-third/templates/deployment.yaml index 54a85c61d..dae7dc953 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-third/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-third/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/charts/openim-rpc-user/templates/deployment.yaml b/manifest/helm-charts/services/charts/openim-rpc-user/templates/deployment.yaml index b907a9447..ec3bcd1c0 100644 --- a/manifest/helm-charts/services/charts/openim-rpc-user/templates/deployment.yaml +++ b/manifest/helm-charts/services/charts/openim-rpc-user/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/config.yaml b/manifest/helm-charts/services/config.yaml index 8c66cb5d1..4d7178ebf 100644 --- a/manifest/helm-charts/services/config.yaml +++ b/manifest/helm-charts/services/config.yaml @@ -1,58 +1,58 @@ image: - repository: nginx - pullPolicy: IfNotPresent - tag: "" + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-api + pullPolicy: Always + tag: "dev" openim-msggateway: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-msggateway + tag: "dev" + pullPolicy: Always openim-msgtransfer: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-msgtransfer + tag: "dev" + pullPolicy: Always openim-push: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-push + tag: "dev" + pullPolicy: Always openim-rpc-auth: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-auth + tag: "dev" + pullPolicy: Always openim-rpc-conversation: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-conversation + tag: "dev" + pullPolicy: Always openim-rpc-friend: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-friend + tag: "dev" + pullPolicy: Always openim-rpc-group: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-group + tag: "dev" + pullPolicy: Always openim-rpc-msg: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-msg + tag: "dev" + pullPolicy: Always openim-rpc-third: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-third + tag: "dev" + pullPolicy: Always openim-rpc-user: image: - repository: nginx - tag: "" - pullPolicy: IfNotPresent + repository: registry.cn-shenzhen.aliyuncs.com/huanglin_hub/openim-rpc-user + tag: "dev" + pullPolicy: Always @@ -120,8 +120,8 @@ config: # It's not recommended to modify this topic name # Consumer group ID, it's not recommended to modify kafka: - username: '' - password: '' + username: 'root' + password: 'proot' addr: [ im-kafka:9092 ] latestMsgToRedis: topic: "latestMsgToRedis" diff --git a/manifest/helm-charts/services/templates/deployment.yaml b/manifest/helm-charts/services/templates/deployment.yaml index eb10d4f43..c91d9512e 100644 --- a/manifest/helm-charts/services/templates/deployment.yaml +++ b/manifest/helm-charts/services/templates/deployment.yaml @@ -37,14 +37,14 @@ spec: - name: http containerPort: 80 protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http + #livenessProbe: + # httpGet: + # path: / + # port: http + #readinessProbe: + # httpGet: + # path: / + # port: http resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: diff --git a/manifest/helm-charts/services/values.yaml b/manifest/helm-charts/services/values.yaml index 8f9e5b494..c7aecddb1 100644 --- a/manifest/helm-charts/services/values.yaml +++ b/manifest/helm-charts/services/values.yaml @@ -49,10 +49,10 @@ ingress: nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/rewrite-target: /$2 hosts: - - host: + - host: openim1.nsddd.top paths: - path: /api(/|$)(.*) - pathType: Prefix + pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls # hosts: