update ks-core helm chart

kubesphere · Dec 5, 2024 · 832d2f6 · 832d2f6
1 parent a55b087
commit 832d2f6
Show file tree

Hide file tree

Showing 26 changed files with 190 additions and 164 deletions.
diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml
@@ -7,12 +7,12 @@ 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: 1.1.3
+version: 1.1.2
 
 # 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.
-appVersion: "v4.1.2"
+appVersion: "v4.1.1"
 
 dependencies:
   - name: redis-ha

diff --git a/src/test/ks-core/charts/ks-crds/crds/application.kubesphere.io_applicationreleases.yaml b/src/test/ks-core/charts/ks-crds/crds/application.kubesphere.io_applicationreleases.yaml
@@ -96,7 +96,7 @@ spec:
                 items:
                   description: |-
                     RawMessage is a raw encoded JSON value.
-                    It implements Marshaler and Unmarshaler and can
+                    It implements [Marshaler] and [Unmarshaler] and can
                     be used to delay JSON decoding or precompute a JSON encoding.
                   format: byte
                   type: string

diff --git a/src/test/ks-core/charts/ks-crds/crds/application.kubesphere.io_repos.yaml b/src/test/ks-core/charts/ks-crds/crds/application.kubesphere.io_repos.yaml
@@ -85,6 +85,7 @@ spec:
               url:
                 type: string
             required:
+            - syncPeriod
             - url
             type: object
           status:

diff --git a/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_apiservices.yaml b/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_apiservices.yaml
@@ -92,16 +92,8 @@ spec:
             properties:
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -142,12 +134,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

diff --git a/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_extensionentries.yaml b/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_extensionentries.yaml
@@ -49,16 +49,8 @@ spec:
             properties:
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -99,12 +91,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

diff --git a/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_jsbundles.yaml b/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_jsbundles.yaml
@@ -55,10 +55,13 @@ spec:
                         description: The key to select.
                         type: string
                       name:
+                        default: ""
                         description: |-
                           Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?
                         type: string
                       namespace:
                         type: string
@@ -81,10 +84,13 @@ spec:
                           a valid secret key.
                         type: string
                       name:
+                        default: ""
                         description: |-
                           Name of the referent.
+                          This field is effectively required, but due to backwards compatibility is
+                          allowed to be empty. Instances of this type with an empty value here are
+                          almost certainly wrong.
                           More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                          TODO: Add other useful fields. apiVersion, kind, uid?
                         type: string
                       namespace:
                         type: string
@@ -140,16 +146,8 @@ spec:
             properties:
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -190,12 +188,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

diff --git a/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_reverseproxies.yaml b/src/test/ks-core/charts/ks-crds/crds/extensions.kubesphere.io_reverseproxies.yaml
@@ -149,16 +149,8 @@ spec:
             properties:
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -199,12 +191,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

diff --git a/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_builtinroles.yaml b/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_builtinroles.yaml
@@ -73,11 +73,13 @@ spec:
                       items:
                         type: string
                       type: array
+                      x-kubernetes-list-type: atomic
                   required:
                   - key
                   - operator
                   type: object
                 type: array
+                x-kubernetes-list-type: atomic
               matchLabels:
                 additionalProperties:
                   type: string

diff --git a/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_clusterroles.yaml b/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_clusterroles.yaml
@@ -55,11 +55,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -109,6 +111,7 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 nonResourceURLs:
                   description: |-
                     NonResourceURLs is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
@@ -117,24 +120,28 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resourceNames:
                   description: ResourceNames is an optional white list of names that
                     the rule applies to.  An empty set means that everything is allowed.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resources:
                   description: Resources is a list of resources this rule applies
                     to. '*' represents all resources.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 verbs:
                   description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
                     contained in this rule. '*' represents all verbs.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
               required:
               - verbs
               type: object

diff --git a/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_globalroles.yaml b/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_globalroles.yaml
@@ -52,6 +52,7 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 nonResourceURLs:
                   description: |-
                     NonResourceURLs is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
@@ -60,24 +61,28 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resourceNames:
                   description: ResourceNames is an optional white list of names that
                     the rule applies to.  An empty set means that everything is allowed.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resources:
                   description: Resources is a list of resources this rule applies
                     to. '*' represents all resources.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 verbs:
                   description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
                     contained in this rule. '*' represents all verbs.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
               required:
               - verbs
               type: object
@@ -124,11 +129,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -178,6 +185,7 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 nonResourceURLs:
                   description: |-
                     NonResourceURLs is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
@@ -186,24 +194,28 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resourceNames:
                   description: ResourceNames is an optional white list of names that
                     the rule applies to.  An empty set means that everything is allowed.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resources:
                   description: Resources is a list of resources this rule applies
                     to. '*' represents all resources.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 verbs:
                   description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
                     contained in this rule. '*' represents all verbs.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
               required:
               - verbs
               type: object

diff --git a/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_roles.yaml b/src/test/ks-core/charts/ks-crds/crds/iam.kubesphere.io_roles.yaml
@@ -55,11 +55,13 @@ spec:
                           items:
                             type: string
                           type: array
+                          x-kubernetes-list-type: atomic
                       required:
                       - key
                       - operator
                       type: object
                     type: array
+                    x-kubernetes-list-type: atomic
                   matchLabels:
                     additionalProperties:
                       type: string
@@ -109,6 +111,7 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 nonResourceURLs:
                   description: |-
                     NonResourceURLs is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
@@ -117,24 +120,28 @@ spec:
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resourceNames:
                   description: ResourceNames is an optional white list of names that
                     the rule applies to.  An empty set means that everything is allowed.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 resources:
                   description: Resources is a list of resources this rule applies
                     to. '*' represents all resources.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
                 verbs:
                   description: Verbs is a list of Verbs that apply to ALL the ResourceKinds
                     contained in this rule. '*' represents all verbs.
                   items:
                     type: string
                   type: array
+                  x-kubernetes-list-type: atomic
               required:
               - verbs
               type: object