update: apollo chart.

dellnoantechnp · Jul 13, 2024 · 17bb01a · 17bb01a
1 parent 33e7d99
commit 17bb01a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/charts/apollo/Chart.yaml b/charts/apollo/Chart.yaml
@@ -17,7 +17,7 @@ maintainers:
 name: apollo
 type: application
 kubeVersion: ">=1.18.0"
-version: 0.8.3
+version: 0.8.4
 dependencies:
   - name: common
     repository: oci://registry-1.docker.io/bitnamicharts

diff --git a/charts/apollo/templates/admin-service/deployment-adminservice.yaml b/charts/apollo/templates/admin-service/deployment-adminservice.yaml
@@ -20,8 +20,6 @@ metadata:
   name: {{ $adminServiceFullName }}
   labels:
     {{- include "apollo.service.labels" . | nindent 4 }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/admin-service/configmap-adminservice.yaml") . | sha256sum }}
 spec:
   replicas: {{ .Values.adminService.replicaCount }}
   selector:
@@ -35,8 +33,9 @@ spec:
     metadata:
       labels:
         app: {{ $adminServiceFullName }}
-      {{- with .Values.adminService.annotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/admin-service/configmap-adminservice.yaml") . | sha256sum }}
+      {{- with .Values.adminService.annotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:

diff --git a/charts/apollo/templates/config-service/deployment-configservice.yaml b/charts/apollo/templates/config-service/deployment-configservice.yaml
@@ -20,8 +20,6 @@ metadata:
   name: {{ $configServiceFullName }}
   labels:
     {{- include "apollo.service.labels" . | nindent 4 }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/config-service/configmap-configservice.yaml") . | sha256sum }}
 spec:
   replicas: {{ .Values.configService.replicaCount }}
   selector:
@@ -35,8 +33,9 @@ spec:
     metadata:
       labels:
         app: {{ $configServiceFullName }}
-      {{- with .Values.configService.annotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/config-service/configmap-configservice.yaml") . | sha256sum }}
+      {{- with .Values.configService.annotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:

diff --git a/charts/apollo/templates/portal/deployment-portal.yaml b/charts/apollo/templates/portal/deployment-portal.yaml
@@ -21,8 +21,6 @@ metadata:
   name: {{ $portalFullName }}
   labels:
     {{- include "apollo.portal.labels" . | nindent 4 }}
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/portal/configmap-portal.yaml") . | sha256sum }}
 spec:
   replicas: {{ .Values.portal.replicaCount }}
   selector:
@@ -36,8 +34,9 @@ spec:
     metadata:
       labels:
         app: {{ $portalFullName }}
-      {{- with .Values.portal.annotations }}
       annotations:
+        checksum/config: {{ include (print $.Template.BasePath "/portal/configmap-portal.yaml") . | sha256sum }}
+      {{- with .Values.portal.annotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:

diff --git a/charts/apollo/values.yaml b/charts/apollo/values.yaml
@@ -21,9 +21,9 @@ db:
     port: 3306
     dbName: ApolloConfigDB
     # apolloconfigdb user name
-    userName: ""
+    userName: "abc"
     # apolloconfigdb password
-    password: ""
+    password: "abc"
     connectionStringProperties: characterEncoding=utf8&useSSL=false
 
     ## @param service: create a externalName service for foreign database endpoint
@@ -51,9 +51,9 @@ db:
     port: 3306
     dbName: ApolloPortalDB
     # apolloportaldb user name
-    userName: ""
+    userName: "abc"
     # apolloportaldb password
-    password: ""
+    password: "abc"
     connectionStringProperties: characterEncoding=utf8&useSSL=false
 
     ## @param service: create a externalName service for foreign database endpoint
@@ -200,7 +200,7 @@ adminService:
 portal:
   ## @param enabled: boolean value for install portal web-ui.
   ##
-  enabled: false
+  enabled: true
 
   name: apollo-portal
   fullNameOverride: ""
@@ -247,7 +247,7 @@ portal:
 
     ## @param envs: specify the env names, e.g. dev,pro
     ##
-    envs: "dev"
+    envs: "dev, prod"
 
     ## @param metaServers: specify the meta servers, e.g.
     ## dev: http://apollo-configservice-dev:8080