Merge pull request #2750 from DaoCloud/update/version

Update spiderpool to v1.0.0-rc3
DaoCloud · Nov 29, 2024 · 7c12bf4 · 7c12bf4
2 parents 6ad84c0 + 1c55371
commit 7c12bf4
Show file tree

Hide file tree

Showing 18 changed files with 2,572 additions and 354 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=1.0.0-rc2
+export VERSION=1.0.0-rc3
 
 # pr, issue, none
 export UPGRADE_METHOD=pr

diff --git a/charts/spiderpool/custom.sh b/charts/spiderpool/custom.sh
@@ -58,6 +58,7 @@ yq -i '
     .spiderpool.clusterDefaultPool.ipv6Gateway="fd00::1" |
     .spiderpool.clusterDefaultPool.ipv4IPRanges = ["192.168.0.10-192.168.0.100"] + .spiderpool.clusterDefaultPool.ipv4IPRanges |
     .spiderpool.clusterDefaultPool.ipv6IPRanges = ["fd00::10-fd00::100"] + .spiderpool.clusterDefaultPool.ipv6IPRanges |
+    .spiderpool.spiderpoolAgent.prometheus.serviceMonitor.labels."operator.insight.io/managed-by"="insight" |
     .spiderpool.spiderpoolAgent.image.registry="ghcr.m.daocloud.io" |
     .spiderpool.spiderpoolAgent.resources.requests.cpu=strenv(CUSTOM_SPIDERPOOL_AGENT_CPU) |
     .spiderpool.spiderpoolAgent.resources.requests.memory=strenv(CUSTOM_SPIDERPOOL_AGENT_MEMORY) |
@@ -66,13 +67,16 @@ yq -i '
     .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.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","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" |
-    .spiderpool.sriov.image.resourcesInjector.tag="v1.5"
+    .spiderpool.sriov.image.resourcesInjector.tag="v1.5" |
+    .spiderpool.grafanaDashboard.labels."operator.insight.io/managed-by"="insight"
 ' ${CHART_DIRECTORY}/values.yaml
 
+# `.spiderpool.sriov.image.resourcesInjector.tag="v1.5"` is used as a fallback because resourcesInjector v1.6.0 does not include an ARM64 image.
+
 if ! grep "keywords:" ${CHART_DIRECTORY}/Chart.yaml &>/dev/null ; then
     echo "keywords:" >> ${CHART_DIRECTORY}/Chart.yaml
     echo "  - networking" >> ${CHART_DIRECTORY}/Chart.yaml

diff --git a/charts/spiderpool/spiderpool/Chart.yaml b/charts/spiderpool/spiderpool/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.0-rc2
+appVersion: 1.0.0-rc3
 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: 1.0.0-rc2
+version: 1.0.0-rc3
 dependencies:
   - name: spiderpool
-    version: "1.0.0-rc2"
+    version: "1.0.0-rc3"
     repository: "https://spidernet-io.github.io/spiderpool"
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: 1.0.0-rc2
+appVersion: 1.0.0-rc3
 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: 1.0.0-rc2
+version: 1.0.0-rc3