From 336bd24adffe1a8aded402f0166125b185baf933 Mon Sep 17 00:00:00 2001 From: caoyingjunz Date: Fri, 1 Nov 2024 23:04:30 +0800 Subject: [PATCH] Add pixiu-autoscaler supported (#504) --- ansible/group_vars/all.yml | 8 ++-- ...oscaler.yml.j2 => pixiu-autoscaler.yml.j2} | 42 ++++++++----------- etc/kubez/globals.yml | 4 +- 3 files changed, 24 insertions(+), 30 deletions(-) rename ansible/roles/kubernetes/templates/{kubez-autoscaler.yml.j2 => pixiu-autoscaler.yml.j2} (54%) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 7324b883..81310765 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -131,8 +131,8 @@ kube_applications: enabled: "{{ enable_rbd_provisioner | bool }}" - name: ingress-nginx enabled: "{{ enable_ingress_nginx | bool }}" - - name: kubez-autoscaler - enabled: "{{ enable_hpav2 | bool }}" + - name: pixiu-autoscaler + enabled: "{{ enable_pixiu_autoscaler | bool }}" # TODO: 临时解决方案,最终可通过调用 preStart 的 webhook 解决 - name: olm-crds enabled: "{{ enable_olm | bool }}" @@ -432,9 +432,9 @@ fluentd_namespace: "{{ kubez_namespace }}" fluentd_chart_version: 0.3.9 ########################### -# Kubez-autoscaler Options +# pixiu-autoscaler Options ########################### -enable_hpav2: "no" +enable_pixiu_autoscaler: "no" ###################### # Artifactory Options diff --git a/ansible/roles/kubernetes/templates/kubez-autoscaler.yml.j2 b/ansible/roles/kubernetes/templates/pixiu-autoscaler.yml.j2 similarity index 54% rename from ansible/roles/kubernetes/templates/kubez-autoscaler.yml.j2 rename to ansible/roles/kubernetes/templates/pixiu-autoscaler.yml.j2 index ba5b2b1a..145c4282 100644 --- a/ansible/roles/kubernetes/templates/kubez-autoscaler.yml.j2 +++ b/ansible/roles/kubernetes/templates/pixiu-autoscaler.yml.j2 @@ -1,68 +1,62 @@ +--- apiVersion: v1 kind: ServiceAccount metadata: - name: kubez - namespace: default - + name: pixiu-autoscaler + namespace: pixiu-system --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: kubez + name: pixiu-autoscaler rules: - apiGroups: - "*" resources: - horizontalpodautoscalers - deployments - - statefulsets verbs: - get - watch - create - delete - update - --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: kubez + name: pixiu-autoscaler roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: kubez + name: pixiu-autoscaler subjects: - kind: ServiceAccount - name: kubez - namespace: default - + name: pixiu-autoscaler + namespace: pixiu-system --- - apiVersion: apps/v1 kind: Deployment metadata: labels: - kubez.hpa.controller: kubez-autoscaler - name: kubez-autoscaler-controller - namespace: default + pixiu.hpa.controller: pixiu-autoscaler + name: pixiu-autoscaler-controller + namespace: pixiu-system spec: - replicas: 2 + replicas: 1 selector: matchLabels: - kubez.hpa.controller: kubez-autoscaler + pixiu.hpa.controller: pixiu-autoscaler template: metadata: labels: - kubez.hpa.controller: kubez-autoscaler + pixiu.hpa.controller: pixiu-autoscaler spec: containers: - - image: jacky06/kubez-autoscaler-controller:v0.0.1 + - image: harbor.cloud.pixiuio.com/pixiuio/pixiu-autoscaler-controller:latest command: - - kubez-autoscaler-controller + - pixiu-autoscaler-controller - --leader-elect=true imagePullPolicy: IfNotPresent - name: kubez-autoscaler-controller - serviceAccountName: kubez + name: pixiu-autoscaler-controller + serviceAccountName: pixiu-autoscaler diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml index b3c8a73f..8d4539bc 100644 --- a/etc/kubez/globals.yml +++ b/etc/kubez/globals.yml @@ -430,9 +430,9 @@ s3: #rabbitmq_namespace: operators ########################### -# Kubez-autoscaler Options +# pixiu-autoscaler Options ########################### -#enable_hpav2: "no" +#enable_pixiu_autoscaler: "no" ################ # Istio Options