diff --git a/src/test/ks-core/templates/globalroles.yaml b/src/test/ks-core/templates/globalroles.yaml index d5e6d423..6f4c2f48 100644 --- a/src/test/ks-core/templates/globalroles.yaml +++ b/src/test/ks-core/templates/globalroles.yaml @@ -140,13 +140,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-delete-job.yaml b/src/test/ks-core/templates/post-delete-job.yaml index 79096dd7..2d14083b 100644 --- a/src/test/ks-core/templates/post-delete-job.yaml +++ b/src/test/ks-core/templates/post-delete-job.yaml @@ -81,6 +81,7 @@ spec: volumeMounts: - mountPath: /scripts name: scripts + resources: {{- toYaml .Values.upgrade.resources | nindent 12 }} volumes: - name: scripts configMap: diff --git a/src/test/ks-core/templates/post-patch-system-ns-job.yaml b/src/test/ks-core/templates/post-patch-system-ns-job.yaml index 242c26da..bb7d5554 100644 --- a/src/test/ks-core/templates/post-patch-system-ns-job.yaml +++ b/src/test/ks-core/templates/post-patch-system-ns-job.yaml @@ -24,3 +24,4 @@ spec: kubectl label ns $ns kubesphere.io/workspace=system-workspace kubectl label ns $ns kubesphere.io/managed=true done + resources: {{- toYaml .Values.upgrade.resources | nindent 12 }} diff --git a/src/test/ks-core/templates/pre-delete-job.yaml b/src/test/ks-core/templates/pre-delete-job.yaml index 0c23f806..65c7189a 100644 --- a/src/test/ks-core/templates/pre-delete-job.yaml +++ b/src/test/ks-core/templates/pre-delete-job.yaml @@ -33,6 +33,7 @@ spec: volumeMounts: - mountPath: /scripts name: scripts + resources: {{- toYaml .Values.upgrade.resources | nindent 12 }} volumes: - name: scripts configMap: diff --git a/src/test/ks-core/templates/pre-upgrade-job.yaml b/src/test/ks-core/templates/pre-upgrade-job.yaml index 5d051e41..7a81022b 100644 --- a/src/test/ks-core/templates/pre-upgrade-job.yaml +++ b/src/test/ks-core/templates/pre-upgrade-job.yaml @@ -16,6 +16,8 @@ data: local: path: {{ .Values.upgrade.storage.local.path }} {{- end }} + download: {{- toYaml .Values.upgrade.download | nindent 6 }} + skipValidator: {{ .Values.upgrade.skipValidator }} jobs: {{- toYaml .Values.upgrade.jobs | nindent 6 }} --- diff --git a/src/test/ks-core/templates/prepare-upgrade-job.yaml b/src/test/ks-core/templates/prepare-upgrade-job.yaml index 14e8a1f8..13836d1d 100644 --- a/src/test/ks-core/templates/prepare-upgrade-job.yaml +++ b/src/test/ks-core/templates/prepare-upgrade-job.yaml @@ -13,6 +13,8 @@ data: local: path: {{ .Values.upgrade.storage.local.path }} {{- end }} + download: {{- toYaml .Values.upgrade.download | nindent 6 }} + skipValidator: {{ .Values.upgrade.skipValidator }} jobs: {{- toYaml .Values.upgrade.jobs | nindent 6 }} --- diff --git a/src/test/ks-core/templates/webhook.yaml b/src/test/ks-core/templates/webhook.yaml index 8bd3c340..676129e5 100644 --- a/src/test/ks-core/templates/webhook.yaml +++ b/src/test/ks-core/templates/webhook.yaml @@ -288,41 +288,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 diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml index 6a5599b5..f8b8caed 100644 --- a/src/test/ks-core/values.yaml +++ b/src/test/ks-core/values.yaml @@ -295,6 +295,15 @@ extension: imageRegistry: "" nodeSelector: {} +hook: + resources: + limits: + cpu: 1 + memory: 1024Mi + requests: + cpu: 20m + memory: 100Mi + upgrade: disabled: false image: @@ -302,6 +311,11 @@ upgrade: repository: kse/ks-upgrade tag: "" pullPolicy: Always + persistenceVolume: + name: ks-upgrade + storageClassName: "" + accessMode: ReadWriteOnce + size: 5Gi storage: s3: endpoint: "" @@ -312,6 +326,13 @@ upgrade: secret_access_key: "" local: path: /tmp/ks-upgrade + download: + globalRegistryUrl: "oci://hub.kubesphere.com.cn/kse-extensions" + file: {} + http: + timeout: 20 + oci: {} + skipValidator: false persistenceVolume: name: ks-upgrade storageClassName: "" @@ -335,7 +356,7 @@ upgrade: name: "network" version: "1.0.0" namespace: "extension-network" - configMap: "network-extension-1.0.0-chart" + configMap: "extension-network-1.0.0-chart" configMapKey: "charts.tgz" configMapNamespace: "kubesphere-system" chartsPath: "" @@ -350,7 +371,7 @@ upgrade: } iam: disabled: false - priority: 100 + priority: 999 devops: disabled: true priority: 100 @@ -383,21 +404,10 @@ upgrade: name: "storage-utils" version: "1.0.0" namespace: "extension-storage-utils" - configMap: "extension-storage-utils-1.0.0-chart" - configMapKey: "chart.tgz" - configMapNamespace: "kubesphere-system" + config: "" + clusterScheduling: null chartsPath: "" - config: | - backend: - pvcAutoResizer: - commandArgs: - prometheusUrl: "http://prometheus-k8s.kubesphere-monitoring-system:9090" installationMode: Multicluster - clusterScheduling: - placement: - clusterSelector: - matchLabels: - kubesphere.io/managed: "true" dynamicOptions: { "rerun": "false" } @@ -430,18 +440,11 @@ upgrade: priority: 100 extensionRef: name: "whizard-monitoring" - version: "1.0.0" - namespace: "extension-whizard-monitoring" - configMap: "extension-whizard-monitoring-1.0.0-chart" - configMapKey: "chart.tgz" - configMapNamespace: "kubesphere-system" - chartsPath: "" + version: "1.0.0-rc.5" installationMode: Multicluster - clusterScheduling: - placement: - clusterSelector: - matchLabels: - kubesphere.io/managed: "true" + dynamicOptions: + rerun: false + updateCrds: true springcloud: disabled: true priority: 100 @@ -454,6 +457,11 @@ upgrade: configMapNamespace: "kubesphere-system" chartsPath: "" installationMode: Multicluster + clusterScheduling: + placement: + clusterSelector: + matchLabels: + kubesphere.io/managed: "true" servicemesh: disabled: true priority: 100 @@ -466,6 +474,11 @@ upgrade: configMapNamespace: "kubesphere-system" chartsPath: "" installationMode: Multicluster + clusterScheduling: + placement: + clusterSelector: + matchLabels: + kubesphere.io/managed: "true" config: | kiali: prometheus_url: http://prometheus-k8s.kubesphere-monitoring-system.svc:9090 @@ -473,7 +486,7 @@ upgrade: storage: options: es: - server-urls: https://opensearch-cluster-master.kubesphere-logging-system.svc:9200 + server-urls: https://opensearch-cluster-data.kubesphere-logging-system.svc:9200 username: admin password: admin # secretName: jaeger-secret-opensearch @@ -549,30 +562,17 @@ upgrade: placement: clusters: - host - clusterSelector: - matchLabels: - node-role.kubernetes.io/master: "" - alerting: + whizard-alerting: disabled: true - priority: 200 + priority: 10 extensionRef: name: "whizard-alerting" - version: "0.1.6" - namespace: "extension-whizard-alerting" - configMap: "extension-whizard-alerting-0.1.6-chart" - configMapKey: "chart.tgz" - configMapNamespace: "kubesphere-system" - chartsPath: "" + version: "0.1.9-rc.2" installationMode: Multicluster - clusterScheduling: - placement: - clusterSelector: - matchLabels: - kubesphere.io/managed: "true" - dynamicOptions: { - "rerun": "false" - } + dynamicOptions: + rerun: false + updateCrds: true kubeedge: disabled: true priority: 100 @@ -580,9 +580,6 @@ upgrade: name: "kubeedge" version: "1.13.1" namespace: "extension-kubeedge" - configMap: "extension-kubeedge-1.13.1-chart" - configMapKey: "chart.tgz" - configMapNamespace: "kubesphere-system" chartsPath: "" installationMode: Multicluster clusterScheduling: @@ -619,6 +616,11 @@ upgrade: configMapNamespace: "kubesphere-system" chartsPath: "" installationMode: Multicluster + clusterScheduling: + placement: + clusterSelector: + matchLabels: + kubesphere.io/managed: "true" whizard-auditing: disabled: true @@ -638,7 +640,7 @@ upgrade: priority: 100 extensionRef: name: "whizard-logging" - version: "0.1.0" + version: "0.1.1" namespace: "kubesphere-logging-system" configMap: "extension-whizard-logging-0.1.1-chart" configMapKey: "chart.tgz" @@ -677,6 +679,36 @@ upgrade: matchLabels: kubesphere.io/managed: "true" + whizard-telemerty: + disabled: true + priority: 100 + extensionRef: + name: "whizard-telemerty" + version: "1.0.0-rc.0" + namespace: "extension-whizard-telemerty" + configMap: "extension-whizard-telemerty-1.0.0-rc.0-chart" + configMapKey: "chart.tgz" + configMapNamespace: "kubesphere-system" + chartsPath: "" + installationMode: HostOnly + clusterScheduling: {} + + metrics-server: + disabled: true + priority: 100 + extensionRef: + name: "metrics-server" + version: "0.7.0" + namespace: "extension-metrics-server" + configMap: "extension-metrics-server-0.7.0-chart" + configMapKey: "chart.tgz" + configMapNamespace: "kubesphere-system" + chartsPath: "" + installationMode: Multicluster + dynamicOptions: { + "rerun": "false" + } + ha: enabled: false # cache: @@ -715,4 +747,4 @@ redisHA: pullPolicy: IfNotPresent persistence: enabled: true - size: 2Gi + size: 2Gi \ No newline at end of file