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

Update ks-core helm chart

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.5.1
+version: 0.5.2
 
 # 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

src/test/ks-core/README.md

@@ -1,5 +1,7 @@
 ### Upgrade from KSE 3.X
 
+Preparing for upgrade.
+
 ```bash
 ITEMS=(
     "globalroles.iam.kubesphere.io/anonymous"
@@ -12,11 +14,23 @@ ITEMS=(
     "globalrolebindings.iam.kubesphere.io/authenticated"
     "globalrolebindings.iam.kubesphere.io/pre-registration"
     "workspacetemplate.tenant.kubesphere.io/system-workspace"
+    "-n kubesphere-system configmap/kubesphere-config"
 )
 for i in "${ITEMS[@]}"
 do
    kubectl label $i app.kubernetes.io/managed-by=Helm --overwrite
    kubectl annotate $i meta.helm.sh/release-name=ks-core --overwrite
    kubectl annotate $i meta.helm.sh/release-namespace=kubesphere-system --overwrite
 done
+
+items=$(kubectl get workspacetemplate -o jsonpath='{.items[*].metadata.name}')
+
+for i in $items
+do
+    network_isolation=$(kubectl get workspacetemplate $i -o jsonpath='{.spec.template.spec.networkIsolation}')
+
+    if [ "$network_isolation" == "true" ]; then
+        kubectl annotate workspacetemplate $i kubesphere.io/network-isolate=enabled --overwrite
+    fi
+done
 ```

src/test/ks-core/crds/extensions.kubesphere.io_reverseproxies.yaml

@@ -37,10 +37,6 @@ spec:
                   authProxy:
                     description: Add auth proxy header to requests
                     type: boolean
-                  changeOrigin:
-                    description: Change Host header for name-based virtual hosted
-                      sites.
-                    type: boolean
                   headerDown:
                     description: Sets, adds (with the + prefix), deletes (with the
                       - prefix), or performs a replacement (by using two arguments,
@@ -57,18 +53,16 @@ spec:
                     items:
                       type: string
                     type: array
-                  interceptRedirects:
-                    description: InterceptRedirects determines whether the proxy should
-                      sniff backend responses for redirects, only allows redirects
-                      to the same host. Deprecated, https://github.com/kubernetes/kubernetes/pull/106830
-                    type: boolean
                   method:
                     description: Changes the request's HTTP verb.
                     type: string
                   pathRegexp:
                     items:
                       type: string
                     type: array
+                  rejectForwardingRedirects:
+                    description: Reject to forward redirect response
+                    type: boolean
                   replace:
                     items:
                       type: string

src/test/ks-core/crds/kubesphere.io_extensionversions.yaml

@@ -121,6 +121,11 @@ spec:
                   of Kubernetes required. eg: >= 1.2.0, see https://github.com/Masterminds/semver
                   for more info.'
                 type: string
+              namespace:
+                description: Namespace represents the namespace in which the extension
+                  is installed. If empty, it will be installed in the namespace named
+                  extension-{name}.
+                type: string
               provider:
                 additionalProperties:
                   description: Provider describes an extension provider.