From c2ce8fb91707bdd7bb74b0a7d698ae98c4c6d524 Mon Sep 17 00:00:00 2001 From: roc Date: Fri, 13 Jun 2025 10:36:42 +0800 Subject: [PATCH] upgrade tke-extend-network-controller to 2.2.0 Signed-off-by: roc --- .../tke-extend-network-controller/Chart.yaml | 4 +- .../tke-extend-network-controller/README.md | 2 +- .../templates/_helpers.tpl | 4 -- .../templates/deployment.yaml | 4 -- .../templates/role.yaml | 63 +----------------- .../templates/webhook.yaml | 64 ------------------- .../tke-extend-network-controller/values.yaml | 4 +- 7 files changed, 7 insertions(+), 138 deletions(-) diff --git a/incubator/tke-extend-network-controller/Chart.yaml b/incubator/tke-extend-network-controller/Chart.yaml index b5231706..257de768 100644 --- a/incubator/tke-extend-network-controller/Chart.yaml +++ b/incubator/tke-extend-network-controller/Chart.yaml @@ -23,11 +23,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.1.1 +version: 2.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 2.1.1 +appVersion: 2.2.0 kubeVersion: '>= 1.26.0-0' diff --git a/incubator/tke-extend-network-controller/README.md b/incubator/tke-extend-network-controller/README.md index d15aeae9..3871e1ed 100644 --- a/incubator/tke-extend-network-controller/README.md +++ b/incubator/tke-extend-network-controller/README.md @@ -1,6 +1,6 @@ # tke-extend-network-controller -![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square) 针对 TKE 集群一些特殊场景的的网络控制器。 diff --git a/incubator/tke-extend-network-controller/templates/_helpers.tpl b/incubator/tke-extend-network-controller/templates/_helpers.tpl index 0ff4f4ad..f1ebaf24 100644 --- a/incubator/tke-extend-network-controller/templates/_helpers.tpl +++ b/incubator/tke-extend-network-controller/templates/_helpers.tpl @@ -15,11 +15,7 @@ If release name contains chart name it will be used as a full name. {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} {{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} {{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} {{- end }} {{- end }} diff --git a/incubator/tke-extend-network-controller/templates/deployment.yaml b/incubator/tke-extend-network-controller/templates/deployment.yaml index 6c595f12..abc80b78 100644 --- a/incubator/tke-extend-network-controller/templates/deployment.yaml +++ b/incubator/tke-extend-network-controller/templates/deployment.yaml @@ -52,10 +52,6 @@ spec: value: "{{ .Values.concurrency.clbPodBindingController }}" - name: WORKER_CLB_NODE_BINDING_CONTROLLER value: "{{ .Values.concurrency.clbNodeBindingController }}" - - name: WORKER_DEDICATED_CLB_SERVICE_CONTROLLER - value: "{{ .Values.concurrency.dedicatedClbServiceController }}" - - name: WORKER_DEDICATED_CLB_LISTENER_CONTROLLER - value: "{{ .Values.concurrency.dedicatedClbListenerController }}" - name: WORKER_CLB_PORT_POOL_CONTROLLER value: "{{ .Values.concurrency.clbPortPoolController }}" - name: WORKER_POD_CONTROLLER diff --git a/incubator/tke-extend-network-controller/templates/role.yaml b/incubator/tke-extend-network-controller/templates/role.yaml index 34e486fd..44338386 100644 --- a/incubator/tke-extend-network-controller/templates/role.yaml +++ b/incubator/tke-extend-network-controller/templates/role.yaml @@ -76,20 +76,15 @@ metadata: {{- include "tke-extend-network-controller.labels" . | nindent 4 }} rules: - apiGroups: - - "" + - agones.dev resources: - - pods + - gameservers verbs: - get - list + - patch - update - watch -- apiGroups: - - "" - resources: - - pods/status - verbs: - - get - apiGroups: - "" resources: @@ -251,55 +246,3 @@ rules: - get - patch - update -- apiGroups: - - networking.cloud.tencent.com - resources: - - dedicatedclblisteners - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.cloud.tencent.com - resources: - - dedicatedclblisteners/finalizers - verbs: - - update -- apiGroups: - - networking.cloud.tencent.com - resources: - - dedicatedclblisteners/status - verbs: - - get - - patch - - update -- apiGroups: - - networking.cloud.tencent.com - resources: - - dedicatedclbservices - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - networking.cloud.tencent.com - resources: - - dedicatedclbservices/finalizers - verbs: - - update -- apiGroups: - - networking.cloud.tencent.com - resources: - - dedicatedclbservices/status - verbs: - - get - - patch - - update diff --git a/incubator/tke-extend-network-controller/templates/webhook.yaml b/incubator/tke-extend-network-controller/templates/webhook.yaml index 790a2923..2620ed7f 100644 --- a/incubator/tke-extend-network-controller/templates/webhook.yaml +++ b/incubator/tke-extend-network-controller/templates/webhook.yaml @@ -8,26 +8,6 @@ metadata: {{- include "tke-extend-network-controller.labels" . | nindent 4 }} name: {{ include "tke-extend-network-controller.fullname" . }}-mutating-webhook-configuration webhooks: -- admissionReviewVersions: - - v1 - clientConfig: - service: - name: {{ include "tke-extend-network-controller.fullname" . }}-webhook-service - namespace: {{ .Release.Namespace | quote }} - path: /mutate-networking-cloud-tencent-com-v1alpha1-dedicatedclblistener - failurePolicy: Fail - name: mdedicatedclblistener.kb.io - rules: - - apiGroups: - - networking.cloud.tencent.com - apiVersions: - - v1alpha1 - operations: - - CREATE - - UPDATE - resources: - - dedicatedclblisteners - sideEffects: None - admissionReviewVersions: - v1 clientConfig: @@ -59,50 +39,6 @@ metadata: {{- include "tke-extend-network-controller.labels" . | nindent 4 }} name: {{ include "tke-extend-network-controller.fullname" . }}-validating-webhook-configuration webhooks: -- admissionReviewVersions: - - v1 - clientConfig: - service: - name: {{ include "tke-extend-network-controller.fullname" . }}-webhook-service - namespace: {{ .Release.Namespace | quote }} - path: /validate-networking-cloud-tencent-com-v1alpha1-dedicatedclblistener - failurePolicy: Fail - name: vdedicatedclblistener.kb.io - rules: - - apiGroups: - - networking.cloud.tencent.com - apiVersions: - - v1alpha1 - operations: - - CREATE - - UPDATE - resources: - - dedicatedclblisteners - sideEffects: None -- admissionReviewVersions: - - v1 - clientConfig: - service: - name: {{ include "tke-extend-network-controller.fullname" . }}-webhook-service - namespace: {{ .Release.Namespace | quote }} - path: /validate--v1-pod - failurePolicy: Fail - name: vpod-v1.kb.io - matchConditions: - - expression: | - 'annotations' in object.metadata && 'networking.cloud.tencent.com/enable-clb-port-mapping' in object.metadata.annotations - name: check-annotation - rules: - - apiGroups: - - "" - apiVersions: - - v1 - operations: - - CREATE - - UPDATE - resources: - - pods - sideEffects: None - admissionReviewVersions: - v1 clientConfig: diff --git a/incubator/tke-extend-network-controller/values.yaml b/incubator/tke-extend-network-controller/values.yaml index 35e882cf..25bb23a1 100644 --- a/incubator/tke-extend-network-controller/values.yaml +++ b/incubator/tke-extend-network-controller/values.yaml @@ -22,13 +22,11 @@ clusterID: "" concurrency: clbPodBindingController: 20 clbNodeBindingController: 20 - dedicatedClbListenerController: 20 podController: 20 nodeController: 20 clbPortPoolController: 10 - dedicatedClbServiceController: 1 -# -- Precisely control the frequency limit of cloud API calls to avoid frequent over-limits +# -- Precisely control the QPS of cloud API calls to avoid frequent over-limits # in large-scale scenarios, resulting in excessive retries and reduced scaling speed. apiRateLimit: DescribeLoadBalancers: 20