Merge pull request #655 from lbbniu/fix/crd

update manifests
gocrane · Dec 19, 2022 · b75117c · b75117c
2 parents ec5304b + c8aadff
commit b75117c
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 19 deletions.
diff --git a/deploy/craned/webhooks.yaml b/deploy/craned/webhooks.yaml
@@ -33,7 +33,7 @@ webhooks:
       service:
         name: craned
         namespace: crane-system
-        path: /mutate-ensurance-crane-io-v1alpha1-nodeqosensurancepolicy
+        path: /mutate-ensurance-crane-io-v1alpha1-nodeqos
     failurePolicy: Fail
     name: mnodeqosensurancepolicies.ensurance.crane.io
     rules:
@@ -45,7 +45,7 @@ webhooks:
           - CREATE
           - UPDATE
         resources:
-          - NodeQOSEnsurancePolicy
+          - NodeQOS
     sideEffects: None
   - admissionReviewVersions:
       - v1
@@ -124,7 +124,7 @@ webhooks:
       service:
         name: craned
         namespace: crane-system
-        path: /validate-ensurance-crane-io-v1alpha1-nodeqosensurancepolicy
+        path: /validate-ensurance-crane-io-v1alpha1-nodeqos
     failurePolicy: Fail
     name: vnodeqosensurancepolicies.ensurance.crane.io
     rules:
@@ -136,7 +136,7 @@ webhooks:
           - CREATE
           - UPDATE
         resources:
-          - nodeqosensurancepolicies
+          - nodeqoss
     sideEffects: None
   - admissionReviewVersions:
       - v1

diff --git a/deploy/manifests/analysis.crane.io_analytics.yaml b/deploy/manifests/analysis.crane.io_analytics.yaml
@@ -266,6 +266,11 @@ spec:
                       description: RecommenderRef presents recommender info for recommendation
                         mission.
                       properties:
+                        config:
+                          additionalProperties:
+                            type: string
+                          description: Override Recommendation configs
+                          type: object
                         name:
                           description: Recommender's Name
                           type: string

diff --git a/deploy/manifests/analysis.crane.io_recommendationrules.yaml b/deploy/manifests/analysis.crane.io_recommendationrules.yaml
@@ -67,6 +67,11 @@ spec:
                 items:
                   description: Recommender referring to the Recommender in RecommendationConfiguration
                   properties:
+                    config:
+                      additionalProperties:
+                        type: string
+                      description: Override Recommendation configs
+                      type: object
                     name:
                       description: Recommender's Name
                       type: string
@@ -199,6 +204,11 @@ spec:
                       description: RecommenderRef presents recommender info for recommendation
                         mission.
                       properties:
+                        config:
+                          additionalProperties:
+                            type: string
+                          description: Override Recommendation configs
+                          type: object
                         name:
                           description: Recommender's Name
                           type: string

diff --git a/deploy/manifests/ensurance.crane.io_nodeqoss.yaml b/deploy/manifests/ensurance.crane.io_nodeqoss.yaml
@@ -323,8 +323,7 @@ spec:
                 type: object
             type: object
           status:
-            description: NodeQOSEnsurancePolicyStatus defines the observed status
-              of NodeQOSEnsurancePolicy
+            description: NodeQOSStatus defines the observed status of NodeQOS
             type: object
         required:
         - spec

diff --git a/deploy/manifests/ensurance.crane.io_podqoss.yaml b/deploy/manifests/ensurance.crane.io_podqoss.yaml
@@ -257,6 +257,15 @@ spec:
                         - pageCacheMaxRatio
                         - pageCacheReclaimRatio
                         type: object
+                      memPriority:
+                        description: MemoryPriority define the memory priority for
+                          the pods. MemoryPriority range [0,7], 0 is the highest level.
+                          When the memory resource is shortage, the low level pods
+                          would be OOM Killed earlier
+                        format: int32
+                        maximum: 7
+                        minimum: 0
+                        type: integer
                       memWatermark:
                         description: MemWatermark to set memory watermark priority
                         properties:

diff --git a/deploy/manifests_1.13/ensurance.crane.io_nodeqoss.yaml b/deploy/manifests_1.13/ensurance.crane.io_nodeqoss.yaml
@@ -323,8 +323,8 @@ spec:
                 type: object
             type: object
           status:
-            description: NodeQOSEnsurancePolicyStatus defines the observed status
-              of NodeQOSEnsurancePolicy
+            description: NodeQOSStatus defines the observed status
+              of NodeQOS
             type: object
         required:
         - spec

diff --git a/examples/ensurance/disablescheduling-when-ext-cpu-total-distribute.yaml b/examples/ensurance/disablescheduling-when-ext-cpu-total-distribute.yaml
@@ -1,5 +1,5 @@
 apiVersion: ensurance.crane.io/v1alpha1
-kind: NodeQOSEnsurancePolicy
+kind: NodeQOS
 metadata:
   name: "disablescheduling-when-ext-cpu-total-distribute"
   labels:
@@ -9,7 +9,7 @@ spec:
     timeoutSeconds: 10
     nodeLocalGet:
       localCacheTTLSeconds: 60
-  objectiveEnsurances:
+  rules:
     - name: "ext_cpu_total_distribute"
       avoidanceThreshold: 2
       restoreThreshold: 2

diff --git a/examples/ensurance/nep-schedule-delay.yaml b/examples/ensurance/nep-schedule-delay.yaml
@@ -1,16 +1,15 @@
 apiVersion: ensurance.crane.io/v1alpha1
-kind: NodeQOSEnsurancePolicy
+kind: NodeQOS
 metadata:
   name: "schedule-delay"
   labels:
     app: "system"
 spec:
   nodeQualityProbe:
-    initialDelaySeconds: 10
     timeoutSeconds: 10
     nodeLocalGet:
       localCacheTTLSeconds: 60
-  objectiveEnsurances:
+  rules:
     - name: "container-schedule-delay-time"
       avoidanceThreshold: 1
       restoreThreshold: 10

diff --git a/examples/ensurance/waterline1.yaml b/examples/ensurance/waterline1.yaml
@@ -1,5 +1,5 @@
 apiVersion: ensurance.crane.io/v1alpha1
-kind: NodeQOSEnsurancePolicy
+kind: NodeQOS
 metadata:
   name: "waterline1"
   labels:
@@ -9,7 +9,7 @@ spec:
     timeoutSeconds: 10
     nodeLocalGet:
       localCacheTTLSeconds: 60
-  objectiveEnsurances:
+  rules:
     - name: "cpu-usage"
       avoidanceThreshold: 2
       restoreThreshold: 2

diff --git a/examples/ensurance/waterline2.yaml b/examples/ensurance/waterline2.yaml
@@ -1,5 +1,5 @@
 apiVersion: ensurance.crane.io/v1alpha1
-kind: NodeQOSEnsurancePolicy
+kind: NodeQOS
 metadata:
   name: "waterline2"
   labels:
@@ -9,7 +9,7 @@ spec:
     timeoutSeconds: 10
     nodeLocalGet:
       localCacheTTLSeconds: 60
-  objectiveEnsurances:
+  rules:
     - name: "cpu-usage"
       avoidanceThreshold: 2
       restoreThreshold: 2

diff --git a/examples/ensurance/waterline3.yaml b/examples/ensurance/waterline3.yaml
@@ -1,5 +1,5 @@
 apiVersion: ensurance.crane.io/v1alpha1
-kind: NodeQOSEnsurancePolicy
+kind: NodeQOS
 metadata:
   name: "waterline3"
   labels:
@@ -9,7 +9,7 @@ spec:
     timeoutSeconds: 10
     nodeLocalGet:
       localCacheTTLSeconds: 60
-  objectiveEnsurances:
+  rules:
     - name: "cpu-usage"
       avoidanceThreshold: 2
       restoreThreshold: 2