Merge pull request #3 from zqzten/v0.3

dayko2019 · web-flow · commit ad4bea995351 · 2024-04-18T15:48:18.000+08:00
kapacity-manager v0.3.0
#release
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
           python-version: 3.9
           check-latest: true
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
@@ -35,7 +35,7 @@ jobs:
         run: ct lint --config ct.yaml
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.7.0
+        uses: helm/kind-action@v1
       - name: Install dependencies
         if: steps.list-changed.outputs.changed == 'true'
         run: |
@@ -44,4 +44,4 @@ jobs:
           helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --version v1.12.0 --wait --set installCRDs=true
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --config ct.yaml
+        run: ct install --config ct.yaml --helm-extra-args "--timeout 10m"
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,7 +24,7 @@ jobs:
         with:
           version: v3.12.0
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@v1
         with:
           charts_dir: charts
           config: cr.yaml
diff --git a/charts/kapacity-manager/Chart.yaml b/charts/kapacity-manager/Chart.yaml
@@ -15,10 +15,10 @@ 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: 0.2.0
+version: 0.3.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: v0.2.0
+appVersion: v0.3.0
diff --git a/charts/kapacity-manager/templates/crds/autoscaling.kapacitystack.io_horizontalportraits.yaml b/charts/kapacity-manager/templates/crds/autoscaling.kapacitystack.io_horizontalportraits.yaml
@@ -37,10 +37,9 @@ spec:
                 description: Algorithm is the algorithm for which to use to generate the portrait.
                 properties:
                   config:
-                    additionalProperties:
-                      type: string
-                    description: 'Config is the general configuration data for arbitrary algorithm those used by external user-defined portraits. TODO: consider if we can make it structural'
+                    description: Config is the general configuration data for arbitrary algorithm those used by external portrait generators.
                     type: object
+                    x-kubernetes-preserve-unknown-fields: true
                   externalJob:
                     description: ExternalJob is the configuration for ExternalJob algorithm.
                     properties:
@@ -4389,6 +4388,9 @@ spec:
                 required:
                 - type
                 type: object
+              externalGeneratorName:
+                description: ExternalGeneratorName is the identifier of external controller which shall generate this portrait. External controllers should use this field to filter portraits to generate. Kapacity's built-in portrait generators would ignore portraits with this field set.
+                type: string
               metrics:
                 description: Metrics contains the specifications for which to use to generate the portrait.
                 items:
@@ -4731,7 +4733,7 @@ spec:
                   type: object
                 type: array
               portraitType:
-                description: PortraitType is the type of portrait. Different type has different portrait generating logic.
+                description: PortraitType is the type of portrait. Different type has different semantics with different portrait generating logic.
                 type: string
               scaleTargetRef:
                 description: ScaleTargetRef points to the target resource to scale.
diff --git a/charts/kapacity-manager/templates/crds/autoscaling.kapacitystack.io_intelligenthorizontalpodautoscalers.yaml b/charts/kapacity-manager/templates/crds/autoscaling.kapacitystack.io_intelligenthorizontalpodautoscalers.yaml
@@ -232,10 +232,9 @@ spec:
                           description: Algorithm is the algorithm for which to use to generate the portrait.
                           properties:
                             config:
-                              additionalProperties:
-                                type: string
-                              description: 'Config is the general configuration data for arbitrary algorithm those used by external user-defined portraits. TODO: consider if we can make it structural'
+                              description: Config is the general configuration data for arbitrary algorithm those used by external portrait generators.
                               type: object
+                              x-kubernetes-preserve-unknown-fields: true
                             externalJob:
                               description: ExternalJob is the configuration for ExternalJob algorithm.
                               properties:
@@ -4584,6 +4583,9 @@ spec:
                           required:
                           - type
                           type: object
+                        externalGeneratorName:
+                          description: ExternalGeneratorName is the identifier of external controller which shall generate this portrait. External controllers should use this field to filter portraits to generate. Kapacity's built-in portrait generators would ignore portraits with this field set.
+                          type: string
                         metrics:
                           description: Metrics contains the specifications for which to use to generate the portrait.
                           items:
@@ -4926,7 +4928,7 @@ spec:
                             type: object
                           type: array
                         portraitType:
-                          description: PortraitType is the type of portrait. Different type has different portrait generating logic.
+                          description: PortraitType is the type of portrait. Different type has different semantics with different portrait generating logic.
                           type: string
                       required:
                       - algorithm
diff --git a/charts/kapacity-manager/templates/deployment.yaml b/charts/kapacity-manager/templates/deployment.yaml
@@ -40,6 +40,8 @@ spec:
         - --metrics-bind-address=:8080
         - --health-probe-bind-address=:8081
         - --leader-elect
+        - --kube-api-qps={{ .Values.kubeAPIQPS }}
+        - --kube-api-burst={{ .Values.kubeAPIBurst }}
         - --reconcile-concurrency={{ .Values.reconcileConcurrency }}
         - --object-label-selector={{ .Values.objectSelector.label }}
         - --object-field-selector={{ .Values.objectSelector.field }}
@@ -73,7 +75,7 @@ spec:
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
         {{- end }}
-        image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.image.registry }}/{{ .Values.image.repository.namespace }}/{{ .Values.image.repository.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         {{- if .Values.webhook.enabled }}
diff --git a/charts/kapacity-manager/templates/webhook.yaml b/charts/kapacity-manager/templates/webhook.yaml
@@ -37,7 +37,10 @@ webhooks:
     - key: kubernetes.io/metadata.name
       operator: NotIn
       values:
+      - kube-system
+      {{- if ne .Release.Namespace "kube-system" }}
       - {{ .Release.Namespace }}
+      {{- end }}
   rules:
   - apiGroups:
     - ""
diff --git a/charts/kapacity-manager/values.yaml b/charts/kapacity-manager/values.yaml
@@ -6,11 +6,15 @@ replicaCount: 1
 
 image:
   registry: ghcr.io
-  repository: traas-stack/kapacity-manager
+  repository:
+    namespace: traas-stack
+    name: kapacity-manager
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
+kubeAPIQPS: 100
+kubeAPIBurst: 200
 reconcileConcurrency: 16
 objectSelector:
   label: ""
@@ -79,7 +83,7 @@ prometheus:
       - seriesQuery: '{__name__="kube_pod_status_ready"}'
         metricsQuery: sum(<<.Series>>{condition="true",<<.LabelMatchers>>})
         name:
-          as: ready_pods_count
+          as: kube_pod_status_ready
         resources:
           overrides:
             namespace:
@@ -106,7 +110,7 @@ algorithmJob:
     horizontalPredictive:
       registry: ghcr.io
       repository: traas-stack/kapacity-algorithm-horizontal-predictive
-      tag: v0.1.0
+      tag: v0.2.0
 
 # Set a path to enable logging to disk.
 logPath: ""
diff --git a/ct.yaml b/ct.yaml
@@ -1,3 +1,2 @@
 target-branch: main
 validate-maintainers: false
-helm-extra-args: --timeout 10m

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`target-branch: main`
`2`	`2`	`validate-maintainers: false`
`3`		`-helm-extra-args: --timeout 10m`