From d32946be148bb792a7a522052cc661d45fdf334b Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Sat, 3 Jun 2023 18:26:17 +0800
Subject: [PATCH] k3s-addon/templates/ingress-apisix-values.yaml: enable sa
 rbac

---
 .../templates/ingress-apisix-values.yaml      |  8 +++-
 .../templates/kubernetes-discovery.yaml       | 47 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 playbook/roles/k3s-addon/templates/kubernetes-discovery.yaml

diff --git a/playbook/roles/k3s-addon/templates/ingress-apisix-values.yaml b/playbook/roles/k3s-addon/templates/ingress-apisix-values.yaml
index dee07367..2c16868d 100644
--- a/playbook/roles/k3s-addon/templates/ingress-apisix-values.yaml
+++ b/playbook/roles/k3s-addon/templates/ingress-apisix-values.yaml
@@ -5,8 +5,10 @@ ingress-controller:
       serviceNamespace: ingress
 etcd:
   replicaCount: 1
-discovery:
-  enabled: true
+serviceAccount:
+  create: true
+rbac:
+  create: true
 admin:
   enabled: true
 gateway:
@@ -22,3 +24,5 @@ gateway:
     - {{ ingress_ip }}
 dashboard:
   enabled: false
+discovery:
+  enabled: true
diff --git a/playbook/roles/k3s-addon/templates/kubernetes-discovery.yaml b/playbook/roles/k3s-addon/templates/kubernetes-discovery.yaml
new file mode 100644
index 00000000..a6281a14
--- /dev/null
+++ b/playbook/roles/k3s-addon/templates/kubernetes-discovery.yaml
@@ -0,0 +1,47 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+ name: apisix-test
+ namespace: default
+---
+
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: apisix-test
+rules:
+- apiGroups: [ "" ]
+  resources: [ endpoints ]
+  verbs: [ get,list,watch ]
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+ name: apisix-test
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: ClusterRole
+ name: apisix-test
+subjects:
+ - kind: ServiceAccount
+   name: apisix-test
+   namespace: default
+---
+discovery:
+  kubernetes:
+  - id: release  # a custom name refer to the cluster, pattern ^[a-z0-9]{1,8}
+    service:
+      schema: https #default https
+      host: "1.cluster.com"
+      port: "6443"
+    client:
+      #token: |-
+       # eyJhbGciOiJSUzI1NiIsImtpZCI6Ikx5ME1DNWdnbmhQNkZCNlZYMXBsT3pYU3BBS2swYzBPSkN3ZnBESGpkUEEif
+       # 6Ikx5ME1DNWdnbmhQNkZCNlZYMXBsT3pYU3BBS2swYzBPSkN3ZnBESGpkUEEifeyJhbGciOiJSUzI1NiIsImtpZCI
+    default_weight: 50 # weight assigned to each discovered endpoint. default 50, minimum 0
+    namespace_selector:
+      equal: default
+    label_selector: |-
+      first="a",second="b"
+    shared_size: 1m #default 1m