修复导致在k8s中部署中失败的两个地方 (#2113)

修复因为Dockerfile中ENTRYPOINT导致运行容器read-only报错
修复多个环境使用同dev环境注册中心导致web管理界面获取admin Server不一致

scripts/apollo-on-kubernetes/apollo-admin-server/Dockerfile

@@ -18,12 +18,7 @@ ADD . /apollo-admin-server/
 
 ENV APOLLO_ADMIN_SERVICE_NAME="service-apollo-admin-server.sre"
 
-ENV DATASOURCES_URL="jdbc:mysql://service-mysql-for-apollo.sre:3306/ApolloConfigDB?characterEncoding=utf8"
-ENV DATASOURCES_USERNAME="FillInCorrectUser"
-ENV DATASOURCES_PASSWORD="FillInCorrectPassword"
 
 EXPOSE 8090
 
-ENTRYPOINT ["/apollo-admin-server/entrypoint.sh"]
-
 CMD ["/apollo-admin-server/scripts/startup-kubernetes.sh"]

scripts/apollo-on-kubernetes/apollo-admin-server/config/application-github.properties

-# DataSource
-spring.datasource.url = DATASOURCES_URL
-spring.datasource.username = DATASOURCES_USERNAME
-spring.datasource.password = DATASOURCES_PASSWORD

scripts/apollo-on-kubernetes/apollo-config-server/Dockerfile

@@ -18,12 +18,8 @@ ADD . /apollo-config-server/
 
 ENV APOLLO_CONFIG_SERVICE_NAME="service-apollo-config-server.sre"
 
-ENV DATASOURCES_URL="jdbc:mysql://service-mysql-for-apollo.sre:3306/ApolloConfigDB?characterEncoding=utf8"
-ENV DATASOURCES_USERNAME="FillInCorrectUser"
-ENV DATASOURCES_PASSWORD="FillInCorrectPassword"
 
 EXPOSE 8080
 
-ENTRYPOINT ["/apollo-config-server/entrypoint.sh"]
 
 CMD ["/apollo-config-server/scripts/startup-kubernetes.sh"]

scripts/apollo-on-kubernetes/apollo-config-server/config/application-github.properties

-# DataSource
-spring.datasource.url = DATASOURCES_URL
-spring.datasource.username = DATASOURCES_USERNAME
-spring.datasource.password = DATASOURCES_PASSWORD

scripts/apollo-on-kubernetes/apollo-portal-server/Dockerfile

@@ -18,9 +18,6 @@ ADD . /apollo-portal-server/
 
 ENV APOLLO_PORTAL_SERVICE_NAME="service-apollo-portal-server.sre"
 
-ENV DATASOURCES_URL="jdbc:mysql://service-mysql-for-apollo.sre:3306/ApolloPortalDB?characterEncoding=utf8"
-ENV DATASOURCES_USERNAME="FillInCorrectUser"
-ENV DATASOURCES_PASSWORD="FillInCorrectPassword"
 
 ENV DEV_META_SERVICE_NAME="service-apollo-config-server-dev.sre"
 ENV TEST_ALPHA_META_SERVICE_NAME="service-apollo-config-server-test-alpha.sre"
@@ -29,6 +26,5 @@ ENV PROD_META_SERVICE_NAME="service-apollo-config-server-prod.sre"
 
 EXPOSE 8070
 
-ENTRYPOINT ["/apollo-portal-server/entrypoint.sh"]
 
 CMD ["/apollo-portal-server/scripts/startup-kubernetes.sh"]

scripts/apollo-on-kubernetes/apollo-portal-server/config/apollo-env.properties

-dev.meta=http://DEV_META_SERVICE_NAME:8080
-fat.meta=http://TEST_ALPHA_META_SERVICE_NAME:8080
-uat.meta=http://TEST_BETA_META_SERVICE_NAME:8080
-pro.meta=http://PROD_META_SERVICE_NAME:8080

scripts/apollo-on-kubernetes/apollo-portal-server/config/application-github.properties

-# DataSource
-spring.datasource.url = DATASOURCES_URL
-spring.datasource.username = DATASOURCES_USERNAME
-spring.datasource.password = DATASOURCES_PASSWORD

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

@@ -11,7 +11,7 @@ data:
     spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8
     spring.datasource.username = FillInCorrectUser
     spring.datasource.password = FillInCorrectPassword
-    eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
+    eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/
 
 ---
 kind: Service

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

@@ -11,7 +11,7 @@ data:
     spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ProdApolloConfigDB?characterEncoding=utf8
     spring.datasource.username = FillInCorrectUser
     spring.datasource.password = FillInCorrectPassword
-    eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
+    eureka.service.url = http://statefulset-apollo-config-server-prod-0.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-1.service-apollo-meta-server-prod:8080/eureka/,http://statefulset-apollo-config-server-prod-2.service-apollo-meta-server-prod:8080/eureka/
 
 ---
 kind: Service

scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-apollo-admin-server-test-alpha.yaml

@@ -11,7 +11,7 @@ data:
     spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
     spring.datasource.username = FillInCorrectUser
     spring.datasource.password = FillInCorrectPassword
-    eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
+    eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
 
 ---
 kind: Service

scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-alpha/service-apollo-config-server-test-alpha.yaml

@@ -11,7 +11,7 @@ data:
     spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-alpha-env.sre:3306/TestAlphaApolloConfigDB?characterEncoding=utf8
     spring.datasource.username = FillInCorrectUser
     spring.datasource.password = FillInCorrectPassword
-    eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
+    eureka.service.url = http://statefulset-apollo-config-server-test-alpha-0.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-1.service-apollo-meta-server-test-alpha:8080/eureka/,http://statefulset-apollo-config-server-test-alpha-2.service-apollo-meta-server-test-alpha:8080/eureka/
 
 ---
 kind: Service

scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-apollo-admin-server-test-beta.yaml

@@ -11,7 +11,7 @@ data:
     spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
     spring.datasource.username = FillInCorrectUser
     spring.datasource.password = FillInCorrectPassword
-    eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
+    eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
 
 ---
 kind: Service

scripts/apollo-on-kubernetes/kubernetes/apollo-env-test-beta/service-apollo-config-server-test-beta.yaml

@@ -11,7 +11,7 @@ data:
     spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-test-beta-env.sre:3306/TestBetaApolloConfigDB?characterEncoding=utf8
     spring.datasource.username = FillInCorrectUser
     spring.datasource.password = FillInCorrectPassword
-    eureka.service.url = http://statefulset-apollo-config-server-dev-0.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-1.service-apollo-meta-server-dev:8080/eureka/,http://statefulset-apollo-config-server-dev-2.service-apollo-meta-server-dev:8080/eureka/
+    eureka.service.url = http://statefulset-apollo-config-server-test-beta-0.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-1.service-apollo-meta-server-test-beta:8080/eureka/,http://statefulset-apollo-config-server-test-beta-2.service-apollo-meta-server-test-beta:8080/eureka/
 
 ---
 kind: Service

scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh

@@ -2,24 +2,24 @@
 kubectl create namespace sre
 
 # dev-env
-kubectl apply -f service-mysql-for-apollo-dev-env.yaml --record && \
-kubectl apply -f service-apollo-config-server-dev.yaml --record && \
-kubectl apply -f service-apollo-admin-server-dev.yaml --record
+kubectl apply -f apollo-env-dev/service-mysql-for-apollo-dev-env.yaml --record && \
+kubectl apply -f apollo-env-dev/service-apollo-config-server-dev.yaml --record && \
+kubectl apply -f apollo-env-dev/service-apollo-admin-server-dev.yaml --record
 
 # fat-env(test-alpha-env)
-kubectl apply -f service-mysql-for-apollo-test-alpha-env.yaml --record && \
-kubectl apply -f service-apollo-config-server-test-alpha.yaml --record && \
-kubectl apply -f service-apollo-admin-server-test-alpha.yaml --record
+kubectl apply -f apollo-env-test-alpha/service-mysql-for-apollo-test-alpha-env.yaml --record && \
+kubectl apply -f apollo-env-test-alpha/service-apollo-config-server-test-alpha.yaml --record && \
+kubectl apply -f apollo-env-test-alpha/service-apollo-admin-server-test-alpha.yaml --record
 
 # uat-env(test-beta-env)
-kubectl apply -f service-mysql-for-apollo-test-beta-env.yaml --record && \
-kubectl apply -f service-apollo-config-server-test-beta.yaml --record && \
-kubectl apply -f service-apollo-admin-server-test-beta.yaml --record
+kubectl apply -f apollo-env-test-beta/service-mysql-for-apollo-test-beta-env.yaml --record && \
+kubectl apply -f apollo-env-test-beta/service-apollo-config-server-test-beta.yaml --record && \
+kubectl apply -f apollo-env-test-beta/service-apollo-admin-server-test-beta.yaml --record
 
 # prod-env
-kubectl apply -f service-mysql-for-apollo-prod-env.yaml --record && \
-kubectl apply -f service-apollo-config-server-prod.yaml --record && \
-kubectl apply -f service-apollo-admin-server-prod.yaml --record
+kubectl apply -f apollo-env-prod/service-mysql-for-apollo-prod-env.yaml --record && \
+kubectl apply -f apollo-env-prod/service-apollo-config-server-prod.yaml --record && \
+kubectl apply -f apollo-env-prod/service-apollo-admin-server-prod.yaml --record
 
 # portal
 kubectl apply -f service-apollo-portal-server.yaml --record