Merge branch 'main' of github.com:drycc/workflow into main

Author: duanhongyi

_scripts/install.sh

@@ -204,6 +204,8 @@ function install_metallb() {
 
   echo -e "\\033[32m--->Waiting metallb pods ready...\\033[0m"
   kubectl wait pods -n metallb --all  --for condition=Ready --timeout=600s
+  echo -e "\\033[32m--->Waiting metallb webhook ready...\\033[0m"
+  sleep 30s
 
   if [[ -z "${METALLB_CONFIG_FILE}" ]] ; then
     echo -e "\\033[32m---> Metallb using the default configuration.\\033[0m"
@@ -333,14 +335,16 @@ global:
   ingressClass: traefik
 
 builder:
-  imageRegistry: ${DRYCC_REGISTRY} 
+  replicas: ${BUILDER_REPLICAS}
+  imageRegistry: ${DRYCC_REGISTRY}
   service:
     type: LoadBalancer
     annotations:
       metallb.universe.tf/address-pool: public
       metallb.universe.tf/allow-shared-ip: drycc
 
 database:
+  replicas: ${DATABASE_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
   limitsMemory: "256Mi"
   limitsHugepages2Mi: "256Mi"
@@ -355,10 +359,12 @@ fluentd:
     CONTAINER_TAIL_PARSER_TYPE: "/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/"
 
 controller:
+  replicas: ${CONTROLLER_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY} 
   appStorageClass: ${CONTROLLER_APP_STORAGE_CLASS:-"drycc-storage"}
 
 redis:
+  replicas: ${REDIS_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
   persistence:
     enabled: true
@@ -377,17 +383,20 @@ storage:
       storageClass: ${STORAGE_MINIO_PERSISTENCE_STORAGE_CLASS:-""}
   meta:
     pd:
+      replicas: ${STORAGE_META_PD_REPLICAS}
       persistence:
         enabled: true
         size: ${STORAGE_META_PD_PERSISTENCE_SIZE:-10Gi}
         storageClass: ${STORAGE_META_PD_PERSISTENCE_STORAGE_CLASS:-""}
     tikv:
+      replicas: ${STORAGE_META_TIKV_REPLICAS}
       persistence:
         enabled: true
         size: ${STORAGE_META_TIKV_PERSISTENCE_SIZE:-10Gi}
         storageClass: ${STORAGE_META_TIKV_PERSISTENCE_STORAGE_CLASS:-""}
 
 rabbitmq:
+  replicas: ${RABBITMQ_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
   username: "${RABBITMQ_USERNAME}"
   password: "${RABBITMQ_PASSWORD}"
@@ -400,6 +409,7 @@ imagebuilder:
   imageRegistry: ${DRYCC_REGISTRY}
 
 influxdb:
+  replicas: ${INFLUXDB_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
   user: "${INFLUXDB_USERNAME}"
   password: "${INFLUXDB_PASSWORD}"
@@ -409,6 +419,7 @@ influxdb:
     storageClass: ${INFLUXDB_PERSISTENCE_STORAGE_CLASS:-""}
 
 logger:
+  replicas: ${LOGGER_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
 
 monitor:
@@ -423,11 +434,13 @@ monitor:
 
 
 passport:
+  replicas: ${PASSPORT_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
   adminUsername: ${DRYCC_ADMIN_USERNAME}
   adminPassword: ${DRYCC_ADMIN_PASSWORD}
 
 registry:
+  replicas: ${REGISTRY_REPLICAS}
   imageRegistry: ${DRYCC_REGISTRY}
 
 registry-proxy:

src/quickstart/install-workflow.md

@@ -196,26 +196,37 @@ KUBE_API_SERVER_ADDRESS                    | Set with the IP address of the load
 KUBE_API_SERVER_PORT                       | Set with the PORT of the loadbalancer that was in front of kube-apiserver, which is `6443` by default
 METALLB_CONFIG_FILE                        | The metallb config file path, layer 2 network is used by default
 INSTALL_DRYCC_MIRROR                       | Specify the accelerated mirror location. Currently, only `cn` is supported
+BUILDER_REPLICAS                           | Number of builder replicas to deploy
+CONTROLLER_REPLICAS                        | Number of controller replicas to deploy
 CONTROLLER_APP_STORAGE_CLASS               | StorageClass allocated by `drycc volumes`; default storageClass is used by default
+REDIS_REPLICAS                             | Number of redis replicas to deploy
 REDIS_PERSISTENCE_SIZE                     | The size of the persistence space allocated to `redis`, which is `5Gi` by default
 REDIS_PERSISTENCE_STORAGE_CLASS            | StorangeClass of `redis`; default storangeclass is used by default
 STORAGE_MINIO_ZONE                         | Storage number of zones, capacity expansion through the number of zones
 STORAGE_MINIO_DRIVES                       | Storage number of drives per node, after the cluster is initialized, it cannot be changed
 STORAGE_MINIO_REPLICAS                     | Storage number of nodes, after the cluster is initialized, it cannot be changed
 STORAGE_MINIO_PERSISTENCE_SIZE             | The size of the persistence space allocated to `storage`, which is `20Gi` by default
 STORAGE_MINIO_PERSISTENCE_STORAGE_CLASS    | StorangeClass of `storage`; default storangeclass is used by default
+STORAGE_META_PD_REPLICAS                   | Number of storage meta pd replicas to deploy
 STORAGE_META_PD_PERSISTENCE_SIZE           | The size of the persistence space allocated to `storage meta pd`, which is `10Gi` by default
 STORAGE_META_PD_PERSISTENCE_STORAGE_CLASS  | StorangeClass of `storage meta pd`; default storangeclass is used by default
+STORAGE_META_TIKV_REPLICAS                 | Number of storage meta tikv replicas to deploy
 STORAGE_META_TIKV_PERSISTENCE_SIZE         | The size of the persistence space allocated to `storage meta tikv`, which is `10Gi` by default
 STORAGE_META_TIKV_PERSISTENCE_STORAGE_CLASS| StorangeClass of `storage meta tikv`; default storangeclass is used by default
 MONITOR_GRAFANA_PERSISTENCE_SIZE           | The size of the persistence space allocated to `monitor.grafana`, which is `5Gi` by default
 MONITOR_GRAFANA_PERSISTENCE_STORAGE_CLASS  | StorangeClass of `monitor` grafana; default storangeclass is used by default
+INFLUXDB_REPLICAS                          | Number of influxdb replicas to deploy
 INFLUXDB_PERSISTENCE_SIZE                  | The size of the persistence space allocated to `influxdb`, which is `5Gi` by default
 INFLUXDB_PERSISTENCE_STORAGE_CLASS         | StorangeClass of `influxdb`; default storangeclass is used by default
+LOGGER_REPLICAS                            | Number of logger replicas to deploy
+RABBITMQ_REPLICAS                          | Number of rabbitmq replicas to deploy
 RABBITMQ_PERSISTENCE_SIZE                  | The size of the persistence space allocated to `rabbitmq`, which is `5Gi` by default
 RABBITMQ_PERSISTENCE_STORAGE_CLASS         | StorangeClass of `rabbitmq`; default storangeclass is used by default
+DATABASE_REPLICAS                          | Number of database replicas to deploy
 DATABASE_PERSISTENCE_SIZE                  | The size of the persistence space allocated to `database`, which is `5Gi` by default
 DATABASE_PERSISTENCE_STORAGE_CLASS         | StorangeClass of `database`; default storangeclass is used by default
+PASSPORT_REPLICAS                          | Number of passport replicas to deploy
+REGISTRY_REPLICAS                          | Number of registry replicas to deploy
 HELMBROKER_PERSISTENCE_SIZE                | The size of the persistence space allocated to `helmbroker`, which is `5Gi` by default
 HELMBROKER_PERSISTENCE_STORAGE_CLASS       | StorangeClass of `helmbroker`; default storangeclass is used by default
 K3S_DATA_DIR                               | The config of k3s data dir; If not set, the default path is used