From 7f045842df6ab92ea37f3fb9402f62b5823773f3 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Wed, 13 Mar 2024 07:29:13 +0000 Subject: [PATCH] update ks-core helm chart --- src/test/ks-core/templates/globalroles.yaml | 7 ---- .../ks-core/templates/post-install-job.yaml | 4 +-- src/test/ks-core/templates/webhook.yaml | 35 ------------------- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/test/ks-core/templates/globalroles.yaml b/src/test/ks-core/templates/globalroles.yaml index dff003ae..f0e36e67 100644 --- a/src/test/ks-core/templates/globalroles.yaml +++ b/src/test/ks-core/templates/globalroles.yaml @@ -129,13 +129,6 @@ rules: verbs: - get - list - - apiGroups: - - license.kubesphere.io - resources: - - licenses - verbs: - - get - - list - apiGroups: - cluster.kubesphere.io resources: diff --git a/src/test/ks-core/templates/post-install-job.yaml b/src/test/ks-core/templates/post-install-job.yaml index 8abba2d5..5e82ee7d 100644 --- a/src/test/ks-core/templates/post-install-job.yaml +++ b/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 \ No newline at end of file + done diff --git a/src/test/ks-core/templates/webhook.yaml b/src/test/ks-core/templates/webhook.yaml index 0c3d0511..f3c6f2a9 100644 --- a/src/test/ks-core/templates/webhook.yaml +++ b/src/test/ks-core/templates/webhook.yaml @@ -284,41 +284,6 @@ webhooks: --- apiVersion: admissionregistration.k8s.io/v1 -kind: ValidatingWebhookConfiguration -metadata: - name: license.kubesphere.io -webhooks: - - admissionReviewVersions: - - v1 - clientConfig: - caBundle: {{ b64enc $ca.Cert | quote }} - service: - name: ks-controller-manager - namespace: kubesphere-system - path: /license-cluster-checker - port: 443 - name: license-cluster-checker.kubesphere.io - failurePolicy: Ignore - matchPolicy: Exact - namespaceSelector: {} - objectSelector: - matchExpressions: - - key: cluster-role.kubesphere.io/host - operator: DoesNotExist - rules: - - apiGroups: - - cluster.kubesphere.io - apiVersions: - - v1alpha1 - operations: - - CREATE - resources: - - clusters - scope: '*' - sideEffects: None - timeoutSeconds: 30 ---- -apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: name: defaulter.config.kubesphere.io