@@ -147,7 +147,7 @@ function configure_mirrors {
147147function install_k3s_server {
148148 configure_os
149149 configure_mirrors
150- INSTALL_K3S_EXEC=" server ${INSTALL_K3S_EXEC} --flannel-backend=none --disable-network-policy --disable=traefik --disable=servicelb --disable-kube-proxy --disable=local-storage --cluster-cidr=10.233.0.0/16"
150+ INSTALL_K3S_EXEC=" server ${INSTALL_K3S_EXEC} --flannel-backend=none --disable-network-policy --disable=traefik --disable=servicelb --disable-kube-proxy --cluster-cidr=10.233.0.0/16"
151151 if [[ -n " ${K3S_DATA_DIR} " ]] ; then
152152 INSTALL_K3S_EXEC=" $INSTALL_K3S_EXEC --data-dir=${K3S_DATA_DIR} /rancher/k3s"
153153 fi
@@ -193,23 +193,45 @@ function install_network() {
193193function install_metallb() {
194194 check_metallb
195195 echo -e " \\ 033[32m--->Start installing metallb...\\ 033[0m"
196+ helm install metallb drycc/metallb \
197+ --set frr.enabled=true \
198+ --namespace metallb \
199+ --create-namespace \
200+ --wait
201+ sleep 10s
196202 if [[ -z " ${METALLB_CONFIG_FILE} " ]] ; then
197- helm install metallb drycc/metallb --namespace metallb --create-namespace --wait -f - << EOF
198- configInline:
199- address-pools:
200- - addresses:
201- - $( ip -o route get to 8.8.8.8 | sed -n ' s/.*src \([0-9.]\+\).*/\1/p' ) /32
202- name: public
203- protocol: layer2
204- - addresses:
205- - 192.168.254.0/24
206- name: default
207- protocol: layer2
208- EOF
209203 echo -e " \\ 033[32m---> Metallb using the default configuration.\\ 033[0m"
210- kubectl get cm metallb -n metallb -o yaml
204+ kubectl apply -n metallb -f - << EOF
205+ apiVersion: metallb.io/v1beta1
206+ kind: IPAddressPool
207+ metadata:
208+ name: public
209+ spec:
210+ addresses:
211+ - $( ip -o route get to 8.8.8.8 | sed -n ' s/.*src \([0-9.]\+\).*/\1/p' ) /32
212+
213+ ---
214+ apiVersion: metallb.io/v1beta1
215+ kind: IPAddressPool
216+ metadata:
217+ name: default
218+ spec:
219+ addresses:
220+ - 192.168.254.0/24
221+
222+ ---
223+ apiVersion: metallb.io/v1beta1
224+ kind: L2Advertisement
225+ metadata:
226+ name: drycc-l2-advertisement
227+ namespace: metallb
228+ spec:
229+ ipAddressPools:
230+ - public
231+ - default
232+ EOF
211233 else
212- helm install metallb drycc/metallb --namespace metallb --create-namespace --wait - f ${METALLB_CONFIG_FILE}
234+ kubectl apply -n metallb -f ${METALLB_CONFIG_FILE} -n
213235 fi
214236 echo -e " \\ 033[32m---> Metallb installed!\\ 033[0m"
215237}
@@ -266,24 +288,6 @@ function install_components {
266288 install_catalog
267289}
268290
269- function install_openebs {
270- if [[ -z " ${OPENEBS_CONFIG_FILE} " ]] ; then
271- helm install openebs drycc/openebs \
272- --namespace openebs \
273- --create-namespace \
274- --set localprovisioner.basePath=${LOCAL_PROVISIONER_PATH:- " /var/openebs/local" } \
275- --set nfs-provisioner.enabled=true \
276- --set provisioner.hostpathClass.isDefaultClass=true \
277- --wait
278- else
279- helm install openebs drycc/openebs \
280- --namespace openebs \
281- --create-namespace \
282- --wait \
283- -f " ${OPENEBS_CONFIG_FILE} "
284- fi
285- }
286-
287291function check_drycc {
288292 if [[ -z " ${PLATFORM_DOMAIN} " ]] ; then
289293 echo -e " \\ 033[33m---> Please set the PLATFORM_DOMAIN variable.\\ 033[0m"
@@ -327,7 +331,7 @@ builder:
327331 metallb.universe.tf/address-pool: public
328332 metallb.universe.tf/allow-shared-ip: drycc
329333
330- database
334+ database:
331335 imageRegistry: ${DRYCC_REGISTRY}
332336 limitsMemory: "256Mi"
333337 limitsHugepages2Mi: "256Mi"
@@ -343,7 +347,7 @@ fluentd:
343347
344348controller:
345349 imageRegistry: ${DRYCC_REGISTRY}
346- appStorageClass: ${CONTROLLER_APP_STORAGE_CLASS:- " openebs-kernel-nfs " }
350+ appStorageClass: ${CONTROLLER_APP_STORAGE_CLASS:- " drycc-storage " }
347351
348352redis:
349353 imageRegistry: ${DRYCC_REGISTRY}
@@ -459,7 +463,7 @@ function install_helmbroker {
459463 --set ingressClass=" traefik" \
460464 --set platformDomain=" cluster.local" \
461465 --set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:- 5Gi} \
462- --set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:- " openebs-kernel-nfs " } \
466+ --set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:- " drycc-storage " } \
463467 --set platformDomain=${PLATFORM_DOMAIN} \
464468 --set certManagerEqnabled=${CERT_MANAGER_ENABLED:- true} \
465469 --set username=${HELMBROKER_USERNAME} \
@@ -505,7 +509,6 @@ if [[ -z "$@" ]] ; then
505509 install_k3s_server
506510 install_helm
507511 install_components
508- install_openebs
509512 install_drycc
510513 install_helmbroker
511514 echo -e " \\ 033[32m---> Installation complete, enjoy life...\\ 033[0m"
0 commit comments