Merge pull request #1929 from ks-ci-bot/cherry-pick-1928-to-release-3.0

[release-3.0] sync kubesphere v3.4.0 manifests
kubesphere · Jul 20, 2023 · b752cc6 · b752cc6
2 parents 2698dfb + 564f9e1
commit b752cc6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/cmd/kk/pkg/version/kubesphere/templates/cc_v340.go b/cmd/kk/pkg/version/kubesphere/templates/cc_v340.go
@@ -125,15 +125,11 @@ spec:
     #   resources: {}
   devops:
     enabled: false
-    ci:
-      enabled: false
-    cd:
-      enabled: false
-      type: argocd
-    # resources: {}
-    jenkinsMemoryLim: 8Gi
+    jenkinsCpuReq: 0.5
+    jenkinsCpuLim: 1
     jenkinsMemoryReq: 4Gi
-    jenkinsVolumeSize: 8Gi
+    jenkinsMemoryLim: 4Gi
+    jenkinsVolumeSize: 16Gi
   events:
     enabled: false
     # operator:

diff --git a/cmd/kk/pkg/version/kubesphere/templates/installer.go b/cmd/kk/pkg/version/kubesphere/templates/installer.go
@@ -255,6 +255,7 @@ rules:
   - '*'
 - apiGroups:
   - kubeedge.kubesphere.io
+  - edgeruntime.kubesphere.io
   resources:
   - '*'
   verbs: