Skip to content

Commit 5c5eddf

Browse files
committed
chore(workflow): rremove openebs
1 parent b23c8b0 commit 5c5eddf

5 files changed

Lines changed: 41 additions & 45 deletions

File tree

_scripts/generate_cache.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ cd $tmp
1515
helm repo add cilium https://helm.cilium.io/
1616
helm repo add metallb https://metallb.github.io/metallb
1717
helm repo add traefik https://helm.traefik.io/traefik
18-
helm repo add openebs https://openebs.github.io/charts
1918
helm repo add jetstack https://charts.jetstack.io
2019
helm repo update
2120

2221
helm fetch cilium/cilium
2322
helm fetch metallb/metallb
2423
helm fetch traefik/traefik
25-
helm fetch openebs/openebs
2624
helm fetch jetstack/cert-manager
2725

2826
for tar in `ls $tmp | grep .tgz`

_scripts/install.sh

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function configure_mirrors {
147147
function 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() {
193193
function 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-
287291
function 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
344348
controller:
345349
imageRegistry: ${DRYCC_REGISTRY}
346-
appStorageClass: ${CONTROLLER_APP_STORAGE_CLASS:-"openebs-kernel-nfs"}
350+
appStorageClass: ${CONTROLLER_APP_STORAGE_CLASS:-"drycc-storage"}
347351
348352
redis:
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"

src/installing-workflow/ingress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $ helm install drycc/workflow --namespace drycc \
2020
--set builder.service.nodePort=32222
2121
```
2222

23-
If you want to use Load Balancer on a bare machine, you can look at [metallb](https://github.com/danderson/metallb)
23+
If you want to use Load Balancer on a bare machine, you can look at [metallb](https://github.com/metallb/metallb)
2424

2525
Where `global.platformDomain` is a **required** parameter that is traditionally not required for Workflow that is explained in the next section. In this example we are using `drycc.cc` for `$hostname`.
2626

src/installing-workflow/system-requirements.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ Drycc Workflow ships with drycc storage by default, which provides in-cluster.
2727
Workflow supports Amazon Simple Storage Service (S3), Google Cloud Storage (GCS), OpenShift Swift, and Azure Blob
2828
Storage. See [configuring object storage](configuring-object-storage) for setup instructions.
2929

30-
In addition, workflow needs to use RWX block storage services, such as cloud native [longhorn](https://longhorn.io/),
31-
[openebs](https://openebs.io/), or external [glusterfs](https://www.gluster.org/) or [ceph](https://ceph.io/).
32-
3330
## Resource Requirements
3431

3532
When deploying Drycc Workflow, it's important to provision machines with adequate resources. Drycc is a highly-available

src/quickstart/install-workflow.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ DATABASE_PERSISTENCE_STORAGE_CLASS | StorangeClass of `database`; defaul
215215
HELMBROKER_PERSISTENCE_SIZE | The size of the persistence space allocated to `helmbroker`, which is `5Gi` by default
216216
HELMBROKER_PERSISTENCE_STORAGE_CLASS | StorangeClass of `helmbroker`; default storangeclass is used by default
217217
K3S_DATA_DIR | The config of k3s data dir; If not set, the default path is used
218-
DEFAULT_STORAGE_CLASS | K3s default stroageclass, If not set, the `openebs-hostpath` stroageclass is used
219-
LOCAL_PROVISIONER_PATH | Local path storage path, If not set, the `/var/openebs/local` path is used
220218
ACME_SERVER | ACME Server url, default use letsencrypt
221219
ACME_EAB_KEY_ID | The key ID of which your external account binding is indexed by the external account
222220
ACME_EAB_KEY_SECRET | The key Secret of which your external account symmetric MAC key

0 commit comments

Comments
 (0)