Skip to content

Commit

Permalink
bump spiderpool to 0.9.8
Browse files Browse the repository at this point in the history
Signed-off-by: Cyclinder Kuo <[email protected]>
  • Loading branch information
cyclinder committed Jan 3, 2025
1 parent 3e08a71 commit 6500a2d
Show file tree
Hide file tree
Showing 44 changed files with 834 additions and 9,640 deletions.
2 changes: 1 addition & 1 deletion charts/spiderpool/config
Original file line number Diff line number Diff line change
Expand Up @@ -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-rc3
export VERSION=0.9.8

# pr, issue, none
export UPGRADE_METHOD=pr
Expand Down
25 changes: 14 additions & 11 deletions charts/spiderpool/custom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
CHART_DIRECTORY=$1
[ ! -d "$CHART_DIRECTORY" ] && echo "custom shell: error, miss CHART_DIRECTORY $CHART_DIRECTORY " && exit 1

CURRENT_DIR_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd)
CURRENT_DIR_PATH=$(
cd $(dirname ${BASH_SOURCE[0]})
pwd
)

echo "custom shell: CHART_DIRECTORY $CHART_DIRECTORY"
echo "CHART_DIRECTORY $(ls)"
Expand All @@ -16,13 +19,13 @@ set -o errexit
set -o pipefail
set -o nounset

if ! which yq &>/dev/null ; then
if ! which yq &>/dev/null; then
echo " 'yq' no found, try to install..."
YQ_VERSION=v4.30.6
YQ_BINARY="yq_$(uname | tr 'A-Z' 'a-z')_amd64"
wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY}.tar.gz -O /tmp/yq.tar.gz &&
tar -xzf /tmp/yq.tar.gz -C /tmp &&
mv /tmp/${YQ_BINARY} /usr/bin/yq
tar -xzf /tmp/yq.tar.gz -C /tmp &&
mv /tmp/${YQ_BINARY} /usr/bin/yq
fi

OS=$(uname -s | tr 'A-Z' 'a-z')
Expand Down Expand Up @@ -66,23 +69,23 @@ 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","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.grafanaDashboard.labels."operator.insight.io/managed-by"="insight"
' ${CHART_DIRECTORY}/values.yaml

# .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.sriov.image.resourcesInjector.tag="v1.5"` is used as a fallback because resourcesInjector v1.6.0 does not include an ARM64 image.
# .spiderpool.spiderpoolController.podResourceInject.enabled=true |

if ! grep "keywords:" ${CHART_DIRECTORY}/Chart.yaml &>/dev/null ; then
echo "keywords:" >> ${CHART_DIRECTORY}/Chart.yaml
echo " - networking" >> ${CHART_DIRECTORY}/Chart.yaml
echo " - ipam" >> ${CHART_DIRECTORY}/Chart.yaml
if ! grep "keywords:" ${CHART_DIRECTORY}/Chart.yaml &>/dev/null; then
echo "keywords:" >>${CHART_DIRECTORY}/Chart.yaml
echo " - networking" >>${CHART_DIRECTORY}/Chart.yaml
echo " - ipam" >>${CHART_DIRECTORY}/Chart.yaml
fi

rm -f ${CHART_DIRECTORY}/values.yaml-E || true

exit 0
exit 0
6 changes: 3 additions & 3 deletions charts/spiderpool/spiderpool/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.0.0-rc3
appVersion: 0.9.8
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
Expand All @@ -16,8 +16,8 @@ name: spiderpool
sources:
- https://github.com/spidernet-io/spiderpool
type: application
version: 1.0.0-rc3
version: 0.9.8
dependencies:
- name: spiderpool
version: "1.0.0-rc3"
version: "0.9.8"
repository: "https://spidernet-io.github.io/spiderpool"
269 changes: 119 additions & 150 deletions charts/spiderpool/spiderpool/README.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions charts/spiderpool/spiderpool/charts/spiderpool/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.0.0-rc3
appVersion: 0.9.8
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
Expand All @@ -16,4 +16,4 @@ name: spiderpool
sources:
- https://github.com/spidernet-io/spiderpool
type: application
version: 1.0.0-rc3
version: 0.9.8
Loading

0 comments on commit 6500a2d

Please sign in to comment.