diff --git a/charts/td-redis-operator/Chart.yaml b/charts/td-redis-operator/Chart.yaml index 9dc61f0..ba94d06 100644 --- a/charts/td-redis-operator/Chart.yaml +++ b/charts/td-redis-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: "v3" name: td-redis-operator description: A Helm chart for tongdun redis operator -version: "1" -appVersion: "0.1.1" +version: "1.0.0" +appVersion: "1.0.0" maintainers: - name: DoubleJ213 email: herowenjj@gmail.com \ No newline at end of file diff --git a/charts/td-redis-operator/LICENSE b/charts/td-redis-operator/LICENSE index e69de29..d645695 100644 --- a/charts/td-redis-operator/LICENSE +++ b/charts/td-redis-operator/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/charts/td-redis-operator/README-zh.md b/charts/td-redis-operator/README-zh.md index 469cba7..d14df58 100644 --- a/charts/td-redis-operator/README-zh.md +++ b/charts/td-redis-operator/README-zh.md @@ -27,8 +27,9 @@ $ helm install [RELEASE_NAME] td-redis-operator/td-redis-operator # 安装到def $ helm install --namespace=redis [RELEASE_NAME] td-redis-operator/td-redis-operator --set type=cluster -# 使用 --set type=cluster or type=standby 选择你需要安装的redis模式 . -# 默认两种模式都会安装 +# 使用 --set type=cluster or type=standby 选择你需要安装的redis模式. +# 使用 --set type=manager 安装 td-redis-manager控制台 +# 默认 安装cluster/standby redis集群，同时安装控制台 ``` 更多关于 [RedisStandby and RedisCluster](https://github.com/tongdun/td-redis-operator/wiki/Redis-Standby-Delivery-Example). diff --git a/charts/td-redis-operator/README.md b/charts/td-redis-operator/README.md index 3583088..ce55985 100644 --- a/charts/td-redis-operator/README.md +++ b/charts/td-redis-operator/README.md @@ -28,10 +28,11 @@ $ helm install [RELEASE_NAME] td-redis-operator/td-redis-operator # will be inst $ helm install --namespace=redis [RELEASE_NAME] td-redis-operator/td-redis-operator --set type=cluster # You can use --set type=cluster or type=standby to choice which kind of redis to be installed . -# By default both of them +# use --set type=manager to install the dashboard of td-redis-manager +# By default. cluster/standby redis are installed, and the dashboard is installed at the same time ``` -_See [RedisStandby and RedisCluster](https://github.com/tongdun/td-redis-operator/wiki/Redis-Standby-Delivery-Example)._ +_See [RedisStandby and RedisCluster](https://github.com/tongdun/td-redis-operator/wiki/Redis-Standby-Delivery-Example)._ ``` # kubectl get pod diff --git a/charts/td-redis-operator/index.yaml b/charts/td-redis-operator/index.yaml index 7c532dc..0ba53e7 100644 --- a/charts/td-redis-operator/index.yaml +++ b/charts/td-redis-operator/index.yaml @@ -2,10 +2,10 @@ apiVersion: v3 entries: td-redis-operator: - apiVersion: "v3" - appVersion: "0.1.1" - created: "2022-07-19T15:29:59.72750942+08:00" + appVersion: "1.0.0" + created: "2022-12-09T18:31:59.43212871+08:00" urls: - - https://github.com/tongdun/td-redis-operator/releases/download/v0.1.1/td-redis-operator-0.1.1.tgz - version: 0.1.1 + - https://github.com/tongdun/td-redis-operator/releases/download/1.0.0/td-redis-operator-1.0.0.tgz + version: 1.0.0 description: tongdun redis operator name: td-redis-operator diff --git a/charts/td-redis-operator/templates/NOTES.txt b/charts/td-redis-operator/templates/NOTES.txt index 9358ee7..aecf6e6 100644 --- a/charts/td-redis-operator/templates/NOTES.txt +++ b/charts/td-redis-operator/templates/NOTES.txt @@ -13,25 +13,33 @@ Now you can enjoy your redis cluster ! You can get the redis service by using command such as: $ kubectl get svc -n {{ .Release.Namespace }} redis-{{ .Values.cluster.name }} -o jsonpath='{.spec.clusterIP}' -you secret is: {{ .Values.cluster.secret }} -#redis-cli -h $serviceIp -a {{ .Values.standby.secret }} +you secret is: {{ .Values.secret }} +#redis-cli -h $serviceIp -a {{ .Values.secret }} {{ else if eq .Values.type "standby" }} #Kind: RedisStandby $ kubectl get svc -n {{ .Release.Namespace }} redis-{{ .Values.standby.name }} -o jsonpath='{.spec.clusterIP}' -you secret is: {{ .Values.standby.secret }} -#redis-cli -h $serviceIp -a {{ .Values.standby.secret }} +you secret is: {{ .Values.secret }} +#redis-cli -h $serviceIp -a {{ .Values.secret }} -{{ else }} +{{ else if eq .Values.type "standby"}} #Kind: RedisCluster You can get the redis service by using command such as: $ kubectl get svc -n {{ .Release.Namespace }} redis-{{ .Values.cluster.name }} -o jsonpath='{.spec.clusterIP}' -you secret is: {{ .Values.cluster.secret }} +you secret is: {{ .Values.secret }} #Kind: RedisStandby $ kubectl get svc -n {{ .Release.Namespace }} redis-{{ .Values.standby.name }} -o jsonpath='{.spec.clusterIP}' -you secret is: {{ .Values.standby.secret }} -#redis-cli -h $serviceIp -a {{ .Values.standby.secret }} +you secret is: {{ .Values.secret }} +#redis-cli -h $serviceIp -a {{ .Values.secret }} + +{{ else if eq .Values.type "manager"}} + +#Now you can access the td-redis-manager dashboard by visiting : +$ kubectl get svc -n {{ .Release.Namespace }} {{ .Values.manager.name }} -o jsonpath='{.spec.clusterIP}':8088 + +default secret is: {{ .Values.secret }} + {{ end }} \ No newline at end of file diff --git a/charts/td-redis-operator/templates/manager.yaml b/charts/td-redis-operator/templates/manager.yaml new file mode 100644 index 0000000..5d92781 --- /dev/null +++ b/charts/td-redis-operator/templates/manager.yaml @@ -0,0 +1,119 @@ +{{- if or (eq .Values.type "manager") (eq .Values.type "all") -}} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: redis-admin +rules: + - apiGroups: + - '*' + resources: + - '*' + verbs: + - '*' + - nonResourceURLs: + - '*' + verbs: + - '*' + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: redis-admin +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: redis-admin +subjects: + - kind: ServiceAccount + name: redis-admin + namespace: {{ default .Values.namespace .Release.Namespace }} + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: redis-admin + namespace: {{ default .Values.namespace .Release.Namespace }} + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Values.manager.name }} + namespace: {{ default .Values.namespace .Release.Namespace }} +data: + config.yaml: | + namespace: {{ default .Values.namespace .Release.Namespace }} + standbyimage: {{ .Values.registry }}/{{ .Values.standby.image }} + sentiimage: {{ .Values.registry }}/{{ .Values.standby.sentinelimage }} + clusterimage: {{ .Values.registry }}/{{ .Values.cluster.image }} + proxyimage: {{ .Values.registry }}/{{ .Values.cluster.proxyimage }} + redissecret: {{ .Values.secret }} + vip: 192.168.0.1 + monitorimage: {{ .Values.registry }}/{{ .Values.monitorimage }} + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: {{ .Values.manager.name }} + name: {{ .Values.manager.name }} + namespace: {{ default .Values.namespace .Release.Namespace }} +spec: + replicas: {{ .Values.manager.replicaCount }} + selector: + matchLabels: + app: {{ .Values.manager.name }} + template: + metadata: + labels: + app: {{ .Values.manager.name }} + spec: + containers: + - command: + - /app/admin + - --configdir=/app/config + image: {{ .Values.registry }}/{{ .Values.manager.image }} + imagePullPolicy: {{ .Values.manager.pullPolicy }} + name: {{ .Values.manager.name }} + resources: { } + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /app/config + name: config + - image: {{ .Values.registry }}/{{ .Values.manager.uiImage }} + imagePullPolicy: Always + name: {{ .Values.manager.name }}-ui + resources: { } + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + dnsPolicy: ClusterFirst + restartPolicy: Always + schedulerName: default-scheduler + securityContext: { } + serviceAccountName: redis-admin + terminationGracePeriodSeconds: 30 + volumes: + - configMap: + defaultMode: 420 + name: {{ .Values.manager.name }} + name: config + +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ .Values.manager.name }} + namespace: {{ default .Values.namespace .Release.Namespace }} +spec: + ports: + - port: 8088 + protocol: TCP + targetPort: 8088 + selector: + app: {{ .Values.manager.name }} + type: NodePort +{{- end }} \ No newline at end of file diff --git a/charts/td-redis-operator/templates/redis-cluster.yaml b/charts/td-redis-operator/templates/redis-cluster.yaml index be3d51b..6c7b9f8 100644 --- a/charts/td-redis-operator/templates/redis-cluster.yaml +++ b/charts/td-redis-operator/templates/redis-cluster.yaml @@ -11,12 +11,12 @@ spec: dc: hz env: {{ .Values.cluster.env }} image: {{ .Values.registry }}/{{ .Values.cluster.image }} - monitorimage: {{ .Values.registry }}/{{ .Values.cluster.monitorimage }} + monitorimage: {{ .Values.registry }}/{{ .Values.monitorimage }} netmode: NodePort proxyimage: {{ .Values.registry }}/{{ .Values.cluster.proxyimage }} proxysecret: "123" realname: demo - secret: {{ .Values.cluster.secret }} + secret: {{ .Values.secret }} size: 3 storageclass: "" vip: 192.168.1.3 diff --git a/charts/td-redis-operator/templates/redis-standby.yaml b/charts/td-redis-operator/templates/redis-standby.yaml index 1dbb5f9..65d4df2 100644 --- a/charts/td-redis-operator/templates/redis-standby.yaml +++ b/charts/td-redis-operator/templates/redis-standby.yaml @@ -11,10 +11,10 @@ spec: dc: hz env: {{ .Values.standby.env }} image: {{ .Values.registry }}/{{ .Values.standby.image }} - monitorimage: {{ .Values.registry }}/{{ .Values.standby.monitorimage }} + monitorimage: {{ .Values.registry }}/{{ .Values.monitorimage }} netmode: NodePort realname: sa - secret: {{ .Values.standby.secret }} + secret: {{ .Values.secret }} sentinelimage: {{ .Values.registry }}/{{ .Values.standby.sentinelimage }} storageclass: "" vip: 192.168.1.3 diff --git a/charts/td-redis-operator/values.yaml b/charts/td-redis-operator/values.yaml index 1026d81..9660bd1 100644 --- a/charts/td-redis-operator/values.yaml +++ b/charts/td-redis-operator/values.yaml @@ -9,22 +9,23 @@ replicaCount: 1 registry: tongduncloud -# all|cluster|standby +# all|cluster|standby|manager type: all image: - name: td-redis-operator:20220217-988260006de + name: td-redis-operator:latest pullPolicy: IfNotPresent +monitorimage: redis-exporter:1.0 +secret: 88c185e86f684251 + cluster: enabled: false name: jerry # production|demo|staging env: demo - secret: 88c185e86f684251 # appName: jerry image: redis-cluster:0.2 - monitorimage: redis-exporter:1.0 proxyimage: predixy:1.0 standby: @@ -32,8 +33,13 @@ standby: name: tom # production|demo|staging env: demo - secret: 88c185e86f684251 # appName: cluster-tom image: redis-standby:1.0 - monitorimage: redis-exporter:1.0 sentinelimage: sentinel-standby:latest + +manager: + name: redis-manager + replicaCount: 1 + image: td-redis-manager:latest + pullPolicy: IfNotPresent + uiImage: td-redis-operator-ui:latest \ No newline at end of file