Merge pull request #2660 from cyclinder/bump_spiderpool_v1.0.0

bump spiderpool to v1.0.0-rc2
DaoCloud · Nov 4, 2024 · 2b304bc · 2b304bc
2 parents e08a017 + aca80a6
commit 2b304bc
Show file tree

Hide file tree

Showing 42 changed files with 7,413 additions and 647 deletions.
diff --git a/charts/spiderpool/config b/charts/spiderpool/config
@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=false
 export REPO_URL=https://spidernet-io.github.io/spiderpool
 export REPO_NAME=spiderpool
 export CHART_NAME=spiderpool
-export VERSION=0.9.7
+export VERSION=1.0.0-rc2
 
 # pr, issue, none
 export UPGRADE_METHOD=pr

diff --git a/charts/spiderpool/custom.sh b/charts/spiderpool/custom.sh
@@ -65,6 +65,8 @@ yq -i '
     .spiderpool.spiderpoolController.resources.requests.cpu=strenv(CUSTOM_SPIDERPOOL_CONTROLLER_CPU) |
     .spiderpool.spiderpoolController.resources.requests.memory=strenv(CUSTOM_SPIDERPOOL_CONTROLLER_MEMORY) |
     .spiderpool.spiderpoolController.tolerations[0].effect = "NoSchedule" |
+    .spiderpool.spiderpoolController.podResourceInject.enabled=true | 
+    .spiderpool.spiderpoolController.podResourceInject.namespacesExclude= ["insight-system","mcamel-system","amamba-system","argocd","baize-system","ghippo-system","gpu-operator","dowl-system","hwameistor","insight-system","kairship-system","kangaroo-system","kant-system","kcollie-system","kcoral-system","kolm-system","kpanda-system","kubean-system","local-path-storage","metax","mspider-system","nvidia-gpu-operator","skoala-system","spidernet-system","virtnest-system","ipavo-system"] + .spiderpool.spiderpoolController.podResourceInject.namespacesExclude | 
     .spiderpool.spiderpoolInit.image.registry="ghcr.m.daocloud.io" | 
     .spiderpool.plugins.image.registry="ghcr.m.daocloud.io" |
     .spiderpool.rdma.rdmaSharedDevicePlugin.image.registry="ghcr.m.daocloud.io" 

diff --git a/charts/spiderpool/parent/.relok8s-images.yaml b/charts/spiderpool/parent/.relok8s-images.yaml
@@ -6,8 +6,6 @@
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.plugins.image.repository }}:{{ .spiderpool.plugins.image.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.operator.repository }}:{{ .spiderpool.sriov.image.operator.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.sriovConfigDaemon.repository }}:{{ .spiderpool.sriov.image.sriovConfigDaemon.tag }}"
-- "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.sriovCni.repository }}:{{ .spiderpool.sriov.image.sriovCni.tag }}"
-- "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.ibSriovCni.repository }}:{{ .spiderpool.sriov.image.ibSriovCni.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.sriovDevicePlugin.repository }}:{{ .spiderpool.sriov.image.sriovDevicePlugin.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.resourcesInjector.repository }}:{{ .spiderpool.sriov.image.resourcesInjector.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.webhook.repository }}:{{ .spiderpool.sriov.image.webhook.tag }}"
diff --git a/charts/spiderpool/spiderpool/.relok8s-images.yaml b/charts/spiderpool/spiderpool/.relok8s-images.yaml
@@ -6,8 +6,6 @@
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.plugins.image.repository }}:{{ .spiderpool.plugins.image.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.operator.repository }}:{{ .spiderpool.sriov.image.operator.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.sriovConfigDaemon.repository }}:{{ .spiderpool.sriov.image.sriovConfigDaemon.tag }}"
-- "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.sriovCni.repository }}:{{ .spiderpool.sriov.image.sriovCni.tag }}"
-- "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.ibSriovCni.repository }}:{{ .spiderpool.sriov.image.ibSriovCni.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.sriovDevicePlugin.repository }}:{{ .spiderpool.sriov.image.sriovDevicePlugin.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.resourcesInjector.repository }}:{{ .spiderpool.sriov.image.resourcesInjector.tag }}"
 - "{{ .spiderpool.global.imageRegistryOverride }}/{{ .spiderpool.sriov.image.webhook.repository }}:{{ .spiderpool.sriov.image.webhook.tag }}"
diff --git a/charts/spiderpool/spiderpool/Chart.yaml b/charts/spiderpool/spiderpool/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.9.7
+appVersion: 1.0.0-rc2
 description: underlay CNI solution for kubernetes
 home: https://spidernet-io.github.io/spiderpool
 icon: https://raw.githubusercontent.com/spidernet-io/spiderpool/main/docs/images/spider.svg
@@ -16,8 +16,8 @@ name: spiderpool
 sources:
   - https://github.com/spidernet-io/spiderpool
 type: application
-version: 0.9.7
+version: 1.0.0-rc2
 dependencies:
   - name: spiderpool
-    version: "0.9.7"
+    version: "1.0.0-rc2"
     repository: "https://spidernet-io.github.io/spiderpool"
diff --git a/charts/spiderpool/spiderpool/README.md b/charts/spiderpool/spiderpool/README.md
diff --git a/charts/spiderpool/spiderpool/charts/spiderpool/Chart.yaml b/charts/spiderpool/spiderpool/charts/spiderpool/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.9.7
+appVersion: 1.0.0-rc2
 description: underlay CNI solution for kubernetes
 home: https://spidernet-io.github.io/spiderpool
 icon: https://raw.githubusercontent.com/spidernet-io/spiderpool/main/docs/images/spider.svg
@@ -16,4 +16,4 @@ name: spiderpool
 sources:
 - https://github.com/spidernet-io/spiderpool
 type: application
-version: 0.9.7
+version: 1.0.0-rc2