Skip to content

Commit

Permalink
Merge branch 'master' into bugfix-csi-device-busy
Browse files Browse the repository at this point in the history
  • Loading branch information
Libin Zhang authored and Libin Zhang committed Feb 7, 2024
2 parents b679c2b + f45d675 commit 6302fdb
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

env:
REGISTRY: 'ghcr.io/dell/csi-baremetal'
go_version: '1.21.3'
go_version: '1.21.5'
golangci_version: '1.55.2'
helm_version: '3.7.1'
kubectl_version: 'v1.25.3'
Expand Down
2 changes: 1 addition & 1 deletion devkit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TAG ?= $(major).$(minor).$(patch)-$(git_rev)
IMAGE_REPO_TAG := $(REPO):$(TAG)

DOCKER_VERSION ?= 20.10.14_ce
GO_VERSION ?= 1.21.3
GO_VERSION ?= 1.21.5
GOLANGCI_VERSION ?= 1.55.2
PROTOBUF_VERSION ?= 3.11.0
PROTOC_GEN_GO_VER ?= v1.3.2
Expand Down
2 changes: 1 addition & 1 deletion docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ You have to commit the changes to go.mod, go.sum and before submitting the pull
[This guide is intended](/devkit/README.md) as a quickstart on how to use devkit for CSI development env.
#### Requirements
- go v1.17
- go v1.21
- lvm2 packet installed on host machine
- kubectl v1.16+
- helm v3
Expand Down
3 changes: 2 additions & 1 deletion pkg/drivemgr/drivemgr-update-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ drivemgr have several implementations, file here to track changeset to create ne
git commit for proprietary code.

2023/05/16 remove empty image csi-baremetal-scheduler.
2023/05/23 upgrade halmgr to SP4.
2023/05/23 upgrade halmgr to SP4.
2024/01/22 remove upper case from disk serial number.
2 changes: 1 addition & 1 deletion pkg/scheduler/patcher/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.10-alpine3.17
FROM python:3.12.1-alpine3.19

COPY requirements.txt main.py /patcher/
WORKDIR /patcher
Expand Down
4 changes: 3 additions & 1 deletion pkg/scheduler/patcher/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ def run():
if kube_major_ver==1 and kube_minor_ver>22:
path = args.target_config_23_path

config_unschedulable_pods = (kube_major_ver==1 and kube_minor_ver>23 and kube_minor_ver<26)
# the option is still available for kubernetes 1.26, 1.27, 1.28, 1.29
# verify if the option is still available for kubernetes greater than 1.29
config_unschedulable_pods = (kube_major_ver==1 and kube_minor_ver>23 and kube_minor_ver<=29)

manifest = "/etc/kubernetes/manifests/kube-scheduler.yaml"
if args.platform == "rke":
Expand Down
12 changes: 6 additions & 6 deletions variables.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CRD_OPTIONS ?= crd

### version
MAJOR := 1
MINOR := 4
MINOR := 5
PATCH := 0
PRODUCT_VERSION ?= ${MAJOR}.${MINOR}.${PATCH}
BUILD_REL_A := $(shell git rev-list HEAD |wc -l)
Expand All @@ -22,10 +22,10 @@ TAG := ${FULL_VERSION}
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)

### third-party components version
CSI_PROVISIONER_TAG := v3.1.0
CSI_RESIZER_TAG := v1.4.0
CSI_REGISTRAR_TAG := v2.5.0
LIVENESS_PROBE_TAG := v2.6.0
CSI_PROVISIONER_TAG := v3.6.0
CSI_RESIZER_TAG := v1.9.0
CSI_REGISTRAR_TAG := v2.9.0
LIVENESS_PROBE_TAG := v2.11.0
BUSYBOX_TAG := 1.29

### PATH
Expand Down Expand Up @@ -58,7 +58,7 @@ LIVENESS_PROBE := livenessprobe
BUSYBOX := busybox

HEALTH_PROBE := health_probe
HEALTH_PROBE_BIN_URL := https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.22/grpc_health_probe-linux-amd64
HEALTH_PROBE_BIN_URL := https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/v0.4.24/grpc_health_probe-linux-amd64

### go env vars
GO_ENV_VARS := GO111MODULE=on ${GOPRIVATE_PART} ${GOPROXY_PART}
Expand Down

0 comments on commit 6302fdb

Please sign in to comment.