update ks-core helm chart

kubesphere · Mar 9, 2024 · 3aeda41 · 3aeda41
1 parent bbebe17
commit 3aeda41
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 55 deletions.
diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml
@@ -7,9 +7,9 @@ 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.6.8
+version: 0.6.9
 
 # 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.0-alpha.1"
+appVersion: "v4.1.0-beta.0"
diff --git a/src/test/ks-core/crds/kubesphere.io_extensionversions.yaml b/src/test/ks-core/crds/kubesphere.io_extensionversions.yaml
@@ -82,8 +82,6 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
-              docs:
-                type: string
               externalDependencies:
                 description: ExternalDependencies
                 items:

diff --git a/src/test/ks-core/files/extensions.customresourcefilters.rego b/src/test/ks-core/files/extensions.customresourcefilters.rego
@@ -36,6 +36,11 @@ match if {
 	installStatusMatch
 }
 
+match if {
+	installStatusSearch
+	installedStatusMatch
+}
+
 match if {
 	enabledStatusSearch
 	enabledStatusMatch
@@ -67,6 +72,11 @@ installStatusMatch if {
 	lower(input.object.status.state) == lower(input.filter.value)
 }
 
+installedStatusMatch if {
+    input.filter.value == "installed"
+    ["Installed","Enabled","Disabled"][_] == input.object.status.state
+}
+
 enabledStatusMatch if {
 	input.filter.value == "true" == input.object.status.enabled
 }
diff --git a/src/test/ks-core/templates/clusterrole-ks-app-helminstaller.yaml b/src/test/ks-core/templates/clusterrole-ks-app-helminstaller.yaml
diff --git a/src/test/ks-core/templates/globalroles.yaml b/src/test/ks-core/templates/globalroles.yaml
@@ -129,13 +129,6 @@ rules:
     verbs:
       - get
       - list
-  - apiGroups:
-      - license.kubesphere.io
-    resources:
-      - licenses
-    verbs:
-      - get
-      - list
   - apiGroups:
       - cluster.kubesphere.io
     resources:

diff --git a/src/test/ks-core/templates/webhook.yaml b/src/test/ks-core/templates/webhook.yaml
@@ -317,38 +317,6 @@ webhooks:
 
 ---
 apiVersion: admissionregistration.k8s.io/v1
-kind: ValidatingWebhookConfiguration
-metadata:
-  name: license.kubesphere.io
-webhooks:
-  - admissionReviewVersions:
-      - v1
-    clientConfig:
-      caBundle: {{ b64enc $ca.Cert | quote }}
-      service:
-        name: ks-controller-manager
-        namespace: kubesphere-system
-        path: /license-cluster-checker
-        port: 443
-    name: license-cluster-checker.kubesphere.io
-    failurePolicy: Ignore
-    matchPolicy: Exact
-    namespaceSelector: {}
-    objectSelector: {}
-    rules:
-      - apiGroups:
-          - cluster.kubesphere.io
-        apiVersions:
-          - v1alpha1
-        operations:
-          - CREATE
-        resources:
-          - clusters
-        scope: '*'
-    sideEffects: None
-    timeoutSeconds: 30
----
-apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   name: defaulter.config.kubesphere.io

diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml
@@ -2,7 +2,7 @@
 ## @param global.tag Global Docker image tag
 global:
   imageRegistry: registry.cn-beijing.aliyuncs.com
-  tag: v4.1.0-alpha.1
+  tag: v4.1.0-beta.0
   imagePullSecrets: []
 
 ## @param nameOverride String to partially override common.names.fullname