From 1f86bc666483013f88bde4d99ca1d6ce6728931b Mon Sep 17 00:00:00 2001 From: Katarzyna Kulpa-Dybel <62446372+katarzyna-kulpa@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:07:05 +0100 Subject: [PATCH 1/7] [Issue:1061] 1.5 version (#1062) Signed-off-by: Katarzyna Kulpa --- variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index 330bac66e..448556386 100644 --- a/variables.mk +++ b/variables.mk @@ -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) From 35a682010b23a61b66cd2e81662adc85d247712a Mon Sep 17 00:00:00 2001 From: Katarzyna Kulpa-Dybel <62446372+katarzyna-kulpa@users.noreply.github.com> Date: Tue, 9 Jan 2024 12:18:19 +0100 Subject: [PATCH 2/7] [Issue-1049] fixing cves (#1064) --- .github/workflows/e2e.yml | 2 +- devkit/Makefile | 2 +- docs/CONTRIBUTING.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 03def1a51..4c8171edb 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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' diff --git a/devkit/Makefile b/devkit/Makefile index 107d953c9..b9995c595 100644 --- a/devkit/Makefile +++ b/devkit/Makefile @@ -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 diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 15ee3922d..2c176ffa9 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -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 From 60e4b400d3c63c82e5223657130297108c16c9cb Mon Sep 17 00:00:00 2001 From: rafalw82 <150019998+rafalw82@users.noreply.github.com> Date: Mon, 15 Jan 2024 08:48:46 +0100 Subject: [PATCH 3/7] [Issue-1065] fixing patcher (#1066) --- pkg/scheduler/patcher/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/scheduler/patcher/main.py b/pkg/scheduler/patcher/main.py index 09f87a980..ea17cffca 100644 --- a/pkg/scheduler/patcher/main.py +++ b/pkg/scheduler/patcher/main.py @@ -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": From 7884f9ab9a3b580e64fcaf86b8ad23d97e497a29 Mon Sep 17 00:00:00 2001 From: Illia Nebeskyi <72526499+IlliaNebeskyi@users.noreply.github.com> Date: Wed, 17 Jan 2024 09:28:57 +0100 Subject: [PATCH 4/7] [ISSUE-1068] Upgrade sidecars versions --- variables.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/variables.mk b/variables.mk index 448556386..60d2b5428 100644 --- a/variables.mk +++ b/variables.mk @@ -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 From 383d32744c7c6b79f5c8c0c7464e891fb980baba Mon Sep 17 00:00:00 2001 From: Katarzyna Kulpa-Dybel <62446372+katarzyna-kulpa@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:05:37 +0100 Subject: [PATCH 5/7] [Issue: 1070] Remove upper case from serial number (#1075) --- pkg/drivemgr/drivemgr-update-history.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/drivemgr/drivemgr-update-history.md b/pkg/drivemgr/drivemgr-update-history.md index f416c63b9..2503b1058 100644 --- a/pkg/drivemgr/drivemgr-update-history.md +++ b/pkg/drivemgr/drivemgr-update-history.md @@ -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. \ No newline at end of file +2023/05/23 upgrade halmgr to SP4. +2024/01/22 remove upper case from disk serial number. \ No newline at end of file From cee95134cc9f9490b7500d733ea0cbc37d8f63b4 Mon Sep 17 00:00:00 2001 From: Illia Nebeskyi <72526499+IlliaNebeskyi@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:34:48 +0100 Subject: [PATCH 6/7] [ISSUE-1071]: Upgrade patcher base image (#1072) --- pkg/scheduler/patcher/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/scheduler/patcher/Dockerfile b/pkg/scheduler/patcher/Dockerfile index 0390585c7..187cbabc8 100644 --- a/pkg/scheduler/patcher/Dockerfile +++ b/pkg/scheduler/patcher/Dockerfile @@ -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 From f45d675ea92b1d53180eef9b32c556dceaf53bb2 Mon Sep 17 00:00:00 2001 From: Illia Nebeskyi <72526499+IlliaNebeskyi@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:17:23 +0100 Subject: [PATCH 7/7] [ISSUE-1073] Update grpc-health-probe and kubectl --- variables.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.mk b/variables.mk index 60d2b5428..49f93141f 100644 --- a/variables.mk +++ b/variables.mk @@ -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}