chore(helmbroker): bump new version

Author: duanhongyi

.woodpecker/test-linux.yml

@@ -11,10 +11,11 @@ steps:
 - name: test-linux
   image: bash
   commands:
-  - make test
+  - make test upload-coverage
   secrets:
   - codename
   - dev_registry
+  - codecov_token
   when:
     event:
     - push

Makefile

@@ -61,6 +61,6 @@ test-integration:
 
 upload-coverage:
 	$(eval CI_ENV := $(shell curl -s https://codecov.io/env | bash))
-	podman run --rm ${CI_ENV} -v ${CURDIR}:/tmp/test -w /tmp/test/rootfs ${IMAGE}.test /tmp/test/rootfs/bin/upload-coverage
+	podman run --rm ${CI_ENV} -v ${CURDIR}:/tmp/test -w /tmp/test/rootfs -e CODECOV_TOKEN=${CODECOV_TOKEN} ${IMAGE}.test /tmp/test/rootfs/bin/upload-coverage
 
 .PHONY: check-kubectl check-podman build podman-build podman-build-test deploy clean commit-hook full-clean test test-style test-unit test-functional test-integration upload-coverage

rootfs/Dockerfile

@@ -4,9 +4,9 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
-  PYTHON_VERSION="3.11" \
-  HELM_VERSION="3.12.1" \
-  KUBECTL_VERSION="1.27.3"
+  PYTHON_VERSION="3.12" \
+  HELM_VERSION="3.15.3" \
+  KUBECTL_VERSION="1.30.3"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

rootfs/Dockerfile.test

@@ -4,9 +4,9 @@ FROM registry.drycc.cc/drycc/base:${CODENAME}
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
-  PYTHON_VERSION="3.11" \
-  HELM_VERSION="3.12.1" \
-  KUBECTL_VERSION="1.27.3"
+  PYTHON_VERSION="3.12" \
+  HELM_VERSION="3.15.3" \
+  KUBECTL_VERSION="1.30.3"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
@@ -15,7 +15,9 @@ COPY . ${DRYCC_HOME_DIR}
 WORKDIR ${DRYCC_HOME_DIR}
 
 RUN buildDeps='musl-dev'; \
-  install-packages ${buildDeps} openssl ca-certificates \
+  install-packages ${buildDeps} git openssl ca-certificates \
+  && curl -SsL https://cli.codecov.io/latest/$([ $(dpkg --print-architecture) == "arm64" ] && echo linux-arm64 || echo linux)/codecov -o /usr/local/bin/codecov \
+  && chmod +x /usr/local/bin/codecov \
   && install-stack python ${PYTHON_VERSION} \
   && install-stack helm ${HELM_VERSION} \
   && install-stack kubectl ${KUBECTL_VERSION} && . init-stack \

rootfs/bin/test-unit

@@ -3,4 +3,4 @@
 # This script is designed to be run inside the container
 #
 
-python -m unittest tests/test_*.py
+coverage run -m unittest tests/test_*.py

rootfs/bin/upload-coverage

@@ -6,4 +6,8 @@
 # fail hard and fast even on pipelines
 set -eou pipefail
 
-codecov --required
+coverage report -m > coverage.txt
+
+if [[ -n $CODECOV_TOKEN ]]; then
+  codecov upload-process --plugin=noop -t "$CODECOV_TOKEN"
+fi

rootfs/dev_requirements.txt

@@ -1,13 +1,10 @@
 # test module
 # test
 # Run "make test-unit" for the % of code exercised during tests
-coverage==7.2.7
+coverage==7.6.1
 
 # Run "make test-style" to check python syntax and style
-flake8==6.0.0
-
-# code coverage report at https://codecov.io/github/drycc/controller
-codecov==2.1.13
+flake8==7.1.1
 
 # mock out python-requests, mostly k8s
-requests-mock==1.11.0
+requests-mock==1.12.1

rootfs/helmbroker/tasks.py

@@ -61,9 +61,9 @@ def provision(instance_id: str, details: ProvisionDetails):
         if addon_values_file:
             args.insert(9, "-f")
             args.insert(10, addon_values_file)
-        logger.debug(f"helm install parameters :{details.parameters}")
+        logger.debug(f"helm install parameters: {details.parameters}")
         args = format_params_to_helm_args(instance_id, details.parameters, args)
-        logger.debug(f"helm install args:{args}")
+        logger.debug(f"helm install args: {args}")
         status, output = helm(instance_id, *args)
         if status != 0:
             data["last_operation"]["state"] = OperationState.FAILED.value
@@ -118,7 +118,7 @@ def update(instance_id: str, details: UpdateDetails):
         params = data['details']['parameters']
         logger.debug(f"helm upgrade parameters: {params}")
         args = format_params_to_helm_args(instance_id, params, args)
-        logger.debug(f"helm upgrade args:{args}")
+        logger.debug(f"helm upgrade args: {args}")
         status, output = helm(instance_id, *args)
         if status != 0:
             data["last_operation"]["state"] = OperationState.FAILED.value