This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-docker.git
The following commit(s) were added to refs/heads/master by this push:
new a928087 Update: Specifying imagePullSecrets is invalid and
persistence takes the value from persistence.size (#112)
a928087 is described below
commit a9280879adbf67149341cbb5f3541c00dd1fcfe8
Author: dashiell <[email protected]>
AuthorDate: Fri Oct 11 15:45:36 2024 +0800
Update: Specifying imagePullSecrets is invalid and persistence takes the
value from persistence.size (#112)
Co-authored-by: dashiell <[email protected]>
---
rocketmq-k8s-helm/templates/broker/statefulset.yaml | 6 ++++--
rocketmq-k8s-helm/templates/nameserver/deployment.yaml | 4 +++-
rocketmq-k8s-helm/templates/proxy/deployment.yaml | 4 +++-
rocketmq-k8s-helm/values.yaml | 10 ++++------
4 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/rocketmq-k8s-helm/templates/broker/statefulset.yaml
b/rocketmq-k8s-helm/templates/broker/statefulset.yaml
index 144f19d..ecf18a1 100644
--- a/rocketmq-k8s-helm/templates/broker/statefulset.yaml
+++ b/rocketmq-k8s-helm/templates/broker/statefulset.yaml
@@ -16,8 +16,10 @@ spec:
labels:
{{- include "rocketmq-broker.selectorLabels" . | nindent 8 }}
spec:
+ {{- with .Values.proxy.imagePullSecrets }}
imagePullSecrets:
- - name: onetest-regcred
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: broker
image: {{ include "rocketmq-broker.brokerImage" . }}
@@ -98,5 +100,5 @@ spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
- storage: {{ .Values.broker.store.data.size }}
+ storage: {{ .Values.broker.persistence.size }}
{{- end }}
\ No newline at end of file
diff --git a/rocketmq-k8s-helm/templates/nameserver/deployment.yaml
b/rocketmq-k8s-helm/templates/nameserver/deployment.yaml
index 2debadb..f73c6a0 100644
--- a/rocketmq-k8s-helm/templates/nameserver/deployment.yaml
+++ b/rocketmq-k8s-helm/templates/nameserver/deployment.yaml
@@ -14,8 +14,10 @@ spec:
{{- include "rocketmq-nameserver.selectorLabels" . | nindent 8 }}
component: nameserver
spec:
+ {{- with .Values.proxy.imagePullSecrets }}
imagePullSecrets:
- - name: onetest-regcred
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: nameserver
image: {{ include "rocketmq-nameserver.namesrvImage" . }}
diff --git a/rocketmq-k8s-helm/templates/proxy/deployment.yaml
b/rocketmq-k8s-helm/templates/proxy/deployment.yaml
index e1d697e..15fa681 100644
--- a/rocketmq-k8s-helm/templates/proxy/deployment.yaml
+++ b/rocketmq-k8s-helm/templates/proxy/deployment.yaml
@@ -18,8 +18,10 @@ spec:
labels:
{{- include "rocketmq-proxy.selectorLabels" . | nindent 8 }}
spec:
+ {{- with .Values.proxy.imagePullSecrets }}
imagePullSecrets:
- - name: onetest-regcred
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: proxy
image: {{ include "rocketmq-proxy.proxyImage" . }}
diff --git a/rocketmq-k8s-helm/values.yaml b/rocketmq-k8s-helm/values.yaml
index c1841da..a559fc4 100644
--- a/rocketmq-k8s-helm/values.yaml
+++ b/rocketmq-k8s-helm/values.yaml
@@ -159,6 +159,7 @@ broker:
repository: "apache/rocketmq"
tag: "latest"
+ imagePullSecrets: [ ]
partition: 0
persistence:
enabled: false
@@ -179,12 +180,6 @@ broker:
config: ""
- store:
- data:
- size: 10Gi
- log:
- size: 10Gi
-
service:
port: 10911
@@ -209,6 +204,7 @@ controller:
repository: "apache/rocketmq"
tag: "latest"
pullPolicy: IfNotPresent
+ imagePullSecrets: [ ]
service:
port: 9878
internalport: 9888
@@ -238,4 +234,6 @@ controller:
config: ""
persistence:
enabled: false
+ existingClaim: ""
+ storageClass: ""
size: 20Gi
