diff --git a/CHANGES.md b/CHANGES.md
index 724bf2e738e..a2bd1a5370c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Apollo 2.1.0
* [Optimize Spring-Security Firewall Deny Request Response 400](https://github.com/apolloconfig/apollo/pull/4428)
* [Optimize the UI experience of open platform authorization management](https://github.com/apolloconfig/apollo/pull/4436)
* [Allow users to associate multiple public namespaces at a time](https://github.com/apolloconfig/apollo/pull/4437)
+* [Move apollo-demo, scripts/docker-quick-start and scripts/apollo-on-kubernetes out of main repository](https://github.com/apolloconfig/apollo/pull/4440)
------------------
All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/11?closed=1)
diff --git a/doc/images/local-development/apollo-demo-overview.jpg b/doc/images/local-development/apollo-demo-overview.jpg
index 9754fd378a7..9286b118003 100644
Binary files a/doc/images/local-development/apollo-demo-overview.jpg and b/doc/images/local-development/apollo-demo-overview.jpg differ
diff --git a/scripts/apollo-on-kubernetes/README.md b/scripts/apollo-on-kubernetes/README.md
deleted file mode 100644
index 73708ddb94f..00000000000
--- a/scripts/apollo-on-kubernetes/README.md
+++ /dev/null
@@ -1,170 +0,0 @@
-# 使用方法
-
-> Apollo 1.7.0版本增加了基于Kubernetes原生服务发现的[Helm Chart部署模式](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_241-%e5%9f%ba%e4%ba%8ekubernetes%e5%8e%9f%e7%94%9f%e6%9c%8d%e5%8a%a1%e5%8f%91%e7%8e%b0),由于不再使用内置的Eureka,所以在整体部署上有很大简化,如无特殊需求,建议使用该模式部署。
-
-## 1. 创建数据库
-具体步骤请参考 [2.1 创建数据库](https://www.apolloconfig.com/#/zh/deployment/distributed-deployment-guide?id=_21-%e5%88%9b%e5%bb%ba%e6%95%b0%e6%8d%ae%e5%ba%93),需要注意的是 ApolloPortalDB 只需要在生产环境部署一个即可,而 ApolloConfigDB 需要在每个环境部署一套,示例假设你的 apollo 开启了 4 个环境, 即 dev、fat、uat、prod,那么就需要创建 4 个 ApolloConfigDB。
-
-## 2. 调整部署配置
-
-### 2.1 ApolloConfigDB 数据库连接信息
-
-以 dev 环境为例,需要修改:
-
-1. `apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`spring.datasource.url`,`spring.datasource.username`和`spring.datasource.password`配置
-2. `apollo-env-dev/service-mysql-for-apollo-dev-env.yaml`中 mysql endpoint 地址信息
-
-### 2.2 eureka.service.url
-
-以 dev 环境为例,默认是以 replica 为 3 做的样例配置,如果 replica 数量改变了,那么也要对应修改`apollo-env-dev/service-apollo-config-server-dev.yaml`和`apollo-env-dev/service-apollo-admin-server-dev.yaml`中`application-github.properties`的`eureka.service.url`配置。
-
-如果该配置希望以数据库中为准,那么在 yaml 中直接删除该配置项即可。
-
-### 2.3 ApolloPortalDB 数据库连接信息
-
-1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`spring.datasource.url`,`spring.datasource.username`和`spring.datasource.password`配置
-2. 修改`service-apollo-portal-server.yaml`中 mysql endpoint 地址信息
-
-### 2.4 ApolloPortal 的环境信息
-
-1. 修改`service-apollo-portal-server.yaml`中`application-github.properties`的`apollo.portal.envs`配置
- * 如果该配置希望以数据库中为准,那么在 yaml 中直接删除该配置项即可。
-2. 修改`service-apollo-portal-server.yaml`中`apollo-env.properties`的各环境 meta server 地址信息
-
-## 3. Deploy apollo on kubernetes
-
-示例假设 apollo 开启了 4 个环境, 即 dev、fat、uat、pro
-
-按照 scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh 文件的内容部署 apollo 即可。
-
-```bash
-scripts/apollo-on-kubernetes/kubernetes$ cat kubectl-apply.sh
-# create namespace
-kubectl create namespace sre
-
-# dev-env
-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
-kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \
-kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \
-kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record
-
-# uat-env
-kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \
-kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \
-kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record
-
-# prod-env
-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
-```
-
-## 4. 验证所有 pod 处于 Running 并且 READY 状态
-
-```bash
-kubectl get pod -n sre -o wide
-
-# 示例结果
-NAME READY STATUS RESTARTS AGE IP NODE
-deployment-apollo-admin-server-dev-b7bbd657-4d5jx 1/1 Running 0 2d 10.247.4.79 k8s-apollo-node-2
-deployment-apollo-admin-server-dev-b7bbd657-lwz5x 1/1 Running 0 2d 10.247.8.7 k8s-apollo-node-3
-deployment-apollo-admin-server-dev-b7bbd657-xs4wt 1/1 Running 0 2d 10.247.1.23 k8s-apollo-node-1
-deployment-apollo-admin-server-prod-699bbd894f-j977p 1/1 Running 0 2d 10.247.4.83 k8s-apollo-node-2
-deployment-apollo-admin-server-prod-699bbd894f-n9m54 1/1 Running 0 2d 10.247.8.11 k8s-apollo-node-3
-deployment-apollo-admin-server-prod-699bbd894f-vs56w 1/1 Running 0 2d 10.247.1.27 k8s-apollo-node-1
-deployment-apollo-admin-server-uat-7c855cd4f5-9br65 1/1 Running 0 2d 10.247.1.25 k8s-apollo-node-1
-deployment-apollo-admin-server-uat-7c855cd4f5-cck5g 1/1 Running 0 2d 10.247.8.9 k8s-apollo-node-3
-deployment-apollo-admin-server-uat-7c855cd4f5-x6gt4 1/1 Running 0 2d 10.247.4.81 k8s-apollo-node-2
-deployment-apollo-portal-server-6d4bbc879c-bv7cn 1/1 Running 0 2d 10.247.8.12 k8s-apollo-node-3
-deployment-apollo-portal-server-6d4bbc879c-c4zrb 1/1 Running 0 2d 10.247.1.28 k8s-apollo-node-1
-deployment-apollo-portal-server-6d4bbc879c-qm4mn 1/1 Running 0 2d 10.247.4.84 k8s-apollo-node-2
-statefulset-apollo-config-server-dev-0 1/1 Running 0 2d 10.247.8.6 k8s-apollo-node-3
-statefulset-apollo-config-server-dev-1 1/1 Running 0 2d 10.247.4.78 k8s-apollo-node-2
-statefulset-apollo-config-server-dev-2 1/1 Running 0 2d 10.247.1.22 k8s-apollo-node-1
-statefulset-apollo-config-server-prod-0 1/1 Running 0 2d 10.247.8.10 k8s-apollo-node-3
-statefulset-apollo-config-server-prod-1 1/1 Running 0 2d 10.247.4.82 k8s-apollo-node-2
-statefulset-apollo-config-server-prod-2 1/1 Running 0 2d 10.247.1.26 k8s-apollo-node-1
-statefulset-apollo-config-server-uat-0 1/1 Running 0 2d 10.247.8.8 k8s-apollo-node-3
-statefulset-apollo-config-server-uat-1 1/1 Running 0 2d 10.247.4.80 k8s-apollo-node-2
-statefulset-apollo-config-server-uat-2 1/1 Running 0 2d 10.247.1.24 k8s-apollo-node-1
-```
-
-### 2.4 访问 apollo service
-
-- server 端(即 portal)
- kubernetes-master-ip:30001
-
-- client 端, 在 client 端无需再实现负载均衡
-Dev
- kubernetes-master-ip:30002
-Fat
- kubernetes-master-ip:30003
-Uat
- kubernetes-master-ip:30004
-Prod
- kubernetes-master-ip:30005
-
-# FAQ
-
-## 关于 kubernetes yaml 文件
-具体内容请查看 `scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml` 注释
-其他类似。
-
-## 关于 eureka.service.url
-使用 meta-server(即 config-server) 的 pod name, config-server 务必使用 statefulset。
-格式为:`http://.:/eureka/`。
-
-以 apollo-env-dev 为例:
-```bash
-('eureka.service.url', 'default', '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服务Url,多个service以英文逗号分隔')
-```
-你可以精简 config-server pod 的 name, 示例的长名字是为了更好的阅读与理解。
-
-### 方式一:通过Spring Boot文件 application-github.properties配置(推荐)
-推荐此方式配置 `eureka.service.url`,因为可以通过ConfigMap的方式传入容器,无需再修改数据库的字段。
-
-Admin Server的配置:
-```yaml
----
-# configmap for apollo-admin-server-dev
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-admin-server-dev
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = root
- spring.datasource.password = test
- 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/
-
-```
-
-Config Server的配置:
-```yaml
----
-# configmap for apollo-config-server-dev
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-config-server-dev
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env-mariadb.sre:3306/DevApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = root
- spring.datasource.password = m6bCdQXa00
- 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/
-
-```
-
-### 方式二:修改数据表 ApolloConfigDB.ServerConfig
-修改数据库表 ApolloConfigDB.ServerConfig的 eureka.service.url。
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml
deleted file mode 100755
index b14c1f1eb4a..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Copyright 2022 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-admin-server-dev
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-admin-server-dev
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?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/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-admin-server-dev
- labels:
- app: service-apollo-admin-server-dev
-spec:
- ports:
- - protocol: TCP
- port: 8090
- targetPort: 8090
- selector:
- app: pod-apollo-admin-server-dev
- type: ClusterIP
- sessionAffinity: ClientIP
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: deployment-apollo-admin-server-dev
- labels:
- app: deployment-apollo-admin-server-dev
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-admin-server-dev
- strategy:
- rollingUpdate:
- maxSurge: 1
- maxUnavailable: 1
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-admin-server-dev
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-admin-server-dev
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-admin-server-dev
- configMap:
- name: configmap-apollo-admin-server-dev
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-adminservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-admin-server-dev
- ports:
- - protocol: TCP
- containerPort: 8090
-
- volumeMounts:
- - name: volume-configmap-apollo-admin-server-dev
- mountPath: /apollo-adminservice/config/application-github.properties
- subPath: application-github.properties
-
- env:
- - name: APOLLO_ADMIN_SERVICE_NAME
- value: "service-apollo-admin-server-dev.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml
deleted file mode 100755
index 3447f136500..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# Copyright 2022 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-config-server-dev
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-config-server-dev
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-dev-env.sre:3306/ApolloConfigDB?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/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-meta-server-dev
- labels:
- app: service-apollo-meta-server-dev
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- selector:
- app: pod-apollo-config-server-dev
- type: ClusterIP
- clusterIP: None
- sessionAffinity: ClientIP
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-config-server-dev
- labels:
- app: service-apollo-config-server-dev
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- nodePort: 30002
- selector:
- app: pod-apollo-config-server-dev
- type: NodePort
- sessionAffinity: ClientIP
-
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: statefulset-apollo-config-server-dev
- labels:
- app: statefulset-apollo-config-server-dev
-spec:
- serviceName: service-apollo-meta-server-dev
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-config-server-dev
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-config-server-dev
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-config-server-dev
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-config-server-dev
- configMap:
- name: configmap-apollo-config-server-dev
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-configservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-config-server-dev
- ports:
- - protocol: TCP
- containerPort: 8080
-
- volumeMounts:
- - name: volume-configmap-apollo-config-server-dev
- mountPath: /apollo-configservice/config/application-github.properties
- subPath: application-github.properties
-
- env:
- - name: APOLLO_CONFIG_SERVICE_NAME
- value: "service-apollo-config-server-dev.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-mysql-for-apollo-dev-env.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-mysql-for-apollo-dev-env.yaml
deleted file mode 100755
index 45351473aad..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-mysql-for-apollo-dev-env.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright 2022 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.
-#
----
-# 为外部 mysql 服务设置 service
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-apollo-dev-env
- labels:
- app: service-mysql-for-apollo-dev-env
-spec:
- ports:
- - protocol: TCP
- port: 3306
- targetPort: 3306
- type: ClusterIP
- sessionAffinity: None
-
----
-kind: Endpoints
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-apollo-dev-env
-subsets:
- - addresses:
- - ip: your-mysql-addresses
- ports:
- - protocol: TCP
- port: 3306
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml
deleted file mode 100755
index 0b6d2cea3f6..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Copyright 2022 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-admin-server-fat
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-admin-server-fat
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = FillInCorrectUser
- spring.datasource.password = FillInCorrectPassword
- eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-admin-server-fat
- labels:
- app: service-apollo-admin-server-fat
-spec:
- ports:
- - protocol: TCP
- port: 8090
- targetPort: 8090
- selector:
- app: pod-apollo-admin-server-fat
- type: ClusterIP
- sessionAffinity: ClientIP
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: deployment-apollo-admin-server-fat
- labels:
- app: deployment-apollo-admin-server-fat
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-admin-server-fat
- strategy:
- rollingUpdate:
- maxSurge: 1
- maxUnavailable: 1
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-admin-server-fat
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-admin-server-fat
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-admin-server-fat
- configMap:
- name: configmap-apollo-admin-server-fat
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-adminservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-admin-server-fat
- ports:
- - protocol: TCP
- containerPort: 8090
-
- volumeMounts:
- - name: volume-configmap-apollo-admin-server-fat
- mountPath: /apollo-adminservice/config/application-github.properties
- subPath: application-github.properties
-
- env:
- - name: APOLLO_ADMIN_SERVICE_NAME
- value: "service-apollo-admin-server-fat.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml
deleted file mode 100755
index fae5495e8e5..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Copyright 2022 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-config-server-fat
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-config-server-fat
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = FillInCorrectUser
- spring.datasource.password = FillInCorrectPassword
- eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-meta-server-fat
- labels:
- app: service-apollo-meta-server-fat
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- selector:
- app: pod-apollo-config-server-fat
- type: ClusterIP
- clusterIP: None
- sessionAffinity: ClientIP
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-config-server-fat
- labels:
- app: service-apollo-config-server-fat
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- nodePort: 30003
- selector:
- app: pod-apollo-config-server-fat
- type: NodePort
- sessionAffinity: ClientIP
-
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: statefulset-apollo-config-server-fat
- labels:
- app: statefulset-apollo-config-server-fat
-spec:
- serviceName: service-apollo-meta-server-fat
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-config-server-fat
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-config-server-fat
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-config-server-fat
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-config-server-fat
- configMap:
- name: configmap-apollo-config-server-fat
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-configservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-config-server-fat
- ports:
- - protocol: TCP
- containerPort: 8080
-
- volumeMounts:
- - name: volume-configmap-apollo-config-server-fat
- mountPath: /apollo-configservice/config/application-github.properties
- subPath: application-github.properties
- env:
- - name: APOLLO_CONFIG_SERVICE_NAME
- value: "service-apollo-config-server-fat.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-mysql-for-apollo-fat-env.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-mysql-for-apollo-fat-env.yaml
deleted file mode 100755
index 08715055209..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-mysql-for-apollo-fat-env.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright 2022 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:
- namespace: sre
- name: service-mysql-for-apollo-fat-env
- labels:
- app: service-mysql-for-apollo-fat-env
-spec:
- ports:
- - protocol: TCP
- port: 3306
- targetPort: 3306
- type: ClusterIP
- sessionAffinity: None
-
----
-kind: Endpoints
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-apollo-fat-env
-subsets:
- - addresses:
- - ip: your-mysql-addresses
- ports:
- - protocol: TCP
- port: 3306
\ No newline at end of file
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml
deleted file mode 100755
index d696b016bf0..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Copyright 2022 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-admin-server-prod
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-admin-server-prod
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = FillInCorrectUser
- spring.datasource.password = FillInCorrectPassword
- 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/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-admin-server-prod
- labels:
- app: service-apollo-admin-server-prod
-spec:
- ports:
- - protocol: TCP
- port: 8090
- targetPort: 8090
- selector:
- app: pod-apollo-admin-server-prod
- type: ClusterIP
- sessionAffinity: ClientIP
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: deployment-apollo-admin-server-prod
- labels:
- app: deployment-apollo-admin-server-prod
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-admin-server-prod
- strategy:
- rollingUpdate:
- maxSurge: 1
- maxUnavailable: 1
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-admin-server-prod
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-admin-server-prod
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-admin-server-prod
- configMap:
- name: configmap-apollo-admin-server-prod
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-adminservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-admin-server-prod
- ports:
- - protocol: TCP
- containerPort: 8090
-
- volumeMounts:
- - name: volume-configmap-apollo-admin-server-prod
- mountPath: /apollo-adminservice/config/application-github.properties
- subPath: application-github.properties
-
- env:
- - name: APOLLO_ADMIN_SERVICE_NAME
- value: "service-apollo-admin-server-prod.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml
deleted file mode 100755
index e83f01c780a..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Copyright 2022 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-config-server-prod
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-config-server-prod
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-prod-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = FillInCorrectUser
- spring.datasource.password = FillInCorrectPassword
- 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/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-meta-server-prod
- labels:
- app: service-apollo-meta-server-prod
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- selector:
- app: pod-apollo-config-server-prod
- type: ClusterIP
- clusterIP: None
- sessionAffinity: ClientIP
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-config-server-prod
- labels:
- app: service-apollo-config-server-prod
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- nodePort: 30005
- selector:
- app: pod-apollo-config-server-prod
- type: NodePort
- sessionAffinity: ClientIP
-
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: statefulset-apollo-config-server-prod
- labels:
- app: statefulset-apollo-config-server-prod
-spec:
- serviceName: service-apollo-meta-server-prod
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-config-server-prod
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-config-server-prod
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-config-server-prod
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-config-server-prod
- configMap:
- name: configmap-apollo-config-server-prod
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-configservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-config-server-prod
- ports:
- - protocol: TCP
- containerPort: 8080
-
- volumeMounts:
- - name: volume-configmap-apollo-config-server-prod
- mountPath: /apollo-configservice/config/application-github.properties
- subPath: application-github.properties
- env:
- - name: APOLLO_CONFIG_SERVICE_NAME
- value: "service-apollo-config-server-prod.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-mysql-for-apollo-prod-env.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-mysql-for-apollo-prod-env.yaml
deleted file mode 100755
index 3350843ef0d..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-mysql-for-apollo-prod-env.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright 2022 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:
- namespace: sre
- name: service-mysql-for-apollo-prod-env
- labels:
- app: service-mysql-for-apollo-prod-env
-spec:
- ports:
- - protocol: TCP
- port: 3306
- targetPort: 3306
- type: ClusterIP
- sessionAffinity: None
-
----
-kind: Endpoints
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-apollo-prod-env
-subsets:
- - addresses:
- - ip: your-mysql-addresses
- ports:
- - protocol: TCP
- port: 3306
\ No newline at end of file
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml
deleted file mode 100755
index a29836d41d6..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-#
-# Copyright 2022 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-admin-server-uat
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-admin-server-uat
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-uat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = FillInCorrectUser
- spring.datasource.password = FillInCorrectPassword
- eureka.service.url = http://statefulset-apollo-config-server-uat-0.service-apollo-meta-server-uat:8080/eureka/,http://statefulset-apollo-config-server-uat-1.service-apollo-meta-server-uat:8080/eureka/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-admin-server-uat
- labels:
- app: service-apollo-admin-server-uat
-spec:
- ports:
- - protocol: TCP
- port: 8090
- targetPort: 8090
- selector:
- app: pod-apollo-admin-server-uat
- type: ClusterIP
- sessionAffinity: ClientIP
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: deployment-apollo-admin-server-uat
- labels:
- app: deployment-apollo-admin-server-uat
-spec:
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-admin-server-uat
- strategy:
- rollingUpdate:
- maxSurge: 1
- maxUnavailable: 1
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-admin-server-uat
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-admin-server-uat
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-admin-server-uat
- configMap:
- name: configmap-apollo-admin-server-uat
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-adminservice:2.0.1
- imagePullPolicy: IfNotPresent
- name: container-apollo-admin-server-uat
- ports:
- - protocol: TCP
- containerPort: 8090
-
- volumeMounts:
- - name: volume-configmap-apollo-admin-server-uat
- mountPath: /apollo-adminservice/config/application-github.properties
- subPath: application-github.properties
-
- env:
- - name: APOLLO_ADMIN_SERVICE_NAME
- value: "service-apollo-admin-server-uat.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8090
- initialDelaySeconds: 120
- periodSeconds: 10
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml
deleted file mode 100755
index 94eff052229..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Copyright 2022 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-config-server-uat
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-config-server-uat
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-uat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
- spring.datasource.username = FillInCorrectUser
- spring.datasource.password = FillInCorrectPassword
- eureka.service.url = http://statefulset-apollo-config-server-uat-0.service-apollo-meta-server-uat:8080/eureka/,http://statefulset-apollo-config-server-uat-1.service-apollo-meta-server-uat:8080/eureka/
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-meta-server-uat
- labels:
- app: service-apollo-meta-server-uat
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- selector:
- app: pod-apollo-config-server-uat
- type: ClusterIP
- clusterIP: None
- sessionAffinity: ClientIP
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-config-server-uat
- labels:
- app: service-apollo-config-server-uat
-spec:
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- nodePort: 30004
- selector:
- app: pod-apollo-config-server-uat
- type: NodePort
- sessionAffinity: ClientIP
-
----
-kind: StatefulSet
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: statefulset-apollo-config-server-uat
- labels:
- app: statefulset-apollo-config-server-uat
-spec:
- serviceName: service-apollo-meta-server-uat
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-config-server-uat
- updateStrategy:
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-config-server-uat
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-config-server-uat
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-config-server-uat
- configMap:
- name: configmap-apollo-config-server-uat
- items:
- - key: application-github.properties
- path: application-github.properties
-
- containers:
- - image: apolloconfig/apollo-configservice:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-config-server-uat
- ports:
- - protocol: TCP
- containerPort: 8080
-
- volumeMounts:
- - name: volume-configmap-apollo-config-server-uat
- mountPath: /apollo-configservice/config/application-github.properties
- subPath: application-github.properties
- env:
- - name: APOLLO_CONFIG_SERVICE_NAME
- value: "service-apollo-config-server-uat.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8080
- initialDelaySeconds: 120
- periodSeconds: 15
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always
diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-mysql-for-apollo-uat-env.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-mysql-for-apollo-uat-env.yaml
deleted file mode 100755
index bafb71c2188..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-mysql-for-apollo-uat-env.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright 2022 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:
- namespace: sre
- name: service-mysql-for-apollo-uat-env
- labels:
- app: service-mysql-for-apollo-uat-env
-spec:
- ports:
- - protocol: TCP
- port: 3306
- targetPort: 3306
- type: ClusterIP
- sessionAffinity: None
-
----
-kind: Endpoints
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-apollo-uat-env
-subsets:
- - addresses:
- - ip: your-mysql-addresses
- ports:
- - protocol: TCP
- port: 3306
\ No newline at end of file
diff --git a/scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh b/scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh
deleted file mode 100755
index d8f134414bf..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/kubectl-apply.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright 2022 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.
-#
-# create namespace
-kubectl create namespace sre
-
-# dev-env
-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
-kubectl apply -f apollo-env-fat/service-mysql-for-apollo-fat-env.yaml --record && \
-kubectl apply -f apollo-env-fat/service-apollo-config-server-fat.yaml --record && \
-kubectl apply -f apollo-env-fat/service-apollo-admin-server-fat.yaml --record
-
-# uat-env
-kubectl apply -f apollo-env-uat/service-mysql-for-apollo-uat-env.yaml --record && \
-kubectl apply -f apollo-env-uat/service-apollo-config-server-uat.yaml --record && \
-kubectl apply -f apollo-env-uat/service-apollo-admin-server-uat.yaml --record
-
-# prod-env
-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
diff --git a/scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml b/scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml
deleted file mode 100755
index 7aea48601f1..00000000000
--- a/scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml
+++ /dev/null
@@ -1,170 +0,0 @@
-#
-# Copyright 2022 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.
-#
----
-# 为外部 mysql 服务设置 service
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-portal-server
- labels:
- app: service-mysql-for-portal-server
-spec:
- ports:
- - protocol: TCP
- port: 3306
- targetPort: 3306
- type: ClusterIP
- sessionAffinity: None
----
-kind: Endpoints
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-mysql-for-portal-server
-subsets:
- - addresses:
- # 更改为你的 mysql addresses, 例如 1.1.1.1
- - ip: your-mysql-addresses
- ports:
- - protocol: TCP
- port: 3306
-
----
-# configmap for apollo-portal-server
-kind: ConfigMap
-apiVersion: v1
-metadata:
- namespace: sre
- name: configmap-apollo-portal-server
-data:
- application-github.properties: |
- spring.datasource.url = jdbc:mysql://service-mysql-for-portal-server.sre:3306/ApolloPortalDB?characterEncoding=utf8
- # mysql username
- spring.datasource.username = FillInCorrectUser
- # mysql password
- spring.datasource.password = FillInCorrectPassword
- # enabled environments
- apollo.portal.envs = dev,fat,uat,pro
- apollo-env.properties: |
- dev.meta=http://service-apollo-config-server-dev.sre:8080
- fat.meta=http://service-apollo-config-server-fat.sre:8080
- uat.meta=http://service-apollo-config-server-uat.sre:8080
- pro.meta=http://service-apollo-config-server-prod.sre:8080
-
----
-kind: Service
-apiVersion: v1
-metadata:
- namespace: sre
- name: service-apollo-portal-server
- labels:
- app: service-apollo-portal-server
-spec:
- ports:
- - protocol: TCP
- port: 8070
- targetPort: 8070
- nodePort: 30001
- selector:
- app: pod-apollo-portal-server
- type: NodePort
- # portal session 保持
- sessionAffinity: ClientIP
-
----
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- namespace: sre
- name: deployment-apollo-portal-server
- labels:
- app: deployment-apollo-portal-server
-spec:
- # 2 个实例
- replicas: 2
- selector:
- matchLabels:
- app: pod-apollo-portal-server
- strategy:
- rollingUpdate:
- maxSurge: 1
- maxUnavailable: 1
- type: RollingUpdate
- template:
- metadata:
- labels:
- app: pod-apollo-portal-server
- spec:
- affinity:
- podAntiAffinity:
- preferredDuringSchedulingIgnoredDuringExecution:
- - weight: 100
- podAffinityTerm:
- labelSelector:
- matchExpressions:
- - key: app
- operator: In
- values:
- - pod-apollo-portal-server
- topologyKey: kubernetes.io/hostname
-
- volumes:
- - name: volume-configmap-apollo-portal-server
- configMap:
- name: configmap-apollo-portal-server
- items:
- - key: application-github.properties
- path: application-github.properties
- - key: apollo-env.properties
- path: apollo-env.properties
- containers:
- - image: apolloconfig/apollo-portal:2.0.1
- securityContext:
- privileged: true
- imagePullPolicy: IfNotPresent
- name: container-apollo-portal-server
- ports:
- - protocol: TCP
- containerPort: 8070
-
- volumeMounts:
- - name: volume-configmap-apollo-portal-server
- mountPath: /apollo-portal/config/application-github.properties
- subPath: application-github.properties
- - name: volume-configmap-apollo-portal-server
- mountPath: /apollo-portal/config/apollo-env.properties
- subPath: apollo-env.properties
-
- env:
- - name: APOLLO_PORTAL_SERVICE_NAME
- value: "service-apollo-portal-server.sre"
-
- readinessProbe:
- tcpSocket:
- port: 8070
- initialDelaySeconds: 10
- periodSeconds: 5
-
- livenessProbe:
- tcpSocket:
- port: 8070
- # 120s 内, server 未启动则重启 container
- initialDelaySeconds: 120
- periodSeconds: 15
-
- dnsPolicy: ClusterFirst
- restartPolicy: Always