From 782e4619f53ce4cf67f2897bbfe120af86992441 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 27 Dec 2023 18:02:34 +0800 Subject: [PATCH] roles/k3s-addon: update flagger config --- .../roles/k3s-addon/files/setup-flagger.sh | 2 +- playbook/roles/k3s-addon/tasks/main.yml | 25 +++++-------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/playbook/roles/k3s-addon/files/setup-flagger.sh b/playbook/roles/k3s-addon/files/setup-flagger.sh index c2b48ae2..e48989cf 100644 --- a/playbook/roles/k3s-addon/files/setup-flagger.sh +++ b/playbook/roles/k3s-addon/files/setup-flagger.sh @@ -19,4 +19,4 @@ helm upgrade -i flagger flagger/flagger \ --namespace ingress \ --set prometheus.install=false \ --set meshProvider=nginx \ ---set metricsServer="https://prometheus.svc.plus" +--set metricsServer="https://prometheus.svc.ink" diff --git a/playbook/roles/k3s-addon/tasks/main.yml b/playbook/roles/k3s-addon/tasks/main.yml index 36d4bfa7..afdc205f 100755 --- a/playbook/roles/k3s-addon/tasks/main.yml +++ b/playbook/roles/k3s-addon/tasks/main.yml @@ -2,22 +2,15 @@ script: files/setup-fluxcd.sh {{ config_repo }} {{ cluster_name }} when: inventory_hostname in groups[group] and ( gitops == 'enable' ) -- name: Set Flagger Contoller - script: files/setup-flagger.sh {{ config_repo }} {{ cluster_name }} - when: inventory_hostname in groups[group] and ( canary == 'enable' ) - -- name: Sync kubernetes-discovery config - template: src=templates/kubernetes-discovery-serviceaccount.yaml dest=/tmp/ owner=root group=root mode=0644 - when: inventory_hostname in groups[group] and ( svc_discovery == 'enable' ) - -- name: Setup kubernetes-discovery for cluster - shell: 'kubectl apply -f /tmp/kubernetes-discovery-serviceaccount.yaml' - when: inventory_hostname in groups[group] and ( svc_discovery == 'enable' ) - - name: Set K3S Ingress script: files/setup-ingress.sh {{ ingress }} {{ ingress_ip }} when: inventory_hostname in groups[group] and ( ingress == 'nginx' ) +- name: Remove K3S ingress + shell: 'helm delete nginx -n ingress' + when: ( inventory_hostname in groups[group] ) and (ingress == 'disable' ) + ignore_errors: yes + - name: Sync K3S Ingress Deploy yaml template: src=templates/ingress-apisix-values.yaml dest=/tmp/ owner=root group=root mode=0644 when: inventory_hostname in groups[group] and ( ingress == 'apisix' ) @@ -28,16 +21,10 @@ helm upgrade --install apisix apisix/apisix --namespace ingress -f /tmp/ingress-apisix-values.yaml' when: inventory_hostname in groups[group] and ( ingress == 'apisix' ) -- name: Sync Apisix Ingress Dashboard yaml - template: src=templates/ingress-apisix-dashboard.yaml dest=/tmp/ owner=root group=root mode=0644 - when: inventory_hostname in groups[group] and ( ingress == 'apisix' ) -- name: Setup Apisix Ingress Dashboard - shell: 'kubectl apply -f /tmp/ingress-apisix-dashboard.yaml' - when: inventory_hostname in groups[group] and ( ingress == 'apisix' ) - - name: Setup DNS Provider script: files/setup-dns-provider.sh {{ dns_ak }} {{ dns_sk }} when: ( inventory_hostname in groups[group] ) and (external_dns == 'enable' ) + - name: Remove DNS Provider shell: 'helm delete external-dns -n external-dns' when: ( inventory_hostname in groups[group] ) and (external_dns == 'disable' )