update ks-core helm chart

src/test/ks-core/Chart.yaml

@@ -7,12 +7,12 @@ 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: 1.0.0
+version: 1.0.2-edgewize
 
 # 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.1.0"
+appVersion: "v4.1.1-edgewize"
 
 dependencies:
   - name: redis-ha

src/test/ks-core/templates/_helpers.tpl

@@ -171,12 +171,17 @@ Returns user's password or use default. Used by NOTES.txt
 
 {{- define "getNodeAddress" -}}
 {{- $address := "127.0.0.1"}}
+{{- $found := false }}
 {{- with $nodes := lookup "v1" "Node" "" "" }}
-{{- $node := first $nodes.items -}}
+{{- range $nodeKey, $node := $nodes.items }}
+{{- if (hasKey $node.metadata.labels "node-role.kubernetes.io/control-plane") }}
 {{- range $k, $v := $node.status.addresses }}
-  {{- if (eq $v.type "InternalIP") }}
-     {{- $address = $v.address }}
-  {{- end }}
+{{- if and (eq $v.type "InternalIP") (not $found) }}
+{{- $address = $v.address }}
+{{- $found = true }}
+{{- end }}
+{{- end }}
+{{- end }}
 {{- end }}
 {{- else }}
 {{- end }}

src/test/ks-core/templates/kubesphere-config.yaml

@@ -8,7 +8,7 @@ data:
       authenticateRateLimiterMaxTries: {{ .Values.authentication.authenticateRateLimiterMaxTries | default 10 }}
       authenticateRateLimiterDuration: {{ .Values.authentication.authenticationRateLimiterDuration | default "10m0s" }}
       loginHistoryRetentionPeriod: {{ .Values.authentication.loginHistoryRetentionPeriod | default "168h"  }}
-      multipleLogin: {{ .Values.authentication.enableMultiLogin | default true }}
+      multipleLogin: {{ .Values.authentication.enableMultiLogin | default false }}
       issuer:
         host: {{ include "portal.host" . | quote }}
         jwtSecret: {{ include "jwtSecret" . | quote }}
@@ -23,8 +23,8 @@ data:
     s3:
       endpoint: {{ .Values.s3.endpoint | quote  }}
       region: {{ .Values.s3.region | default "us-east-1"  }}
-      disableSSL: {{ .Values.s3.disableSSL | default true  }}
-      forcePathStyle: {{ .Values.s3.forcePathStyle | default true  }}
+      disableSSL: {{ .Values.s3.disableSSL | default false  }}
+      forcePathStyle: {{ .Values.s3.forcePathStyle | default false  }}
       accessKeyID: {{ .Values.s3.accessKeyID | default "admin"  }}
       secretAccessKey: {{ .Values.s3.secretAccessKey | default "admin"  }}
       bucket: {{ .Values.s3.bucket | default "uploads"  }}
@@ -47,6 +47,13 @@ data:
       {{- if .Values.extension.nodeSelector }}
       nodeSelector: {{- toYaml .Values.extension.nodeSelector | nindent 8 }}
       {{- end }}
+      {{- if and .Values.extension.ingress .Values.extension.ingress.domainSuffix }}
+      ingress:
+        ingressClassName: {{ .Values.extension.ingress.ingressClassName }}
+        domainSuffix: {{ .Values.extension.ingress.domainSuffix }}
+        httpPort: {{ .Values.extension.ingress.httpPort }}
+        httpsPort: {{ .Values.extension.ingress.httpsPort }}
+      {{- end }}
     composedApp:
       appSelector: {{ .Values.composedApp.appSelector | quote }}
     kubesphere:

src/test/ks-core/templates/roletemplates.yaml

@@ -637,6 +637,7 @@ metadata:
   labels:
     iam.kubesphere.io/category: cluster-resource-management
     iam.kubesphere.io/scope: "cluster"
+    iam.kubesphere.io/aggregate-to-cluster-viewer: ""
     kubesphere.io/managed: 'true'
   name: cluster-view-nodes
 spec:

src/test/ks-core/templates/webhook.yaml

@@ -256,6 +256,33 @@ webhooks:
         scope: '*'
     sideEffects: None
     timeoutSeconds: 30
+  - admissionReviewVersions:
+      - v1
+    clientConfig:
+      caBundle: {{ b64enc $ca.Cert | quote }}
+      service:
+        name: ks-controller-manager
+        namespace: kubesphere-system
+        path: /validate-extensions-kubesphere-io-v1alpha1-extensionentry
+        port: 443
+    failurePolicy: Fail
+    matchPolicy: Exact
+    name: extensionentries.extensions.kubesphere.io
+    namespaceSelector: {}
+    objectSelector: {}
+    rules:
+      - apiGroups:
+          - extensions.kubesphere.io
+        apiVersions:
+          - v1alpha1
+        operations:
+          - CREATE
+          - UPDATE
+        resources:
+          - extensionentries
+        scope: '*'
+    sideEffects: None
+    timeoutSeconds: 30
 
 ---
 apiVersion: admissionregistration.k8s.io/v1

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.1.0
+  tag: v4.1.1-edgewize
   imagePullSecrets: []
 
 ## @param nameOverride String to partially override common.names.fullname
@@ -118,7 +118,7 @@ apiserver:
   containerPorts:
     - protocol: TCP
       containerPort: 9090
-  nodePort: 30881
+  # nodePort: 30881
   ## @param resources.limits The resource limits for the ks-apiserver containers
   ## @param resources.requests The requested resources for the ks-apiserver containers
   ##
@@ -308,6 +308,13 @@ cloud:
 extension:
   imageRegistry: ""
   nodeSelector: {}
+  ingress:
+    ingressClassName: ""
+    # The domain name suffix used to create the ingress of each extension.
+    # Depending on your ingress address, it can be an LB hostname address (xx.com), {node_ip}.nip.io or an internal DNS address (kse.local).
+    domainSuffix: ""
+    httpPort: 80
+    httpsPort: 443
 
 hook:
   resources: