chore(workflow): remove cilium

Author: duanhongyi

_scripts/install.sh

@@ -12,20 +12,28 @@ if [[ -z "${PLATFORM_DOMAIN}" ]] ; then
   exit 1
 fi	
 
+if [[ -z "${DRYCC_ADMIN_USERNAME}" || -z "${DRYCC_ADMIN_PASSWORD}" ]] ; then
+  echo -e "\\033[31m---> Please set the DRYCC_ADMIN_USERNAME and DRYCC_ADMIN_PASSWORD variable.\\033[0m"
+  echo -e "\\033[31m---> For example:\\033[0m"
+  echo -e "\\033[31m---> export DRYCC_ADMIN_USERNAME=admin\\033[0m"
+  echo -e "\\033[31m---> export DRYCC_ADMIN_PASSWORD=admin\\033[0m"
+  echo -e "\\033[31m---> This password is used by end users to log in and manage drycc.\\033[0m"
+  echo -e "\\033[31m---> Please set a high security string!!!\\033[0m"
+  exit 1
+fi
+
 function clean_before_exit {
     # delay before exiting, so stdout/stderr flushes through the logging system
-    rm -rf helm-broker
     sleep 3
 }
 trap clean_before_exit EXIT
 
-if [[ "${INSTALL_K3S_MIRROR}"=="cn" ]] ; then
+if [[ "${INSTALL_K3S_MIRROR}" == "cn" ]] ; then
   mkdir -p /etc/rancher/k3s
   cat << EOF > "/etc/rancher/k3s/registries.yaml"
 mirrors:
   "docker.io":
     endpoint:
-      - "docker.mirrors.ustc.edu.cn"
       - "http://hub-mirror.c.163.com"
       - "https://registry-1.docker.io"
 EOF
@@ -34,34 +42,26 @@ else
   k3s_install_url="https://get.k3s.io"
 fi
 if [[ -z "${K3S_URL}" ]] ; then
-  INSTALL_K3S_EXEC="server --no-flannel --cluster-cidr=10.233.0.0/16"
+  INSTALL_K3S_EXEC="server --cluster-cidr=10.233.0.0/16"
 else
-  INSTALL_K3S_EXEC="agent --no-flannel"
+  INSTALL_K3S_EXEC="agent"
 fi
 
-export INSTALL_K3S_EXEC='--no-flannel'
-
 alias install-k3s="curl -sfL "${k3s_install_url}" | sh - $@"
 
 install-k3s
 
 curl -sfL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -
 
-helm repo add cilium https://helm.cilium.io/
 helm repo add longhorn https://charts.longhorn.io
 helm repo add jetstack https://charts.jetstack.io
 helm repo add svc-cat https://kubernetes-sigs.github.io/service-catalog
 helm repo add drycc https://charts.drycc.cc/${CHANNEL:-stable}
 helm repo update
-git clone --dept 1 https://github.com/kyma-project/helm-broker
-
 
-helm install cilium --set operator.replicas=1 cilium/cilium --namespace kube-system
 helm install longhorn --create-namespace --set persistence.defaultClass=false --set persistence.defaultClassReplicaCount=1 longhorn/longhorn --namespace longhorn-system
 helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --set installCRDs=true
-helm install catalog svc-cat/catalog --set asyncBindingOperationsEnabled=true --namespace catalog --create-namespace
-helm install helm-broker --set global.helm_broker.dir=/ --set global.helm_controller.dir=/ helm-broker/charts/helm-broker/  --namespace helm-broker --create-namespace
-
+helm install catalog svc-cat/catalog --set asyncBindingOperationsEnabled=true --namespace catalog --create-namespace --wait
 
 echo -e "\\033[32m---> Waiting cert-manager...\\033[0m"
 while [ $(kubectl get pods -n cert-manager|grep Running|wc -l) -le 2 ]
@@ -70,23 +70,71 @@ do
     sleep 10
 done
 
+echo -e "\\033[32m---> Start installing workflow...\\033[0m"
+
+RABBITMQ_USERNAME=$(cat /proc/sys/kernel/random/uuid)
+RABBITMQ_PASSWORD=$(cat /proc/sys/kernel/random/uuid)
+
 helm install drycc drycc/workflow \
   --set builder.service.type=LoadBalancer \
+  --set global.cluster_domain="cluster.local" \
   --set global.platform_domain="${PLATFORM_DOMAIN}" \
   --set global.ingress_class=traefik \
   --set fluentd.daemon_environment.CONTAINER_TAIL_PARSER_TYPE="/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/" \
   --set controller.app_storage_class=longhorn \
   --set minio.persistence.enabled=true \
   --set minio.persistence.size=${MINIO_PERSISTENCE_SIZE:-5Gi} \
   --set minio.persistence.storageClass="longhorn" \
+  --set rabbitmq.username="${RABBITMQ_USERNAME}" \
+  --set rabbitmq.password="${RABBITMQ_PASSWORD}" \
   --set rabbitmq.persistence.enabled=true \
   --set rabbitmq.persistence.size=${RABBITMQ_PERSISTENCE_SIZE:-5Gi} \
   --set rabbitmq.persistence.storageClass="longhorn" \
   --set influxdb.persistence.enabled=true \
   --set influxdb.persistence.size=${INFLUXDB_PERSISTENCE_SIZE:-5Gi} \
   --set influxdb.persistence.storageClass="longhorn" \
-  --set monitor.grafana.persistence.enabled=true \
-  --set monitor.grafana.persistence.size=${MONITOR_PERSISTENCE_SIZE:-5Gi} \
+  --set monitor.grafana.persistence.enabled=true \ --set monitor.grafana.persistence.size=${MONITOR_PERSISTENCE_SIZE:-5Gi} \
   --set monitor.grafana.persistence.storageClass="longhorn" \
+  --set passport.admin_username=${DRYCC_ADMIN_USERNAME} \
+  --set passport.admin_password=${DRYCC_ADMIN_PASSWORD} \
   --namespace drycc \
-  --create-namespace
+  --create-namespace --wait --timeout 30m0s
+
+HELMBROKER_USERNAME=$(cat /proc/sys/kernel/random/uuid)
+HELMBROKER_PASSWORD=$(cat /proc/sys/kernel/random/uuid)
+
+echo -e "\\033[32m---> Start installing helmbroker...\\033[0m"
+
+helm install helmbroker drycc/helmbroker \
+  --set platform_domain="cluster.local" \
+  --set persistence.storageClass="longhorn" \
+  --set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
+  --set platform_domain=${PLATFORM_DOMAIN} \
+  --set username=${HELMBROKER_USERNAME} \
+  --set password=${HELMBROKER_PASSWORD} \
+  --set environment.HELMBROKER_CELERY_BROKER="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@drycc-rabbitmq-0.drycc-rabbitmq.drycc.svc.cluster.local:5672/drycc" \
+  --namespace drycc --create-namespace --wait
+
+kubectl apply -f - <<EOF
+apiVersion: servicecatalog.k8s.io/v1beta1
+kind: ClusterServiceBroker
+metadata:
+  finalizers:
+  - kubernetes-incubator/service-catalog
+  generation: 1
+  labels:
+    app.kubernetes.io/managed-by: Helm
+    heritage: Helm
+  name: helmbroker
+spec:
+  relistBehavior: Duration
+  relistRequests: 5
+  url: http://${HELMBROKER_USERNAME}:${HELMBROKER_PASSWORD}@drycc-helmbroker.${PLATFORM_DOMAIN}
+EOF
+
+echo -e "\\033[32m---> Please save the following information for future use.\\033[0m"
+echo -e "\\033[32m---> Rabbitmq username: $RABBITMQ_USERNAME\\033[0m"
+echo -e "\\033[32m---> Rabbitmq password: $RABBITMQ_PASSWORD\\033[0m"
+echo -e "\\033[32m---> Helmbroker username: $HELMBROKER_USERNAME\\033[0m"
+echo -e "\\033[32m---> Helmbroker password: $HELMBROKER_PASSWORD\\033[0m"
+echo -e "\\033[32m---> Installation complete, enjoy life...\\033[0m"

_scripts/uninstall.sh

@@ -5,4 +5,5 @@ shopt -s expand_aliases
 /usr/local/bin/k3s-killall.sh
 /usr/local/bin/k3s-uninstall.sh
 
+rm -rf /etc/rancher
 rm -rf /usr/local/bin/helm ~/.config/helm

src/quickstart/install-workflow.md

@@ -55,18 +55,18 @@ For RHEL, CentOS, and EKS with EKS Kubernetes Worker AMI with AmazonLinux2 image
 $ yum install nfs-utils
 ```
 
-### Installing curl and git
+### Installing curl
 
 For Debian and Ubuntu, use this command:
 
 ```
-$ apt-get install curl git
+$ apt-get install curl
 ```
 
 For RHEL, CentOS, and EKS with EKS Kubernetes Worker AMI with AmazonLinux2 image, use this command:
 
 ```
-$ yum install curl git
+$ yum install curl
 ```
 
 ## Hardware
@@ -121,12 +121,15 @@ When using this method to install drycc, the following environment variables can
 ENVIRONMENT VARIABLE            | DESCRIPTION
 --------------------------------|------------------------------------------------------------------------------------------------
 PLATFORM_DOMAIN                 | Required item, specify drycc's domain name
+DRYCC_ADMIN_USERNAME            | Required item, specify drycc's admin username
+DRYCC_ADMIN_PASSWORD            | Required item, specify drycc's admin password
 CHANNEL                         | By default, `stable` channel will be installed. You can also specify `testing`
 INSTALL_K3S_MIRROR              | Specify the accelerated mirror location. Currently, only `cn` is supported
 MINIO_PERSISTENCE_SIZE          | The size of the persistence space allocated to `minio`, which is `5Gi` by default
 MONITOR_PERSISTENCE_SIZE        | The size of the persistence space allocated to `monitor`, which is `5Gi` by default
 INFLUXDB_PERSISTENCE_SIZE       | The size of the persistence space allocated to `influxdb`, which is `5Gi` by default
 RABBITMQ_PERSISTENCE_SIZE       | The size of the persistence space allocated to `rabbitmq`, which is `5Gi` by default
+HELMBROKER_PERSISTENCE_SIZE     | The size of the persistence space allocated to `helmbroker`, which is `5Gi` by default
 
 Since the installation script will install k3s, other environment variables can refer to k3s installation [environment variables](https://rancher.com/docs/k3s/latest/en/installation/install-options/).