Merge pull request #370 from kubesphere/sync/ks-core

Update ks-core helm chart

src/test/ks-core/Chart.yaml

@@ -7,7 +7,7 @@ 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.11
+version: 0.6.12
 
 # 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

src/test/ks-core/files/extensions.customresourcefilters.rego

@@ -73,16 +73,18 @@ installStatusMatch if {
 }
 
 installedStatusMatch if {
-    input.filter.value == "installed"
-    ["Installed","Enabled","Disabled"][_] == input.object.status.state
+	input.filter.value == "installed"
+	"Installed" == input.object.status.state
 }
 
 enabledStatusMatch if {
+	alreadyInstalled
 	input.filter.value == "true"
-	input.object.status.state == "Enabled"
+	input.object.status.enabled
 }
 
 enabledStatusMatch if {
+	alreadyInstalled
 	input.filter.value == "false"
-	input.object.status.state == "Disabled"
+	not input.object.status.enabled
 }

src/test/ks-core/templates/post-install-job.yaml

@@ -19,8 +19,8 @@ spec:
             - -c
             - |
               kubectl create namespace kubesphere-controls-system --dry-run=client -o yaml | kubectl apply -f -
-              for ns in kubesphere-system kubesphere-controls-system default kube-system;
+              for ns in kubesphere-system kubesphere-controls-system default kube-node-lease kube-public kube-system;
               do
                 kubectl label ns $ns kubesphere.io/workspace=system-workspace
                 kubectl label ns $ns kubesphere.io/managed=true
-              done
+              done