Skip to content

Commit 70c8111

Browse files
committed
chore(charts): change chart repo
1 parent a6bff31 commit 70c8111

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

.woodpecker/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ steps:
1010
- export IMAGE_TAG=$([ ! -z $CI_COMMIT_TAG ] && echo \"$VERSION\" || echo \"canary\")
1111
- export APP_VERSION=$([ -z $CI_COMMIT_TAG ] && echo $CI_COMMIT_SHA || echo $VERSION)
1212
- export CHART_VERSION=$([ -z $CI_COMMIT_TAG ] && echo 1.0.0 || echo $VERSION)
13-
- sed -i s#{{repository}}#oci://$DRYCC_REGISTRY/$([ -z $CI_COMMIT_TAG ] && echo charts-testing || echo charts)#g charts/$${CI_REPO_NAME}/Chart.yaml
13+
- sed -i s#{{repository}}#oci://$DRYCC_REGISTRY/$CI_REPO_OWNER/$([ -z $CI_COMMIT_TAG ] && echo charts-testing || echo charts)#g charts/$${CI_REPO_NAME}/Chart.yaml
1414
- helm dependency update charts/$${CI_REPO_NAME}
1515
- helm package -u charts/$${CI_REPO_NAME} --version $CHART_VERSION --app-version $APP_VERSION
1616
- echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin
17-
- helm push $${CI_REPO_NAME}-$CHART_VERSION.tgz oci://$DRYCC_REGISTRY/$([ -z $CI_COMMIT_TAG ] && echo charts-testing || echo charts)
17+
- helm push $${CI_REPO_NAME}-$CHART_VERSION.tgz oci://$DRYCC_REGISTRY/$CI_REPO_OWNER/$([ -z $CI_COMMIT_TAG ] && echo charts-testing || echo charts)
1818
- bash _scripts/generate_cache.sh
1919
environment:
2020
DRYCC_REGISTRY:

install.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ CLUSTER_CIDR=${CLUSTER_CIDR:-"10.42.0.0/16"}
88
SERVICE_CIDR=${SERVICE_CIDR:-"10.43.0.0/16"}
99
CERT_MANAGER_ENABLED="${CERT_MANAGER_ENABLED:-false}"
1010
DRYCC_REGISTRY="${DRYCC_REGISTRY:-registry.drycc.cc}"
11-
CHARTS_URL=oci://registry.drycc.cc/$([ "$CHANNEL" == "stable" ] && echo charts || echo charts-testing)
11+
PROXY_CHARTS_URL=oci://registry.drycc.cc/$([ "$CHANNEL" == "stable" ] && echo charts || echo charts-testing)
12+
DRYCC_CHARTS_URL=oci://registry.drycc.cc/drycc/$([ "$CHANNEL" == "stable" ] && echo charts || echo charts-testing)
1213
CONTAINERD_RUNTIMES="${CONTAINERD_RUNTIMES:-runc}"
1314
CONTAINERD_CONFIG_PATH="${CONTAINERD_CONFIG_PATH:-/var/lib/rancher/k3s/agent/etc/containerd}"
1415
mkdir -p "${CONTAINERD_CONFIG_PATH}"
@@ -427,7 +428,7 @@ function install_network() {
427428
options=${1:-""}
428429
echo -e "\\033[32m---> Start install network...\\033[0m"
429430
kubernetes_service_host=(`ip -o route get to 8.8.8.8 | sed -n 's/.*src \([0-9.]\+\).*/\1/p'`)
430-
helm_upgrade cilium $CHARTS_URL/cilium \
431+
helm_upgrade cilium $PROXY_CHARTS_URL/cilium \
431432
--set endpointHealthChecking.enabled=false \
432433
--set healthChecking=false \
433434
--set operator.replicas=1 \
@@ -457,7 +458,7 @@ function install_metallb() {
457458
check_metallb
458459
options=${1:-""}
459460
echo -e "\\033[32m---> Start install metallb...\\033[0m"
460-
helm_upgrade metallb $CHARTS_URL/metallb \
461+
helm_upgrade metallb $PROXY_CHARTS_URL/metallb \
461462
--namespace metallb \
462463
--create-namespace $options --wait
463464

@@ -520,7 +521,7 @@ function install_gateway() {
520521
function install_cert_manager() {
521522
options=${1:-""}
522523
echo -e "\\033[32m---> Start install cert-manager...\\033[0m"
523-
helm_upgrade cert-manager $CHARTS_URL/cert-manager \
524+
helm_upgrade cert-manager $PROXY_CHARTS_URL/cert-manager \
524525
--namespace cert-manager \
525526
--create-namespace \
526527
--set clusterResourceNamespace=drycc \
@@ -715,7 +716,7 @@ EOF
715716
export VICTORIAMETRICS_CONFIG_FILE
716717
fi
717718

718-
helm_upgrade drycc $CHARTS_URL/workflow \
719+
helm_upgrade drycc $DRYCC_CHARTS_URL/workflow \
719720
--namespace drycc \
720721
--values /tmp/drycc-values.yaml \
721722
--values /tmp/drycc-mirror-values.yaml \

0 commit comments

Comments
 (0)