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

Update ks-core helm chart
kubesphere · Aug 11, 2023 · 7163cb6 · 7163cb6
2 parents ec59712 + e87b2b7
commit 7163cb6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 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.3.9
+version: 0.3.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: "v4.0.0-rc.3"
+appVersion: "v4.0.0-rc.4"
diff --git a/src/test/ks-core/templates/categories.yaml b/src/test/ks-core/templates/categories.yaml
@@ -1,3 +1,4 @@
+{{ if eq .Values.role "host" }}
 ---
 apiVersion: kubesphere.io/v1alpha1
 kind: Category
@@ -77,3 +78,4 @@ spec:
   displayName:
     en: Streaming and messaging
     zh: 流平台和消息中间件
+{{ end }}
diff --git a/src/test/ks-core/templates/ks-console-config.yml b/src/test/ks-core/templates/ks-console-config.yml
@@ -1,4 +1,3 @@
-
 apiVersion: v1
 data:
   local_config.yaml: |
@@ -20,7 +19,6 @@ data:
       version:
         kubesphere: {{ .Chart.AppVersion }}
         kubernetes: {{ .Values.kubeVersion }}
-        openpitrix: {{ .Chart.AppVersion }}
       enableKubeConfig: true
     defaultClusterName: {{ .Values.console.defaultClusterName }}
 kind: ConfigMap

diff --git a/src/test/ks-core/templates/marketplace-config.yaml b/src/test/ks-core/templates/marketplace-config.yaml
@@ -1,3 +1,4 @@
+{{ if eq .Values.role "host" }}
 apiVersion: v1
 stringData:
   configuration.yaml: |
@@ -8,14 +9,12 @@ stringData:
     subscription:
       syncPeriod: 10m
     repository:
-      url: https://app.clouddev.kubesphere.io
+      url: https://app.kubesphere.cloud
       repoName: marketplace
       syncPeriod: 10m
-      basicAuth:
-        username: curator
-        password: mypassword
 kind: Secret
 metadata:
   name: marketplace
   namespace: kubesphere-system
-type: config.kubesphere.io/marketplace
+type: config.kubesphere.io/marketplace
+{{ end }}
diff --git a/src/test/ks-core/templates/webhook.yaml b/src/test/ks-core/templates/webhook.yaml
@@ -14,6 +14,8 @@ metadata:
   name: ks-controller-manager-webhook-cert
 type: Opaque
 
+
+{{ if eq .Values.role "host" }}
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
@@ -52,6 +54,7 @@ webhooks:
         scope: '*'
     sideEffects: None
     timeoutSeconds: 30
+{{ end }}
 
 ---
 apiVersion: admissionregistration.k8s.io/v1

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.0.0-rc.3
+  tag: v4.0.0-rc.4
   imagePullSecrets: []
 
 ## @section Common parameters