update ks-core helm chart

kubesphere · Mar 7, 2024 · 79f068b · 79f068b
1 parent b3eccb4
commit 79f068b
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 47 deletions.
diff --git a/src/test/ks-core/crds/application.kubesphere.io_applicationreleases.yaml b/src/test/ks-core/crds/application.kubesphere.io_applicationreleases.yaml
@@ -17,11 +17,17 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.AppID
-      name: App Name
-      type: string
     - jsonPath: .metadata.labels.kubesphere\.io/workspace
-      name: Workspace
+      name: workspace
+      type: string
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/app-id
+      name: app
+      type: string
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/appversion-id
+      name: appversion
+      type: string
+    - jsonPath: .spec.appType
+      name: appType
       type: string
     - jsonPath: .metadata.labels.kubesphere\.io/cluster
       name: Cluster

diff --git a/src/test/ks-core/crds/application.kubesphere.io_applications.yaml b/src/test/ks-core/crds/application.kubesphere.io_applications.yaml
@@ -17,9 +17,15 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/repo-name
+      name: repo
+      type: string
     - jsonPath: .metadata.labels.kubesphere\.io/workspace
       name: workspace
       type: string
+    - jsonPath: .spec.appType
+      name: appType
+      type: string
     - jsonPath: .status.state
       name: State
       type: string

diff --git a/src/test/ks-core/crds/application.kubesphere.io_applicationversions.yaml b/src/test/ks-core/crds/application.kubesphere.io_applicationversions.yaml
@@ -17,6 +17,18 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/repo-name
+      name: repo
+      type: string
+    - jsonPath: .metadata.labels.kubesphere\.io/workspace
+      name: workspace
+      type: string
+    - jsonPath: .metadata.labels.application\.kubesphere\.io/app-id
+      name: app
+      type: string
+    - jsonPath: .spec.appType
+      name: appType
+      type: string
     - jsonPath: .status.state
       name: State
       type: string

diff --git a/src/test/ks-core/crds/application.kubesphere.io_repos.yaml b/src/test/ks-core/crds/application.kubesphere.io_repos.yaml
@@ -80,8 +80,6 @@ spec:
                 type: object
               description:
                 type: string
-              global:
-                type: boolean
               syncPeriod:
                 type: integer
               url:

diff --git a/src/test/ks-core/crds/kubesphere.io_extensionversions.yaml b/src/test/ks-core/crds/kubesphere.io_extensionversions.yaml
@@ -82,8 +82,6 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
-              docs:
-                type: string
               externalDependencies:
                 description: ExternalDependencies
                 items:

diff --git a/src/test/ks-core/scripts/post-delete.sh b/src/test/ks-core/scripts/post-delete.sh
@@ -17,3 +17,11 @@ do
      kubectl delete crd $crd 2>/dev/null;
   fi
 done
+
+
+EXTENSION_RELATED_RESOURCES='jobs.batch roles.rbac.authorization.k8s.io rolebindings.rbac.authorization.k8s.io clusterroles.rbac.authorization.k8s.io clusterrolebindings.rbac.authorization.k8s.io'
+
+for resource in $EXTENSION_RELATED_RESOURCES;do
+  echo "kubectl delete $resource -l kubesphere.io/extension-ref --all-namespaces"
+  kubectl delete $resource -l kubesphere.io/extension-ref --all-namespaces
+done
diff --git 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/webhook.yaml b/src/test/ks-core/templates/webhook.yaml
@@ -317,38 +317,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: {}
-    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