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

Update ks-core helm chart
kubesphere · Mar 9, 2024 · 8ea1176 · 8ea1176
2 parents e8a7d94 + 47c9705
commit 8ea1176
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/src/test/ks-core/Chart.yaml b/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.9
+version: 0.6.10
 
 # 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

diff --git a/src/test/ks-core/files/extensions.customresourcefilters.rego b/src/test/ks-core/files/extensions.customresourcefilters.rego
@@ -78,5 +78,11 @@ installedStatusMatch if {
 }
 
 enabledStatusMatch if {
-	input.filter.value == "true" == input.object.status.enabled
+	input.filter.value == "true"
+	input.object.status.state == "Enabled"
+}
+
+enabledStatusMatch if {
+	input.filter.value == "false"
+	input.object.status.state == "Disabled"
 }
diff --git a/src/test/ks-core/templates/customresourcefilters.yaml b/src/test/ks-core/templates/customresourcefilters.yaml
@@ -9,6 +9,6 @@ stringData:
 {{ .Files.Get "files/extensions.customresourcefilters.rego" | indent 6 }}
 kind: Secret
 metadata:
-  name: extensions.customresourcefilters.kubesphere
+  name: extensions.customresourcefilters
   namespace: kubesphere-system
 type: config.kubesphere.io/custom-resource-filter
diff --git a/src/test/ks-core/templates/kubesphere-config.yaml b/src/test/ks-core/templates/kubesphere-config.yaml
@@ -36,9 +36,15 @@ data:
       {{- end }}
     kubesphere:
       tls: {{ .Values.internalTLS }}
-    {{- if .Values.devMode }}
+    {{- if .Values.cloud.enabled }}
     telemetry:
+      {{- if eq .Values.cloud.env "clouddev.kubesphere.io" }}
       ksCloudURL: "https://clouddev.kubesphere.io"
+      {{- else if eq .Values.cloud.env "kubesphere.cloud" }}
+      ksCloudURL: "https://kubesphere.cloud"
+      {{- else if and .Values.cloud.customEnv .Values.cloud.customEnv.url }}
+      ksCloudURL: {{ $.Values.cloud.customEnv.url | quote }}
+      {{- end }}
     {{- end }}
     {{- if .Values.ha.enabled -}}
     {{- if .Values.ha.cache }}
@@ -47,10 +53,10 @@ data:
     cache:
       type: redis
       options:
-          host: redis.kubesphere-system.svc
-          port: 6379
-          password: KUBESPHERE_CACHE_OPTIONS_PASSWORD
-          db: 0
+        host: redis.kubesphere-system.svc
+        port: 6379
+        password: KUBESPHERE_CACHE_OPTIONS_PASSWORD
+        db: 0
     {{- end }}
     {{- end }}
     composedApp:

diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml
@@ -289,9 +289,9 @@ nodeShell:
 
 cloud:
   enabled: true
-  ## kubesphere.cloud or clouddev.kubesphere.io
+  ## kubesphere.cloud clouddev.kubesphere.io or custom
   env: "kubesphere.cloud"
-  customEnv:
+  customEnv: {}
 #    url: https://kubesphere.cloud
 #    subscription:
 #      syncPeriod: 60m