From 34809d2dd425b7115af275d33f6faffd14370866 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Fri, 11 Aug 2023 07:13:22 +0000 Subject: [PATCH] update ks-core helm chart --- src/test/ks-core/templates/categories.yaml | 2 ++ src/test/ks-core/templates/ks-console-config.yml | 2 -- src/test/ks-core/templates/marketplace-config.yaml | 9 ++++----- src/test/ks-core/templates/webhook.yaml | 3 +++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/test/ks-core/templates/categories.yaml b/src/test/ks-core/templates/categories.yaml index 64081615..ed7f4ceb 100644 --- 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 }} \ No newline at end of file diff --git a/src/test/ks-core/templates/ks-console-config.yml b/src/test/ks-core/templates/ks-console-config.yml index 78c09dd2..54024948 100644 --- 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 index 9b913194..8b8adf07 100644 --- 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 \ No newline at end of file +type: config.kubesphere.io/marketplace +{{ end }} \ 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 da06e684..e89533a6 100644 --- 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