This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new d6717620 [charts] update ingress ca and change other values (#690)
d6717620 is described below
commit d67176203155eba5e5691ad0940a0053cf1243ac
Author: Jian Zhong <[email protected]>
AuthorDate: Sun Apr 20 08:05:02 2025 +0800
[charts] update ingress ca and change other values (#690)
---
.../charts/admin/charts/kube-prometheus/charts/grafana/values.yaml | 2 +-
manifests/charts/base/templates/ingress-controller.yaml | 6 +++---
manifests/charts/base/values.yaml | 6 +++---
.../register-discovery/nacos/templates/mysql-statefulset.yaml | 1 +
.../register-discovery/nacos/templates/statefulset.yaml | 2 +-
manifests/charts/dubbo-control/register-discovery/nacos/values.yaml | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
index e2c17c54..a2b4837a 100644
--- a/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
+++ b/manifests/charts/admin/charts/kube-prometheus/charts/grafana/values.yaml
@@ -128,7 +128,7 @@ image:
# - myRegistrKeySecretName
testFramework:
- enabled: true
+ enabled: false
## The type of Helm hook used to run this test. Defaults to test.
## ref: https://helm.sh/docs/topics/charts_hooks/#the-available-hooks
##
diff --git a/manifests/charts/base/templates/ingress-controller.yaml
b/manifests/charts/base/templates/ingress-controller.yaml
index 43537454..0d51d866 100644
--- a/manifests/charts/base/templates/ingress-controller.yaml
+++ b/manifests/charts/base/templates/ingress-controller.yaml
@@ -40,7 +40,7 @@ metadata:
labels:
app: ingress-controller
spec:
- replicas: 2
+ replicas: 1
selector:
matchLabels:
app: ingress-controller
@@ -54,7 +54,7 @@ spec:
containers:
- name: dubbo-kubernetes-ingress-controller
image: docker.io/mfordjody/dubbo-kubernetes-ingress-controller:dev
- imagePullPolicy: Always
+ imagePullPolicy: IfNotPresent
resources:
limits:
cpu: "100m"
@@ -72,7 +72,7 @@ spec:
---
{{ $ingress := .Values.ingress }}
{{- $ca := genCA "dubbo-kubernetes-ca" 365 }}
-{{- $cert := genSignedCert $ingress.hosts.admin nil (list $ingress.hosts.admin
$ingress.hosts.prometheus $ingress.hosts.grafana) 365 $ca }}
+{{- $cert := genSignedCert "" nil (list "dubbo-kubernetes-user") 365 $ca }}
apiVersion: v1
kind: Secret
metadata:
diff --git a/manifests/charts/base/values.yaml
b/manifests/charts/base/values.yaml
index c9412705..80ccdc37 100644
--- a/manifests/charts/base/values.yaml
+++ b/manifests/charts/base/values.yaml
@@ -20,9 +20,9 @@ _internal_default_values_not_set:
ingress:
class: ""
hosts:
- admin: admin.dubbo.domain
- prometheus: prom.dubbo.domain
- grafana: grafana.dubbo.domain
+ admin: admin.example.local
+ prometheus: prom.example.local
+ grafana: grafana.example.local
csi:
labelSelector:
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
index 3a8eb90d..fc993c50 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/mysql-statefulset.yaml
@@ -35,6 +35,7 @@ spec:
containers:
- name: mysql
image: mysql:latest
+ imagePullPolicy: IfNotPresent
ports:
- containerPort: 3306
env:
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
index fa91a21b..5b8cc4b8 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
@@ -50,7 +50,7 @@ spec:
{{- if contains "/" $nacos.image }}
image: {{ $nacos.image }}
{{- end }}
- imagePullPolicy: {{ $nacos.imagePullPolicy }}
+ imagePullPolicy: IfNotPresent
ports:
- name: http
containerPort: 8848
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
index ee1b8408..901c4f2c 100644
--- a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
@@ -30,7 +30,7 @@ _internal_default_values_not_set:
storage:
# Specifies the storage type (embedded, mysql, etc.).
- type: "mysql"
+ type: ""
# For MySQL storage, you need to change the "embedded" to "mysql" before
you can use the db configuration.
database:
# Specifies the database host.
