Skip to content

Commit 8809884

Browse files
committed
chore(workflow): use traefik replace nginx
1 parent b42dceb commit 8809884

2 files changed

Lines changed: 12 additions & 27 deletions

File tree

_scripts/generate_cache.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ cd $tmp
1414

1515
helm repo add cilium https://helm.cilium.io/
1616
helm repo add metallb https://metallb.github.io/metallb
17-
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
17+
helm repo add traefik https://helm.traefik.io/traefik
1818
helm repo add longhorn https://charts.longhorn.io
1919
helm repo add jetstack https://charts.jetstack.io
2020
helm repo add svc-cat https://kubernetes-sigs.github.io/service-catalog
2121
helm repo update
2222

2323
helm fetch cilium/cilium
2424
helm fetch metallb/metallb
25-
helm fetch ingress-nginx/ingress-nginx
25+
helm fetch traefik/traefik
2626
helm fetch longhorn/longhorn
2727
helm fetch jetstack/cert-manager
2828
helm fetch svc-cat/catalog

_scripts/install.sh

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -102,26 +102,10 @@ function configure_mirrors {
102102
fi
103103
}
104104

105-
function install_cin_plugins {
106-
mkdir -p /opt/cni/bin
107-
if [[ "${INSTALL_DRYCC_MIRROR}" == "cn" ]] ; then
108-
cni_plugins_url="https://github.com/cni/plugins/releases"
109-
else
110-
cni_plugins_url="https://github.com/containernetworking/plugins/releases"
111-
fi
112-
version=$(curl -Ls ${cni_plugins_url}|grep /containernetworking/plugins/releases/tag/ | sed -E 's/.*\/containernetworking\/plugins\/releases\/tag\/(v[0-9\.]+)".*/\1/g' | head -1)
113-
tar_name="cni-plugins-linux-${ARCH}-$version.tgz"
114-
download_url="${cni_plugins_url}/download/${version}/${tar_name}"
115-
curl -fsSL -o "${tar_name}" "${download_url}"
116-
tar -zxvf "${tar_name}" -C /opt/cni/bin
117-
rm -rf "${tar_name}"
118-
}
119-
120105
function install_k3s_server {
121106
configure_os
122107
configure_mirrors
123-
install_cin_plugins
124-
INSTALL_K3S_EXEC="server ${INSTALL_K3S_EXEC} --flannel-backend=none --disable=traefik --disable=local-storage --disable=servicelb --cluster-cidr=10.233.0.0/16"
108+
INSTALL_K3S_EXEC="server ${INSTALL_K3S_EXEC} --flannel-backend=none --disable=traefik --disable-kube-proxy --disable=local-storage --disable=servicelb --cluster-cidr=10.233.0.0/16"
125109
if [[ -n "${K3S_DATA_DIR}" ]] ; then
126110
INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --data-dir=${K3S_DATA_DIR}/rancher/k3s"
127111
fi
@@ -134,7 +118,6 @@ function install_k3s_server {
134118
function install_k3s_agent {
135119
configure_os
136120
configure_mirrors
137-
install_cin_plugins
138121
if [[ -n "${K3S_DATA_DIR}" ]] ; then
139122
INSTALL_K3S_EXEC="$INSTALL_K3S_EXEC --data-dir=${K3S_DATA_DIR}/rancher/k3s"
140123
fi
@@ -145,11 +128,14 @@ function install_components {
145128
helm repo update
146129

147130
echo -e "\\033[32m---> Waiting for helm to install components...\\033[0m"
148-
131+
api_server=(`kubectl config view -o=jsonpath='{.clusters[0].cluster.server}' | tr "://" " "`)
149132
helm install cilium drycc/cilium \
150133
--set operator.replicas=1 \
151134
--set bandwidthManager=true \
152-
--set cni.chainingMode=portmap \
135+
--set kubeProxyReplacement=strict \
136+
--set k8sServiceHost=${api_server[1]} \
137+
--set k8sServicePort=${api_server[2]} \
138+
--set hostPort.enabled=true \
153139
--namespace kube-system --wait
154140
helm install metallb drycc/metallb --namespace kube-system --wait -f - <<EOF
155141
configInline:
@@ -159,9 +145,8 @@ configInline:
159145
addresses:
160146
- ${METALLB_ADDRESS_POOLS:-172.16.0.0/12}
161147
EOF
162-
helm install ingress-nginx drycc/ingress-nginx --namespace kube-system --wait
148+
helm install traefik drycc/traefik --namespace traefik --create-namespace --set ssl.enabled=true --wait
163149
helm install cert-manager drycc/cert-manager --namespace cert-manager --create-namespace --set installCRDs=true --wait
164-
# Use arm64 and amd64 arch of docker.io/drycc/service-catalog:canary, it will be deleted in the future.
165150
helm install catalog drycc/catalog \
166151
--set asyncBindingOperationsEnabled=true \
167152
--set image=docker.io/drycc/service-catalog:canary \
@@ -231,7 +216,7 @@ EOF
231216
--set global.cluster_domain="cluster.local" \
232217
--set global.platform_domain="${PLATFORM_DOMAIN}" \
233218
--set global.cert_manager_enabled=${CERT_MANAGER_ENABLED:-true} \
234-
--set global.ingress_class=nginx \
219+
--set global.ingress_class=traefik \
235220
--set fluentd.daemon_environment.CONTAINER_TAIL_PARSER_TYPE="/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/" \
236221
--set controller.app_storage_class=${CONTROLLER_APP_STORAGE_CLASS:-""} \
237222
--set minio.persistence.enabled=true \
@@ -269,7 +254,7 @@ function install_helmbroker {
269254
echo -e "\\033[32m---> Start installing helmbroker...\\033[0m"
270255

271256
helm install helmbroker drycc/helmbroker \
272-
--set ingress_class="nginx" \
257+
--set ingress_class="traefik" \
273258
--set platform_domain="cluster.local" \
274259
--set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
275260
--set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:=""} \
@@ -312,7 +297,7 @@ EOF
312297

313298
function configure_haproxy {
314299
BUILDER_IP=$(kubectl get svc drycc-builder -n drycc -o="jsonpath={.status.loadBalancer.ingress[0].ip}")
315-
INGRESS_IP=$(kubectl get svc ingress-nginx-controller -n kube-system -o="jsonpath={.status.loadBalancer.ingress[0].ip}")
300+
INGRESS_IP=$(kubectl get svc traefik -n kube-system -o="jsonpath={.status.loadBalancer.ingress[0].ip}")
316301

317302
if [[ "${USE_HAPROXY:-true}" == "true" ]] ; then
318303
cat << EOF > "/etc/haproxy/haproxy.cfg"

0 commit comments

Comments
 (0)