diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml index 1b924520..22dc57cd 100644 --- 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/files/extensions.customresourcefilters.rego b/src/test/ks-core/files/extensions.customresourcefilters.rego index cdd01b11..08e1be86 100644 --- 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 deleted file mode 100644 index 6c5d18c3..00000000 --- a/src/test/ks-core/templates/clusterrole-ks-app-helminstaller.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: kubesphere:application:helminstaller -rules: -- apiGroups: - - "" - resources: - - '*' - verbs: - - '*' \ No newline at end of file diff --git a/src/test/ks-core/templates/webhook.yaml b/src/test/ks-core/templates/webhook.yaml index 0fd1e180..0349452d 100644 --- a/src/test/ks-core/templates/webhook.yaml +++ b/src/test/ks-core/templates/webhook.yaml @@ -334,7 +334,10 @@ webhooks: failurePolicy: Ignore matchPolicy: Exact namespaceSelector: {} - objectSelector: {} + objectSelector: + matchExpressions: + - key: cluster-role.kubesphere.io/host + operator: DoesNotExist rules: - apiGroups: - cluster.kubesphere.io diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml index e25a66dd..f2852a20 100644 --- 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