Browse Source

bump version to 1.9.2-SNAPSHOT

Jason Song 3 years ago
parent
commit
fcfc4297b7
34 changed files with 24 additions and 1647 deletions
  1. 2 4
      CHANGES.md
  2. 12 0
      changes/changes-1.9.1.md
  3. 1 1
      pom.xml
  4. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml
  5. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml
  6. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml
  7. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml
  8. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml
  9. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml
  10. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml
  11. 1 1
      scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml
  12. 1 1
      scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml
  13. 0 402
      scripts/helm/README.md
  14. 0 23
      scripts/helm/apollo-portal/.helmignore
  15. 0 27
      scripts/helm/apollo-portal/Chart.yaml
  16. 0 25
      scripts/helm/apollo-portal/templates/NOTES.txt
  17. 0 62
      scripts/helm/apollo-portal/templates/_helpers.tpl
  18. 0 133
      scripts/helm/apollo-portal/templates/deployment-portal.yaml
  19. 0 56
      scripts/helm/apollo-portal/templates/ingress-portal.yaml
  20. 0 31
      scripts/helm/apollo-portal/templates/service-portal.yaml
  21. 0 46
      scripts/helm/apollo-portal/templates/service-portaldb.yaml
  22. 0 82
      scripts/helm/apollo-portal/values.yaml
  23. 0 23
      scripts/helm/apollo-service/.helmignore
  24. 0 27
      scripts/helm/apollo-service/Chart.yaml
  25. 0 32
      scripts/helm/apollo-service/templates/NOTES.txt
  26. 0 110
      scripts/helm/apollo-service/templates/_helpers.tpl
  27. 0 108
      scripts/helm/apollo-service/templates/deployment-adminservice.yaml
  28. 0 110
      scripts/helm/apollo-service/templates/deployment-configservice.yaml
  29. 0 56
      scripts/helm/apollo-service/templates/ingress-adminservice.yaml
  30. 0 56
      scripts/helm/apollo-service/templates/ingress-configservice.yaml
  31. 0 30
      scripts/helm/apollo-service/templates/service-adminservice.yaml
  32. 0 46
      scripts/helm/apollo-service/templates/service-configdb.yaml
  33. 0 30
      scripts/helm/apollo-service/templates/service-configservice.yaml
  34. 0 118
      scripts/helm/apollo-service/values.yaml

+ 2 - 4
CHANGES.md

@@ -2,11 +2,9 @@ Changes by Version
 ==================
 Release Notes.
 
-Apollo 1.9.1
+Apollo 1.9.2
 
 ------------------
-* [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)
-* [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933)
 
 ------------------
-All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/9?closed=1)
+All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/10?closed=1)

+ 12 - 0
changes/changes-1.9.1.md

@@ -0,0 +1,12 @@
+Changes by Version
+==================
+Release Notes.
+
+Apollo 1.9.1
+
+------------------
+* [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)
+* [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933)
+
+------------------
+All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/9?closed=1)

+ 1 - 1
pom.xml

@@ -56,7 +56,7 @@
 	</issueManagement>
 
 	<properties>
-		<revision>1.9.1</revision>
+		<revision>1.9.2-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-boot.version>2.4.2</spring-boot.version>

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-adminservice:1.9.1
+        - image: apolloconfig/apollo-adminservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-configservice:1.9.1
+        - image: apolloconfig/apollo-configservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-adminservice:1.9.1
+        - image: apolloconfig/apollo-adminservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-configservice:1.9.1
+        - image: apolloconfig/apollo-configservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-adminservice:1.9.1
+        - image: apolloconfig/apollo-adminservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-configservice:1.9.1
+        - image: apolloconfig/apollo-configservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-adminservice:1.9.1
+        - image: apolloconfig/apollo-adminservice:1.9.2-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: container-apollo-admin-server-uat
           ports:

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
       
       containers:
-        - image: apolloconfig/apollo-configservice:1.9.1
+        - image: apolloconfig/apollo-configservice:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 1 - 1
scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml

@@ -132,7 +132,7 @@ spec:
               - key: apollo-env.properties
                 path: apollo-env.properties
       containers:
-        - image: apolloconfig/apollo-portal:1.9.1
+        - image: apolloconfig/apollo-portal:1.9.2-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

+ 0 - 402
scripts/helm/README.md

@@ -1,402 +0,0 @@
-# Apollo Helm Chart
-
-[Apollo](https://github.com/ctripcorp/apollo) is a reliable configuration management system.
-
-## 1. Introduction
-
-The apollo-service and apollo-portal charts create deployments for apollo-configservice, apollo-adminservice and apollo-portal, which utilize the kubernetes native service discovery.
-
-## 2. Prerequisites
-
-- Kubernetes 1.10+
-- Helm 3
-
-## 3. Add Apollo Helm Chart Repository
-
-```bash
-$ helm repo add apollo https://www.apolloconfig.com/charts
-$ helm search repo apollo
-```
-
-## 4. Deployments of apollo-configservice and apollo-adminservice
-
-### 4.1 Install
-
-apollo-configservice and apollo-adminservice should be installed per environment, so it is suggested to indicate environment in the release name, e.g. `apollo-service-dev`
-
-```bash
-$ helm install apollo-service-dev \
-    --set configdb.host=1.2.3.4 \
-    --set configdb.userName=apollo \
-    --set configdb.password=apollo \
-    --set configdb.service.enabled=true \
-    --set configService.replicaCount=1 \
-    --set adminService.replicaCount=1 \
-    -n your-namespace \
-    apollo/apollo-service
-```
-
-Or customize it with values.yaml
-
-```bash
-$ helm install apollo-service-dev -f values.yaml -n your-namespace apollo/apollo-service 
-```
-
-### 4.2 Uninstall
-
-To uninstall/delete the `apollo-service-dev` deployment:
-
-```bash
-$ helm uninstall -n your-namespace apollo-service-dev
-```
-
-### 4.3 Configuration
-
-The following table lists the configurable parameters of the apollo-service chart and their default values.
-
-| Parameter            | Description                                 | Default             |
-|----------------------|---------------------------------------------|---------------------|
-| `configdb.host` | The host for apollo config db | `nil` |
-| `configdb.port` | The port for apollo config db | `3306` |
-| `configdb.dbName` | The database name for apollo config db | `ApolloConfigDB` |
-| `configdb.userName` | The user name for apollo config db | `nil` |
-| `configdb.password` | The password for apollo config db | `nil` |
-| `configdb.connectionStringProperties` | The connection string properties for apollo config db | `characterEncoding=utf8` |
-| `configdb.service.enabled` | Whether to create a Kubernetes Service for `configdb.host` or not. Set it to `true` if `configdb.host` is an endpoint outside of the kubernetes cluster | `false` |
-| `configdb.service.fullNameOverride` | Override the service name for apollo config db | `nil` |
-| `configdb.service.port` | The port for the service of apollo config db | `3306` |
-| `configdb.service.type` | The service type of apollo config db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. xxx.mysql.rds.aliyuncs.com | `ClusterIP` |
-| `configService.fullNameOverride` | Override the deployment name for apollo-configservice | `nil` |
-| `configService.replicaCount` | Replica count of apollo-configservice | `2` |
-| `configService.containerPort` | Container port of apollo-configservice | `8080` |
-| `configService.image.repository` | Image repository of apollo-configservice | `apolloconfig/apollo-configservice` |
-| `configService.image.tag` | Image tag of apollo-configservice, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` |
-| `configService.image.pullPolicy`                | Image pull policy of apollo-configservice | `IfNotPresent` |
-| `configService.imagePullSecrets`                | Image pull secrets of apollo-configservice | `[]` |
-| `configService.service.fullNameOverride` | Override the service name for apollo-configservice | `nil` |
-| `configService.service.port` | The port for the service of apollo-configservice | `8080` |
-| `configService.service.targetPort` | The target port for the service of apollo-configservice | `8080` |
-| `configService.service.type` | The service type of apollo-configservice                     | `ClusterIP` |
-| `configService.ingress.enabled` | Whether to enable the ingress for config-service or not | `false` |
-| `configService.ingress.annotations` | The annotations of the ingress for config-service | `{}` |
-| `configService.ingress.hosts.host` | The host of the ingress for config-service | `nil` |
-| `configService.ingress.hosts.paths` | The paths of the ingress for config-service | `[]` |
-| `configService.ingress.tls` | The tls definition of the ingress for config-service | `[]` |
-| `configService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` |
-| `configService.liveness.periodSeconds` | The period seconds of liveness probe | `10` |
-| `configService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` |
-| `configService.readiness.periodSeconds` | The period seconds of readiness probe | `5` |
-| `configService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` |
-| `configService.config.configServiceUrlOverride` | Override `apollo.config-service.url`: config service url to be accessed by apollo-client | `nil` |
-| `configService.config.adminServiceUrlOverride` | Override `apollo.admin-service.url`: admin service url to be accessed by apollo-portal | `nil` |
-| `configService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access config service via `http://{config_service_address}/apollo` | `nil` |
-| `configService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` |
-| `configService.strategy` | The deployment strategy of apollo-configservice | `{}` |
-| `configService.resources` | The resources definition of apollo-configservice | `{}` |
-| `configService.nodeSelector` | The node selector definition of apollo-configservice | `{}` |
-| `configService.tolerations` | The tolerations definition of apollo-configservice | `[]` |
-| `configService.affinity` | The affinity definition of apollo-configservice | `{}` |
-| `adminService.fullNameOverride` | Override the deployment name for apollo-adminservice | `nil` |
-| `adminService.replicaCount` | Replica count of apollo-adminservice | `2` |
-| `adminService.containerPort` | Container port of apollo-adminservice | `8090` |
-| `adminService.image.repository` | Image repository of apollo-adminservice | `apolloconfig/apollo-adminservice` |
-| `adminService.image.tag` | Image tag of apollo-adminservice, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` |
-| `adminService.image.pullPolicy`                | Image pull policy of apollo-adminservice | `IfNotPresent` |
-| `adminService.imagePullSecrets`                | Image pull secrets of apollo-adminservice | `[]` |
-| `adminService.service.fullNameOverride` | Override the service name for apollo-adminservice | `nil` |
-| `adminService.service.port` | The port for the service of apollo-adminservice | `8090` |
-| `adminService.service.targetPort` | The target port for the service of apollo-adminservice | `8090` |
-| `adminService.service.type` | The service type of apollo-adminservice                     | `ClusterIP` |
-| `adminService.ingress.enabled` | Whether to enable the ingress for admin-service or not | `false` |
-| `adminService.ingress.annotations` | The annotations of the ingress for admin-service | `{}` |
-| `adminService.ingress.hosts.host` | The host of the ingress for admin-service | `nil` |
-| `adminService.ingress.hosts.paths` | The paths of the ingress for admin-service | `[]` |
-| `adminService.ingress.tls` | The tls definition of the ingress for admin-service | `[]` |
-| `adminService.liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` |
-| `adminService.liveness.periodSeconds` | The period seconds of liveness probe | `10` |
-| `adminService.readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` |
-| `adminService.readiness.periodSeconds` | The period seconds of readiness probe | `5` |
-| `adminService.config.profiles` | specify the spring profiles to activate | `github,kubernetes` |
-| `adminService.config.contextPath` | specify the context path, e.g. `/apollo`, then users could access admin service via `http://{admin_service_address}/apollo` | `nil` |
-| `adminService.env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` |
-| `adminService.strategy` | The deployment strategy of apollo-adminservice | `{}` |
-| `adminService.resources` | The resources definition of apollo-adminservice | `{}` |
-| `adminService.nodeSelector` | The node selector definition of apollo-adminservice | `{}` |
-| `adminService.tolerations` | The tolerations definition of apollo-adminservice | `[]` |
-| `adminService.affinity` | The affinity definition of apollo-adminservice | `{}` |
-
-### 4.4 Sample
-
-1. ConfigDB host is an IP outside of kubernetes cluster
-
-```yaml
-configdb:
-  host: 1.2.3.4
-  dbName: ApolloConfigDBName
-  userName: someUserName
-  password: somePassword
-  connectionStringProperties: characterEncoding=utf8&useSSL=false
-  service:
-    enabled: true
-```
-
-2. ConfigDB host is a dns name outside of kubernetes cluster
-
-```yaml
-configdb:
-  host: xxx.mysql.rds.aliyuncs.com
-  dbName: ApolloConfigDBName
-  userName: someUserName
-  password: somePassword
-  connectionStringProperties: characterEncoding=utf8&useSSL=false
-  service:
-    enabled: true
-    type: ExternalName
-```
-3. ConfigDB host is a kubernetes service
-
-```yaml
-configdb:
-  host: apollodb-mysql.mysql
-  dbName: ApolloConfigDBName
-  userName: someUserName
-  password: somePassword
-  connectionStringProperties: characterEncoding=utf8&useSSL=false
-```
-
-4. Expose config service as Ingress with custom path `/config`
-
-```yaml
-# use /config as root, should specify configService.config.contextPath as /config
-configService:
-  config:
-    contextPath: /config
-  ingress:
-    enabled: true
-    hosts:
-      - paths:
-          - /config
-```
-
-5. Expose admin service as Ingress with custom path `/admin`
-
-```yaml
-# use /admin as root, should specify adminService.config.contextPath as /admin
-adminService:
-  config:
-    contextPath: /admin
-  ingress:
-    enabled: true
-    hosts:
-      - paths:
-          - /admin
-```
-
-## 5. Deployments of apollo-portal
-
-### 5.1 Install
-
-To install the apollo-portal chart with the release name `apollo-portal`:
-
-```bash
-$ helm install apollo-portal \
-    --set portaldb.host=1.2.3.4 \
-    --set portaldb.userName=apollo \
-    --set portaldb.password=apollo \
-    --set portaldb.service.enabled=true \
-    --set config.envs="dev\,pro" \
-    --set config.metaServers.dev=http://apollo-service-dev-apollo-configservice:8080 \
-    --set config.metaServers.pro=http://apollo-service-pro-apollo-configservice:8080 \
-    --set replicaCount=1 \
-    -n your-namespace \
-    apollo/apollo-portal
-```
-
-Or customize it with values.yaml
-
-```bash
-$ helm install apollo-portal -f values.yaml -n your-namespace apollo/apollo-portal 
-```
-
-### 5.2 Uninstallation
-
-To uninstall/delete the `apollo-portal` deployment:
-
-```bash
-$ helm uninstall -n your-namespace apollo-portal
-```
-
-### 5.3 Configuration
-
-The following table lists the configurable parameters of the apollo-portal chart and their default values.
-
-| Parameter            | Description                                 | Default               |
-|----------------------|---------------------------------------------|-----------------------|
-| `fullNameOverride` | Override the deployment name for apollo-portal | `nil` |
-| `replicaCount` | Replica count of apollo-portal | `2` |
-| `containerPort` | Container port of apollo-portal | `8070` |
-| `image.repository` | Image repository of apollo-portal | `apolloconfig/apollo-portal` |
-| `image.tag` | Image tag of apollo-portal, e.g. `1.8.0`, leave it to `nil` to use the default version | `nil` |
-| `image.pullPolicy`                | Image pull policy of apollo-portal | `IfNotPresent` |
-| `imagePullSecrets`                | Image pull secrets of apollo-portal | `[]` |
-| `service.fullNameOverride` | Override the service name for apollo-portal | `nil` |
-| `service.port` | The port for the service of apollo-portal | `8070` |
-| `service.targetPort` | The target port for the service of apollo-portal | `8070` |
-| `service.type` | The service type of apollo-portal                     | `ClusterIP` |
-| `service.sessionAffinity` | The session affinity for the service of apollo-portal | `ClientIP` |
-| `ingress.enabled` | Whether to enable the ingress or not | `false` |
-| `ingress.annotations` | The annotations of the ingress | `{}` |
-| `ingress.hosts.host` | The host of the ingress | `nil` |
-| `ingress.hosts.paths` | The paths of the ingress | `[]` |
-| `ingress.tls` | The tls definition of the ingress | `[]` |
-| `liveness.initialDelaySeconds` | The initial delay seconds of liveness probe | `100` |
-| `liveness.periodSeconds` | The period seconds of liveness probe | `10` |
-| `readiness.initialDelaySeconds` | The initial delay seconds of readiness probe | `30` |
-| `readiness.periodSeconds` | The period seconds of readiness probe | `5` |
-| `env` | Environment variables passed to the container, e.g. <br />`JAVA_OPTS: -Xss256k` | `{}` |
-| `strategy` | The deployment strategy of apollo-portal | `{}` |
-| `resources` | The resources definition of apollo-portal | `{}` |
-| `nodeSelector` | The node selector definition of apollo-portal | `{}` |
-| `tolerations` | The tolerations definition of apollo-portal | `[]` |
-| `affinity` | The affinity definition of apollo-portal | `{}` |
-| `config.profiles` | specify the spring profiles to activate | `github,auth` |
-| `config.envs` | specify the env names, e.g. dev,pro | `nil` |
-| `config.contextPath` | specify the context path, e.g. `/apollo`, then users could access portal via `http://{portal_address}/apollo` | `nil` |
-| `config.metaServers` | specify the meta servers, e.g.<br />`dev: http://apollo-configservice-dev:8080`<br />`pro: http://apollo-configservice-pro:8080` | `{}` |
-| `config.files` | specify the extra config files for apollo-portal, e.g. application-ldap.yml | `{}` |
-| `portaldb.host` | The host for apollo portal db | `nil`                              |
-| `portaldb.port` | The port for apollo portal db | `3306` |
-| `portaldb.dbName` | The database name for apollo portal db | `ApolloPortalDB`                                     |
-| `portaldb.userName` | The user name for apollo portal db | `nil` |
-| `portaldb.password` | The password for apollo portal db | `nil` |
-| `portaldb.connectionStringProperties` | The connection string properties for apollo portal db | `characterEncoding=utf8` |
-| `portaldb.service.enabled` | Whether to create a Kubernetes Service for `portaldb.host` or not. Set it to `true` if `portaldb.host` is an endpoint outside of the kubernetes cluster | `false` |
-| `portaldb.service.fullNameOverride` | Override the service name for apollo portal db | `nil` |
-| `portaldb.service.port` | The port for the service of apollo portal db | `3306` |
-| `portaldb.service.type` | The service type of apollo portal db: `ClusterIP` or `ExternalName`. If the host is a DNS name, please specify `ExternalName` as the service type, e.g. xxx.mysql.rds.aliyuncs.com | `ClusterIP` |
-
-### 5.4 Sample
-
-1. PortalDB host is an IP outside of kubernetes cluster
-
-```yaml
-portaldb:
-  host: 1.2.3.4
-  dbName: ApolloPortalDBName
-  userName: someUserName
-  password: somePassword
-  connectionStringProperties: characterEncoding=utf8&useSSL=false
-  service:
-    enabled: true
-```
-
-2. PortalDB host is a dns name outside of kubernetes cluster
-
-```yaml
-portaldb:
-  host: xxx.mysql.rds.aliyuncs.com
-  dbName: ApolloPortalDBName
-  userName: someUserName
-  password: somePassword
-  connectionStringProperties: characterEncoding=utf8&useSSL=false
-  service:
-    enabled: true
-    type: ExternalName
-```
-3. PortalDB host is a kubernetes service
-
-```yaml
-portaldb:
-  host: apollodb-mysql.mysql
-  dbName: ApolloPortalDBName
-  userName: someUserName
-  password: somePassword
-  connectionStringProperties: characterEncoding=utf8&useSSL=false
-```
-
-4. Specify environments
-
-```yaml
-config:
-  envs: dev,pro
-  metaServers:
-    dev: http://apollo-service-dev-apollo-configservice:8080
-    pro: http://apollo-service-pro-apollo-configservice:8080
-```
-
-5. Expose service as Load Balancer
-
-```yaml
-service:
-  type: LoadBalancer
-```
-
-6. Expose service as Ingress
-
-```yaml
-ingress:
-  enabled: true
-  hosts:
-    - paths:
-        - /
-```
-
-7. Expose service as Ingress with custom path `/apollo`
-
-```yaml
-# use /apollo as root, should specify config.contextPath as /apollo
-ingress:
-  enabled: true
-  hosts:
-    - paths:
-        - /apollo
-
-config:
-  ...
-  contextPath: /apollo
-  ...
-```
-
-8. Expose service as Ingress with session affinity
-
-```yaml
-ingress:
-  enabled: true
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/affinity: "cookie"
-    nginx.ingress.kubernetes.io/affinity-mode: "persistent"
-    nginx.ingress.kubernetes.io/session-cookie-conditional-samesite-none: "true"
-    nginx.ingress.kubernetes.io/session-cookie-expires: "172800"
-    nginx.ingress.kubernetes.io/session-cookie-max-age: "172800"
-  hosts:
-    - host: xxx.somedomain.com # host is required to make session affinity work
-      paths:
-        - /
-```
-
-9. Enable LDAP support
-
-```yaml
-config:
-  ...
-  profiles: github,ldap
-  ...
-  files:
-    application-ldap.yml: |
-      spring:
-        ldap:
-          base: "dc=example,dc=org"
-          username: "cn=admin,dc=example,dc=org"
-          password: "password"
-          searchFilter: "(uid={0})"
-          urls:
-          - "ldap://xxx.somedomain.com:389"
-
-      ldap:
-        mapping:
-          objectClass: "inetOrgPerson"
-          loginId: "uid"
-          userDisplayName: "cn"
-          email: "mail"
-```

+ 0 - 23
scripts/helm/apollo-portal/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

+ 0 - 27
scripts/helm/apollo-portal/Chart.yaml

@@ -1,27 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-apiVersion: v2
-name: apollo-portal
-description: A Helm chart for Apollo Portal
-type: application
-version: 0.3.1
-appVersion: 1.9.1
-home: https://github.com/ctripcorp/apollo
-icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
-maintainers:
-- name: nobodyiam
-  email: nobodyiam@gmail.com
-  url: https://github.com/nobodyiam

+ 0 - 25
scripts/helm/apollo-portal/templates/NOTES.txt

@@ -1,25 +0,0 @@
-Portal url for current release:
-{{- if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "apollo.portal.fullName" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "apollo.portal.fullName" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "apollo.portal.serviceName" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "apollo.portal.fullName" . }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8070 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8070:8070
-{{- end }}
-
-{{- if .Values.ingress.enabled }}
-
-Ingress:
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- end }}

+ 0 - 62
scripts/helm/apollo-portal/templates/_helpers.tpl

@@ -1,62 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{/*
-Full name for apollo-portal
-*/}}
-{{- define "apollo.portal.fullName" -}}
-{{- if .Values.fullNameOverride -}}
-{{- .Values.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- if contains .Values.name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name .Values.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "apollo.portal.labels" -}}
-{{- if .Chart.AppVersion -}}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-{{- end -}}
-
-{{/*
-Service name for portal
-*/}}
-{{- define "apollo.portal.serviceName" -}}
-{{- if .Values.service.fullNameOverride -}}
-{{- .Values.service.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{ include "apollo.portal.fullName" .}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Service name for portaldb
-*/}}
-{{- define "apollo.portaldb.serviceName" -}}
-{{- if .Values.portaldb.service.enabled -}}
-{{- if .Values.portaldb.service.fullNameOverride -}}
-{{- .Values.portaldb.service.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name .Values.portaldb.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- else -}}
-{{- .Values.portaldb.host -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Service port for portaldb
-*/}}
-{{- define "apollo.portaldb.servicePort" -}}
-{{- if .Values.portaldb.service.enabled -}}
-{{- .Values.portaldb.service.port -}}
-{{- else -}}
-{{- .Values.portaldb.port -}}
-{{- end -}}
-{{- end -}}

+ 0 - 133
scripts/helm/apollo-portal/templates/deployment-portal.yaml

@@ -1,133 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
----
-# configmap for apollo-portal
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  {{- $portalFullName := include "apollo.portal.fullName" . }}
-  name: {{ $portalFullName }}
-data:
-  application-github.properties: |
-    spring.datasource.url = jdbc:mysql://{{include "apollo.portaldb.serviceName" .}}:{{include "apollo.portaldb.servicePort" .}}/{{ .Values.portaldb.dbName }}{{ if .Values.portaldb.connectionStringProperties }}?{{ .Values.portaldb.connectionStringProperties }}{{ end }}
-    spring.datasource.username = {{ required "portaldb.userName is required!" .Values.portaldb.userName }}
-    spring.datasource.password = {{ required "portaldb.password is required!" .Values.portaldb.password }}
-    {{- if .Values.config.envs }}
-    apollo.portal.envs = {{ .Values.config.envs }}
-    {{- end }}
-    {{- if .Values.config.contextPath }}
-    server.servlet.context-path = {{ .Values.config.contextPath }}
-    {{- end }}
-  apollo-env.properties: |
-    {{- range $env, $address := .Values.config.metaServers }}
-    {{ $env }}.meta = {{ $address }}
-    {{- end }}
-{{- range $fileName, $content := .Values.config.files }}
-{{ $fileName | indent 2 }}: |
-{{ $content | indent 4 }}
-{{- end }}
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: {{ $portalFullName }}
-  labels:
-    {{- include "apollo.portal.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ $portalFullName }}
-  {{- with .Values.strategy }}
-  strategy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  template:
-    metadata:
-      labels:
-        app: {{ $portalFullName }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumes:
-        - name: configmap-{{ $portalFullName }}
-          configMap:
-            name: {{ $portalFullName }}
-            items:
-              - key: application-github.properties
-                path: application-github.properties
-              - key: apollo-env.properties
-                path: apollo-env.properties
-            {{- range $fileName, $content := .Values.config.files }}
-              - key: {{ $fileName }}
-                path: {{ $fileName }}
-            {{- end }}
-            defaultMode: 420
-      containers:
-        - name: {{ .Values.name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.containerPort }}
-              protocol: TCP
-          env:
-            - name: SPRING_PROFILES_ACTIVE
-              value: {{ .Values.config.profiles | quote }}
-          {{- range $key, $value := .Values.env }}
-            - name: {{ $key }}
-              value: {{ $value }}
-          {{- end }}
-          volumeMounts:
-            - name: configmap-{{ $portalFullName }}
-              mountPath: /apollo-portal/config/application-github.properties
-              subPath: application-github.properties
-            - name: configmap-{{ $portalFullName }}
-              mountPath: /apollo-portal/config/apollo-env.properties
-              subPath: apollo-env.properties
-          {{- range $fileName, $content := .Values.config.files }}
-            - name: configmap-{{ $portalFullName }}
-              mountPath: /apollo-portal/config/{{ $fileName }}
-              subPath: {{ $fileName }}
-          {{- end }}
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.containerPort }}
-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.liveness.periodSeconds }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.config.contextPath }}/health
-              port: {{ .Values.containerPort }}
-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readiness.periodSeconds }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}

+ 0 - 56
scripts/helm/apollo-portal/templates/ingress-portal.yaml

@@ -1,56 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "apollo.portal.fullName" . -}}
-{{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "apollo.portal.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}

+ 0 - 31
scripts/helm/apollo-portal/templates/service-portal.yaml

@@ -1,31 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "apollo.portal.serviceName" . }}
-  labels:
-    {{- include "apollo.portal.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-    - name: http
-      protocol: TCP
-      port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.targetPort }}
-  selector:
-    app: {{ include "apollo.portal.fullName" . }}
-  sessionAffinity: {{ .Values.service.sessionAffinity }}

+ 0 - 46
scripts/helm/apollo-portal/templates/service-portaldb.yaml

@@ -1,46 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-{{- if .Values.portaldb.service.enabled -}}
----
-# service definition for mysql
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{include "apollo.portaldb.serviceName" .}}
-  labels:
-    {{- include "apollo.portal.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.portaldb.service.type }}
-{{- if eq .Values.portaldb.service.type "ExternalName" }}
-  externalName: {{ required "portaldb.host is required!" .Values.portaldb.host }}
-{{- else }}
-  ports:
-    - protocol: TCP
-      port: {{ .Values.portaldb.service.port }}
-      targetPort: {{ .Values.portaldb.port }}
----
-kind: Endpoints
-apiVersion: v1
-metadata:
-  name: {{include "apollo.portaldb.serviceName" .}}
-subsets:
-  - addresses:
-      - ip: {{ required "portaldb.host is required!" .Values.portaldb.host }}
-    ports:
-      - protocol: TCP
-        port: {{ .Values.portaldb.port }}
-{{- end }}
-{{- end }}

+ 0 - 82
scripts/helm/apollo-portal/values.yaml

@@ -1,82 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-name: apollo-portal
-fullNameOverride: ""
-replicaCount: 1
-containerPort: 8070
-image:
-  repository: apolloconfig/apollo-portal
-  tag: ""
-  pullPolicy: IfNotPresent
-imagePullSecrets: []
-service:
-  fullNameOverride: ""
-  port: 8070
-  targetPort: 8070
-  type: ClusterIP
-  sessionAffinity: ClientIP
-ingress:
-  enabled: false
-  annotations: {}
-  hosts:
-    - host: ""
-      paths: []
-  tls: []
-liveness:
-  initialDelaySeconds: 100
-  periodSeconds: 10
-readiness:
-  initialDelaySeconds: 30
-  periodSeconds: 5
-# environment variables passed to the container, e.g. JAVA_OPTS
-env: {}
-strategy: {}
-resources: {}
-nodeSelector: {}
-tolerations: []
-affinity: {}
-
-config:
-  # spring profiles to activate
-  profiles: "github,auth"
-  # specify the env names, e.g. dev,pro
-  envs: ""
-  # specify the meta servers, e.g.
-  # dev: http://apollo-configservice-dev:8080
-  # pro: http://apollo-configservice-pro:8080
-  metaServers: {}
-  # specify the context path, e.g. /apollo
-  contextPath: ""
-  # extra config files for apollo-portal, e.g. application-ldap.yml
-  files: {}
-
-portaldb:
-  name: apollo-portaldb
-  # apolloportaldb host
-  host:
-  port: 3306
-  dbName: ApolloPortalDB
-  # apolloportaldb user name
-  userName:
-  # apolloportaldb password
-  password:
-  connectionStringProperties: characterEncoding=utf8
-  service:
-    # whether to create a Service for this host or not
-    enabled: false
-    fullNameOverride: ""
-    port: 3306
-    type: ClusterIP

+ 0 - 23
scripts/helm/apollo-service/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

+ 0 - 27
scripts/helm/apollo-service/Chart.yaml

@@ -1,27 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-apiVersion: v2
-name: apollo-service
-description: A Helm chart for Apollo Config Service and Apollo Admin Service
-type: application
-version: 0.3.1
-appVersion: 1.9.1
-home: https://github.com/ctripcorp/apollo
-icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
-maintainers:
-- name: nobodyiam
-  email: nobodyiam@gmail.com
-  url: https://github.com/nobodyiam

+ 0 - 32
scripts/helm/apollo-service/templates/NOTES.txt

@@ -1,32 +0,0 @@
-Meta service url for current release:
-{{- if contains "NodePort" .Values.configService.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "apollo.configService.fullName" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT{{ .Values.configService.config.contextPath }}
-{{- else if contains "LoadBalancer" .Values.configService.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "apollo.configService.fullName" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "apollo.configService.serviceName" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.service.port }}{{ .Values.configService.config.contextPath }}
-{{- else if contains "ClusterIP" .Values.configService.service.type }}
-  echo {{ include "apollo.configService.serviceUrl" .}}
-
-For local test use:
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "apollo.configService.fullName" . }}" -o jsonpath="{.items[0].metadata.name}")
-  echo http://127.0.0.1:8080{{ .Values.configService.config.contextPath }}
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:8080
-{{- end }}
-
-{{- if .Values.configService.ingress.enabled }}
-
-Ingress:
-{{- range $host := .Values.configService.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.configService.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
-  {{- end }}
-{{- end }}
-{{- end }}
-
-Urls registered to meta service:
-Config service: {{ include "apollo.configService.serviceUrl" .}}
-Admin service: {{ include "apollo.adminService.serviceUrl" .}}

+ 0 - 110
scripts/helm/apollo-service/templates/_helpers.tpl

@@ -1,110 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-
-{{/*
-Common labels
-*/}}
-{{- define "apollo.service.labels" -}}
-{{- if .Chart.AppVersion -}}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-{{- end -}}
-
-{{/*
-Service name for configdb
-*/}}
-{{- define "apollo.configdb.serviceName" -}}
-{{- if .Values.configdb.service.enabled -}}
-{{- if .Values.configdb.service.fullNameOverride -}}
-{{- .Values.configdb.service.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name .Values.configdb.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- else -}}
-{{- .Values.configdb.host -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Service port for configdb
-*/}}
-{{- define "apollo.configdb.servicePort" -}}
-{{- if .Values.configdb.service.enabled -}}
-{{- .Values.configdb.service.port -}}
-{{- else -}}
-{{- .Values.configdb.port -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Full name for config service
-*/}}
-{{- define "apollo.configService.fullName" -}}
-{{- if .Values.configService.fullNameOverride -}}
-{{- .Values.configService.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- if contains .Values.configService.name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name .Values.configService.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Service name for config service
-*/}}
-{{- define "apollo.configService.serviceName" -}}
-{{- if .Values.configService.service.fullNameOverride -}}
-{{- .Values.configService.service.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{ include "apollo.configService.fullName" .}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Config service url to be accessed by apollo-client
-*/}}
-{{- define "apollo.configService.serviceUrl" -}}
-{{- if .Values.configService.config.configServiceUrlOverride -}}
-{{ .Values.configService.config.configServiceUrlOverride }}
-{{- else -}}
-http://{{ include "apollo.configService.serviceName" .}}.{{ .Release.Namespace }}:{{ .Values.configService.service.port }}{{ .Values.configService.config.contextPath }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Full name for admin service
-*/}}
-{{- define "apollo.adminService.fullName" -}}
-{{- if .Values.adminService.fullNameOverride -}}
-{{- .Values.adminService.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- if contains .Values.adminService.name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name .Values.adminService.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Service name for admin service
-*/}}
-{{- define "apollo.adminService.serviceName" -}}
-{{- if .Values.adminService.service.fullNameOverride -}}
-{{- .Values.adminService.service.fullNameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{ include "apollo.adminService.fullName" .}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Admin service url to be accessed by apollo-portal
-*/}}
-{{- define "apollo.adminService.serviceUrl" -}}
-{{- if .Values.configService.config.adminServiceUrlOverride -}}
-{{ .Values.configService.config.adminServiceUrlOverride -}}
-{{- else -}}
-http://{{ include "apollo.adminService.serviceName" .}}.{{ .Release.Namespace }}:{{ .Values.adminService.service.port }}{{ .Values.adminService.config.contextPath }}
-{{- end -}}
-{{- end -}}

+ 0 - 108
scripts/helm/apollo-service/templates/deployment-adminservice.yaml

@@ -1,108 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
----
-# configmap for apollo-adminservice
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  {{- $adminServiceFullName := include "apollo.adminService.fullName" . }}
-  name: {{ $adminServiceFullName }}
-data:
-  application-github.properties: |
-    spring.datasource.url = jdbc:mysql://{{include "apollo.configdb.serviceName" .}}:{{include "apollo.configdb.servicePort" .}}/{{ .Values.configdb.dbName }}{{ if .Values.configdb.connectionStringProperties }}?{{ .Values.configdb.connectionStringProperties }}{{ end }}
-    spring.datasource.username = {{ required "configdb.userName is required!" .Values.configdb.userName }}
-    spring.datasource.password = {{ required "configdb.password is required!" .Values.configdb.password }}
-    {{- if .Values.adminService.config.contextPath }}
-    server.servlet.context-path = {{ .Values.adminService.config.contextPath }}
-    {{- end }}
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: {{ $adminServiceFullName }}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.adminService.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ $adminServiceFullName }}
-  {{- with .Values.adminService.strategy }}
-  strategy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  template:
-    metadata:
-      labels:
-        app: {{ $adminServiceFullName }}
-    spec:
-      {{- with .Values.adminService.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumes:
-        - name: volume-configmap-{{ $adminServiceFullName }}
-          configMap:
-            name: {{ $adminServiceFullName }}
-            items:
-              - key: application-github.properties
-                path: application-github.properties
-            defaultMode: 420
-      containers:
-        - name: {{ .Values.adminService.name }}
-          image: "{{ .Values.adminService.image.repository }}:{{ .Values.adminService.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.adminService.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.adminService.containerPort }}
-              protocol: TCP
-          env:
-            - name: SPRING_PROFILES_ACTIVE
-              value: {{ .Values.adminService.config.profiles | quote }}
-          {{- range $key, $value := .Values.adminService.env }}
-            - name: {{ $key }}
-              value: {{ $value }}
-          {{- end }}
-          volumeMounts:
-            - name: volume-configmap-{{ $adminServiceFullName }}
-              mountPath: /apollo-adminservice/config/application-github.properties
-              subPath: application-github.properties
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.adminService.containerPort }}
-            initialDelaySeconds: {{ .Values.adminService.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.adminService.liveness.periodSeconds }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.adminService.config.contextPath }}/health
-              port: {{ .Values.adminService.containerPort }}
-            initialDelaySeconds: {{ .Values.adminService.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.adminService.readiness.periodSeconds }}
-          resources:
-            {{- toYaml .Values.adminService.resources | nindent 12 }}
-    {{- with .Values.adminService.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.adminService.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.adminService.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}

+ 0 - 110
scripts/helm/apollo-service/templates/deployment-configservice.yaml

@@ -1,110 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
----
-# configmap for apollo-configservice
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  {{- $configServiceFullName := include "apollo.configService.fullName" . }}
-  name: {{ $configServiceFullName }}
-data:
-  application-github.properties: |
-    spring.datasource.url = jdbc:mysql://{{include "apollo.configdb.serviceName" .}}:{{include "apollo.configdb.servicePort" .}}/{{ .Values.configdb.dbName }}{{ if .Values.configdb.connectionStringProperties }}?{{ .Values.configdb.connectionStringProperties }}{{ end }}
-    spring.datasource.username = {{ required "configdb.userName is required!" .Values.configdb.userName }}
-    spring.datasource.password = {{ required "configdb.password is required!" .Values.configdb.password }}
-    apollo.config-service.url = {{ include "apollo.configService.serviceUrl" .}}
-    apollo.admin-service.url = {{ include "apollo.adminService.serviceUrl" .}}
-    {{- if .Values.configService.config.contextPath }}
-    server.servlet.context-path = {{ .Values.configService.config.contextPath }}
-    {{- end }}
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: {{ $configServiceFullName }}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.configService.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ $configServiceFullName }}
-  {{- with .Values.configService.strategy }}
-  strategy:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-  template:
-    metadata:
-      labels:
-        app: {{ $configServiceFullName }}
-    spec:
-      {{- with .Values.configService.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumes:
-        - name: volume-configmap-{{ $configServiceFullName }}
-          configMap:
-            name: {{ $configServiceFullName }}
-            items:
-              - key: application-github.properties
-                path: application-github.properties
-            defaultMode: 420
-      containers:
-        - name: {{ .Values.configService.name }}
-          image: "{{ .Values.configService.image.repository }}:{{ .Values.configService.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.configService.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.configService.containerPort }}
-              protocol: TCP
-          env:
-            - name: SPRING_PROFILES_ACTIVE
-              value: {{ .Values.configService.config.profiles | quote }}
-          {{- range $key, $value := .Values.configService.env }}
-            - name: {{ $key }}
-              value: {{ $value }}
-          {{- end }}
-          volumeMounts:
-            - name: volume-configmap-{{ $configServiceFullName }}
-              mountPath: /apollo-configservice/config/application-github.properties
-              subPath: application-github.properties
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.configService.containerPort }}
-            initialDelaySeconds: {{ .Values.configService.liveness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.configService.liveness.periodSeconds }}
-          readinessProbe:
-            httpGet:
-              path: {{ .Values.configService.config.contextPath }}/health
-              port: {{ .Values.configService.containerPort }}
-            initialDelaySeconds: {{ .Values.configService.readiness.initialDelaySeconds }}
-            periodSeconds: {{ .Values.configService.readiness.periodSeconds }}
-          resources:
-            {{- toYaml .Values.configService.resources | nindent 12 }}
-    {{- with .Values.configService.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.configService.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.configService.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}

+ 0 - 56
scripts/helm/apollo-service/templates/ingress-adminservice.yaml

@@ -1,56 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-{{- if .Values.adminService.ingress.enabled -}}
-{{- $fullName := include "apollo.adminService.fullName" . -}}
-{{- $svcPort := .Values.adminService.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-  {{- with .Values.adminService.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.adminService.ingress.tls }}
-  tls:
-  {{- range .Values.adminService.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.adminService.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}

+ 0 - 56
scripts/helm/apollo-service/templates/ingress-configservice.yaml

@@ -1,56 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-{{- if .Values.configService.ingress.enabled -}}
-{{- $fullName := include "apollo.configService.fullName" . -}}
-{{- $svcPort := .Values.configService.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
-apiVersion: networking.k8s.io/v1beta1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-  {{- with .Values.configService.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-{{- if .Values.configService.ingress.tls }}
-  tls:
-  {{- range .Values.configService.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.configService.ingress.hosts }}
-    - host: {{ .host | quote }}
-      http:
-        paths:
-        {{- range .paths }}
-          - path: {{ . }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-        {{- end }}
-  {{- end }}
-{{- end }}

+ 0 - 30
scripts/helm/apollo-service/templates/service-adminservice.yaml

@@ -1,30 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "apollo.adminService.serviceName" . }}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.adminService.service.type }}
-  ports:
-    - name: http
-      protocol: TCP
-      port: {{ .Values.adminService.service.port }}
-      targetPort: {{ .Values.adminService.service.targetPort }}
-  selector:
-    app: {{ include "apollo.adminService.fullName" . }}

+ 0 - 46
scripts/helm/apollo-service/templates/service-configdb.yaml

@@ -1,46 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-{{- if .Values.configdb.service.enabled -}}
----
-# service definition for mysql
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{include "apollo.configdb.serviceName" .}}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.configdb.service.type }}
-{{- if eq .Values.configdb.service.type "ExternalName" }}
-  externalName: {{ required "configdb.host is required!" .Values.configdb.host }}
-{{- else }}
-  ports:
-    - protocol: TCP
-      port: {{ .Values.configdb.service.port }}
-      targetPort: {{ .Values.configdb.port }}
----
-kind: Endpoints
-apiVersion: v1
-metadata:
-  name: {{include "apollo.configdb.serviceName" .}}
-subsets:
-  - addresses:
-      - ip: {{ required "configdb.host is required!" .Values.configdb.host }}
-    ports:
-      - protocol: TCP
-        port: {{ .Values.configdb.port }}
-{{- end }}
-{{- end }}

+ 0 - 30
scripts/helm/apollo-service/templates/service-configservice.yaml

@@ -1,30 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "apollo.configService.serviceName" . }}
-  labels:
-    {{- include "apollo.service.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.configService.service.type }}
-  ports:
-    - name: http
-      protocol: TCP
-      port: {{ .Values.configService.service.port }}
-      targetPort: {{ .Values.configService.service.targetPort }}
-  selector:
-    app: {{ include "apollo.configService.fullName" . }}

+ 0 - 118
scripts/helm/apollo-service/values.yaml

@@ -1,118 +0,0 @@
-#
-# Copyright 2021 Apollo Authors
-#
-# 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.
-#
-configdb:
-  name: apollo-configdb
-  # apolloconfigdb host
-  host: ""
-  port: 3306
-  dbName: ApolloConfigDB
-  # apolloconfigdb user name
-  userName: ""
-  # apolloconfigdb password
-  password: ""
-  connectionStringProperties: characterEncoding=utf8
-  service:
-    # whether to create a Service for this host or not
-    enabled: false
-    fullNameOverride: ""
-    port: 3306
-    type: ClusterIP
-
-configService:
-  name: apollo-configservice
-  fullNameOverride: ""
-  replicaCount: 2
-  containerPort: 8080
-  image:
-    repository: apolloconfig/apollo-configservice
-    tag: ""
-    pullPolicy: IfNotPresent
-  imagePullSecrets: []
-  service:
-    fullNameOverride: ""
-    port: 8080
-    targetPort: 8080
-    type: ClusterIP
-  ingress:
-    enabled: false
-    annotations: { }
-    hosts:
-      - host: ""
-        paths: [ ]
-    tls: [ ]
-  liveness:
-    initialDelaySeconds: 100
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 30
-    periodSeconds: 5
-  config:
-    # spring profiles to activate
-    profiles: "github,kubernetes"
-    # override apollo.config-service.url: config service url to be accessed by apollo-client 
-    configServiceUrlOverride: ""
-    # override apollo.admin-service.url: admin service url to be accessed by apollo-portal 
-    adminServiceUrlOverride: ""
-    # specify the context path, e.g. /apollo
-    contextPath: ""
-  # environment variables passed to the container, e.g. JAVA_OPTS
-  env: {}
-  strategy: {}
-  resources: {}
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
-adminService:
-  name: apollo-adminservice
-  fullNameOverride: ""
-  replicaCount: 2
-  containerPort: 8090
-  image:
-    repository: apolloconfig/apollo-adminservice
-    tag: ""
-    pullPolicy: IfNotPresent
-  imagePullSecrets: []
-  service:
-    fullNameOverride: ""
-    port: 8090
-    targetPort: 8090
-    type: ClusterIP
-  ingress:
-    enabled: false
-    annotations: { }
-    hosts:
-      - host: ""
-        paths: [ ]
-    tls: [ ]
-  liveness:
-    initialDelaySeconds: 100
-    periodSeconds: 10
-  readiness:
-    initialDelaySeconds: 30
-    periodSeconds: 5
-  config:
-    # spring profiles to activate
-    profiles: "github,kubernetes"
-    # specify the context path, e.g. /apollo
-    contextPath: ""
-  # environment variables passed to the container, e.g. JAVA_OPTS
-  env: {}
-  strategy: {}
-  resources: {}
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}