chre(helmbroker): add codename build-arg

Author: duanhongyi

.woodpecker/build-linux.yml

@@ -16,6 +16,7 @@ pipeline:
   - echo $CONTAINER_PASSWORD | docker login $DRYCC_REGISTRY --username $CONTAINER_USERNAME --password-stdin > /dev/null 2>&1
   - make docker-build docker-immutable-push
   secrets:
+  - codename
   - dev_registry
   - drycc_registry
   - container_username

.woodpecker/test-linux.yml

@@ -14,6 +14,7 @@ pipeline:
   commands:
   - make test
   secrets:
+  - codename
   - dev_registry
   when:
     event:

Makefile

@@ -28,14 +28,14 @@ check-docker:
 build: docker-build
 
 docker-build: check-docker
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE} rootfs
+	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
 docker-buildx: check-docker
-	docker buildx build --platform ${PLATFORM} -t ${IMAGE} rootfs --push
+	docker buildx build --build-arg CODENAME=${CODENAME} --platform ${PLATFORM} -t ${IMAGE} rootfs --push
 
 docker-build-test: check-docker
-	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
+	docker build ${DOCKER_BUILD_FLAGS} --build-arg CODENAME=${CODENAME} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
 
 deploy: check-kubectl docker-build docker-push
 	kubectl --namespace=drycc patch deployment drycc-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'

rootfs/Dockerfile

@@ -1,11 +1,12 @@
-FROM registry.drycc.cc/drycc/base:bullseye
+ARG CODENAME
+FROM registry.drycc.cc/drycc/base:${CODENAME}
 
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
-  PYTHON_VERSION="3.10.6" \
-  HELM_VERSION="3.9.4" \
-  KUBECTL_VERSION="1.25.0"
+  PYTHON_VERSION="3.11" \
+  HELM_VERSION="3.12.1" \
+  KUBECTL_VERSION="1.27.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

@@ -1,11 +1,12 @@
-FROM registry.drycc.cc/drycc/base:bullseye
+ARG CODENAME
+FROM registry.drycc.cc/drycc/base:${CODENAME}
 
 ENV DRYCC_UID=1001 \
   DRYCC_GID=1001 \
   DRYCC_HOME_DIR=/workspace \
-  PYTHON_VERSION="3.10.6" \
-  HELM_VERSION="3.9.4" \
-  KUBECTL_VERSION="1.25.0"
+  PYTHON_VERSION="3.11" \
+  HELM_VERSION="3.12.1" \
+  KUBECTL_VERSION="1.27.3"
 
 RUN groupadd drycc --gid ${DRYCC_GID} \
   && useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}

rootfs/dev_requirements.txt

@@ -1,16 +1,13 @@
 # test module
 # test
 # Run "make test-unit" for the % of code exercised during tests
-coverage==5.3
+coverage==7.2.7
 
 # Run "make test-style" to check python syntax and style
-flake8==3.8.3
+flake8==6.0.0
 
 # code coverage report at https://codecov.io/github/drycc/controller
-codecov==2.1.9
+codecov==2.1.13
 
 # mock out python-requests, mostly k8s
-requests-mock==1.8.0
-
-# tail a log and pipe into tbgrep to find all tracebacks
-tbgrep==0.3.0
+requests-mock==1.11.0

rootfs/requirements.txt

@@ -1,6 +1,6 @@
 PyYAML==6.0
 gunicorn==20.1.0
-openbrokerapi==4.1.2
-requests==2.28.1
-celery==5.2.7
-jsonschema==4.14.0
+openbrokerapi==4.5.5
+requests==2.31.0
+celery==5.3.1
+jsonschema==4.17.3