From f747c9dc47520fcf3bad5b5d3eaa0cc0bd02093b Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Wed, 10 Jan 2024 11:22:07 +0800
Subject: [PATCH] roles/k3s-addon: update

---
 .../k3s-addon/files/setup-ingress-apisix.sh   |  8 ++-
 .../roles/k3s-addon/files/setup-ingress.sh    | 59 +++++++++----------
 playbook/roles/k3s-addon/tasks/main.yml       |  6 +-
 3 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/playbook/roles/k3s-addon/files/setup-ingress-apisix.sh b/playbook/roles/k3s-addon/files/setup-ingress-apisix.sh
index d528db97..495286a1 100644
--- a/playbook/roles/k3s-addon/files/setup-ingress-apisix.sh
+++ b/playbook/roles/k3s-addon/files/setup-ingress-apisix.sh
@@ -2,9 +2,6 @@
 
 ingress_ip=$1
 
-helm repo add apisix https://charts.apiseven.com || echo true
-helm repo update
-kubectl create ns ingress || echo true
 cat > values.yaml << EOF
 service:
   type: NodePort
@@ -33,4 +30,9 @@ metrics:
     enabled: true
     namespace: "ingress"
 EOF
+
+helm repo add apisix https://charts.apiseven.com || echo true
+helm repo update
+kubectl create ns ingress || echo true
+helm delete nginx -n ingress || echo true
 helm upgrade --install apisix apisix/apisix --namespace ingress -f values.yaml
diff --git a/playbook/roles/k3s-addon/files/setup-ingress.sh b/playbook/roles/k3s-addon/files/setup-ingress.sh
index ed24f3e7..1dfb5fb1 100644
--- a/playbook/roles/k3s-addon/files/setup-ingress.sh
+++ b/playbook/roles/k3s-addon/files/setup-ingress.sh
@@ -99,6 +99,7 @@ EOF
 
 helm repo add nginx-stable https://helm.nginx.com/stable || echo true
 helm repo up
+helm delete apisix -n ingress || echo true
 kubectl create namespace ingress || echo true
 helm upgrade --install nginx nginx-stable/nginx-ingress --version=0.15.0 --namespace ingress -f value.yaml
 kubectl apply -f nginx-cm.yaml
@@ -106,43 +107,39 @@ kubectl patch svc nginx-nginx-ingress -n ingress --patch-file nginx-svc-patch.ya
 
 elif [[ $ingress == "apisix" ]]; then
 
-helm repo add apisix https://charts.apiseven.com || echo true
-helm repo update
-kubectl create ns ingress || echo true
 cat > values.yaml << EOF
+service:
+  type: NodePort
+  externalIPs:
+    - $ingress_ip
+  http:
+    enabled: true
+    servicePort: 80
+  tls:
+    servicePort: 443
+    nodePort: 443
+apisix:
+  ssl:
+    enabled: true
+  prometheus:
+    enabled: true
 ingress-controller:
   enabled: true
   config:
     apisix:
-      serviceNamespace: ingress
-etcd:
-  replicaCount: 1
-gateway:
-  enabled: true
-  type: NodePort
-  http:
+      serviceNamespace: "ingress"
+    kubernetes:
+      enableGatewayAPI: true
+metrics:
+  serviceMonitor:
     enabled: true
-    nodePort: 80
-  tls:
-    enabled: true
-    nodePort: 443
-  externalIPs:
-    - $ingress_ip
-discovery:
-  enabled: true
-admin:
-  enabled: true
-  ingress:
-    className: apisix
-    enabled: true
-    hosts:
-      - host: apisix-admin.onwalk.net
-        paths:
-          - "/apisix"
-    tls:
-      - secretName: apisix-tls
-        hosts:
-          - apisix-admin.onwalk.net
+    namespace: "ingress"
 EOF
+
+helm repo add apisix https://charts.apiseven.com || echo true
+helm repo update
+kubectl create ns ingress || echo true
+helm delete nginx -n ingress || echo true
 helm upgrade --install apisix apisix/apisix --namespace ingress -f values.yaml
+
 fi
diff --git a/playbook/roles/k3s-addon/tasks/main.yml b/playbook/roles/k3s-addon/tasks/main.yml
index f4d82575..f87be0d2 100755
--- a/playbook/roles/k3s-addon/tasks/main.yml
+++ b/playbook/roles/k3s-addon/tasks/main.yml
@@ -14,12 +14,8 @@
   script: files/setup-ingress.sh {{ ingress }}  {{ ingress_ip }}
   when: inventory_hostname in groups[group] and ( ingress == 'nginx' )
 
-- name: Sync K3S Ingress/Apisix
-  script: setup-ingress-apisix.sh  {{ ingress_ip }}
-  when: inventory_hostname in groups[group] and ( ingress == 'apisix' )
-
 - name: Remove K3S ingress
-  shell: 'helm delete nginx -n ingress'
+  shell: 'helm delete nginx -n ingress || true ; helm delete apisix -n ingress || true ;'
   when: ( inventory_hostname in groups[group] ) and (ingress == 'disable' )
   ignore_errors: yes