From 2ff8c850f0d45080a4a9e0123df81adaf9db7120 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 28 Dec 2024 21:59:05 +0300 Subject: [PATCH 01/13] add module.yaml and remove chart.yaml Signed-off-by: Aleksandr Zimin --- Chart.yaml | 6 ------ module.yaml | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 Chart.yaml create mode 100644 module.yaml diff --git a/Chart.yaml b/Chart.yaml deleted file mode 100644 index d48b337e..00000000 --- a/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -name: sds-node-configurator -version: 0.0.1 -dependencies: - - name: deckhouse_lib_helm - version: 1.1.3 - repository: https://deckhouse.github.io/lib-helm diff --git a/module.yaml b/module.yaml new file mode 100644 index 00000000..052e6cba --- /dev/null +++ b/module.yaml @@ -0,0 +1,3 @@ +name: sds-node-configurator +weight: 900 +description: "SDS node configurator" From f5517ea965f78e43dc2763dba04c77e078dbf38f Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 28 Dec 2024 22:34:25 +0300 Subject: [PATCH 02/13] fix Signed-off-by: Aleksandr Zimin --- lib/python/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/python/requirements.txt b/lib/python/requirements.txt index 94943c43..92d9b6cd 100644 --- a/lib/python/requirements.txt +++ b/lib/python/requirements.txt @@ -2,3 +2,4 @@ deckhouse==0.4.9 dotmap==1.3.30 PyYAML==6.0.1 kubernetes==28.1.0 +pyOpenSSL=24.3.0 From 2f88f5041363f712f6f9d39a4f831d354569e153 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 28 Dec 2024 22:39:16 +0300 Subject: [PATCH 03/13] bump deckhouse pip Signed-off-by: Aleksandr Zimin --- .werf/bundle.yaml | 2 +- lib/python/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werf/bundle.yaml b/.werf/bundle.yaml index 72c5d96f..97dc08a5 100644 --- a/.werf/bundle.yaml +++ b/.werf/bundle.yaml @@ -2,7 +2,7 @@ --- image: bundle from: registry.deckhouse.io/base_images/scratch@sha256:b054705fcc9f2205777d80a558d920c0b4209efdc3163c22b5bfcb5dda1db5fc -fromCacheVersion: 20240830154106 +fromCacheVersion: 20241228154106 import: # Rendering .werf/images-digests.yaml is required! - image: images-digests diff --git a/lib/python/requirements.txt b/lib/python/requirements.txt index 92d9b6cd..f57eb981 100644 --- a/lib/python/requirements.txt +++ b/lib/python/requirements.txt @@ -1,4 +1,4 @@ -deckhouse==0.4.9 +deckhouse==0.4.11 dotmap==1.3.30 PyYAML==6.0.1 kubernetes==28.1.0 From f3f91291bcfb9729678a8728e7346b68a8ad0e01 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 28 Dec 2024 22:42:18 +0300 Subject: [PATCH 04/13] bump fromCacheVersion Signed-off-by: Aleksandr Zimin --- .werf/python-deps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index ad711986..729a0be4 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -2,7 +2,7 @@ --- image: python-dependencies from: registry.deckhouse.io/base_images/alpine:3.16.3 -fromCacheVersion: 20240830154106 +fromCacheVersion: 20241228154106 git: - add: / to: / From bf1994eabe5bb636edda208d48a3cb5181669877 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 28 Dec 2024 22:43:48 +0300 Subject: [PATCH 05/13] fix Signed-off-by: Aleksandr Zimin --- lib/python/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/python/requirements.txt b/lib/python/requirements.txt index f57eb981..f3fa5e91 100644 --- a/lib/python/requirements.txt +++ b/lib/python/requirements.txt @@ -2,4 +2,4 @@ deckhouse==0.4.11 dotmap==1.3.30 PyYAML==6.0.1 kubernetes==28.1.0 -pyOpenSSL=24.3.0 +pyOpenSSL==24.3.0 From df98c61281ba2ec577805089dcaac05ca58de4c3 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sat, 28 Dec 2024 23:32:14 +0300 Subject: [PATCH 06/13] some fixes Signed-off-by: Aleksandr Zimin --- .werf/python-deps.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index 729a0be4..f120a918 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -1,7 +1,7 @@ # Python deps image, required to download dependencies and put it to the final module image (bundle) --- image: python-dependencies -from: registry.deckhouse.io/base_images/alpine:3.16.3 +from: registry.deckhouse.io/base_images/alt:p11@sha256:e47d84424485d3674240cb2f67d3a1801b37d327e6d1eb8cc8d01be8ed3b34f3 fromCacheVersion: 20241228154106 git: - add: / @@ -10,6 +10,7 @@ git: - lib/python shell: beforeInstall: - - apk add --no-cache python3 py3-pip + - apt-get update + - apt-get install -y python3 python3-module-pip setup: - pip3 install -r /lib/python/requirements.txt -t /lib/python/dist From fc08a628162cb4f2b2d0dd36878fe1128b1c998f Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sun, 29 Dec 2024 02:10:37 +0300 Subject: [PATCH 07/13] fix Signed-off-by: Aleksandr Zimin --- .werf/bundle.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werf/bundle.yaml b/.werf/bundle.yaml index 97dc08a5..8d7405b6 100644 --- a/.werf/bundle.yaml +++ b/.werf/bundle.yaml @@ -27,4 +27,4 @@ git: - monitoring - openapi - templates - - Chart.yaml + - module.yaml From 1b5de4a8ca6c4e9108bc083616607d870321ab71 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sun, 29 Dec 2024 02:26:37 +0300 Subject: [PATCH 08/13] fix Signed-off-by: Aleksandr Zimin --- .werf/python-deps.yaml | 4 ++++ lib/python/requirements.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index f120a918..341ef77f 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -8,6 +8,10 @@ git: to: / includePaths: - lib/python + stageDependencies: + beforeSetup: + - "*" + shell: beforeInstall: - apt-get update diff --git a/lib/python/requirements.txt b/lib/python/requirements.txt index f3fa5e91..9f3d6f09 100644 --- a/lib/python/requirements.txt +++ b/lib/python/requirements.txt @@ -1,5 +1,6 @@ deckhouse==0.4.11 dotmap==1.3.30 -PyYAML==6.0.1 +PyYAML==6.0.2 kubernetes==28.1.0 pyOpenSSL==24.3.0 +bcrypt==4.1.3 From 618669315e00eb41d9f351196ece87db00f0addd Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sun, 29 Dec 2024 02:27:37 +0300 Subject: [PATCH 09/13] fix Signed-off-by: Aleksandr Zimin --- .werf/python-deps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index 341ef77f..73af8a8e 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -9,7 +9,7 @@ git: includePaths: - lib/python stageDependencies: - beforeSetup: + setup: - "*" shell: From fbe032fd64ae02d7e3d920363085da5436343ac9 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Sun, 29 Dec 2024 02:30:47 +0300 Subject: [PATCH 10/13] fix Signed-off-by: Aleksandr Zimin --- .werf/python-deps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index 73af8a8e..99beec16 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -15,6 +15,6 @@ git: shell: beforeInstall: - apt-get update - - apt-get install -y python3 python3-module-pip + - apt-get install -y python3 python3-module-pip-run setup: - pip3 install -r /lib/python/requirements.txt -t /lib/python/dist From a7e3d06cd95c21c0f12949505d74dfd36ccc7a29 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Mon, 30 Dec 2024 14:10:28 +0300 Subject: [PATCH 11/13] fix Signed-off-by: Aleksandr Zimin --- .werf/python-deps.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index 99beec16..a179d773 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -10,7 +10,7 @@ git: - lib/python stageDependencies: setup: - - "*" + - lib/python/requirements.txt shell: beforeInstall: From 034d4a84f071c72408d1fa1b80d4babb8465b279 Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Thu, 9 Jan 2025 11:30:06 +0300 Subject: [PATCH 12/13] Fix python dependencies Signed-off-by: v.oleynikov --- .werf/consts.yaml | 12 ++++++++++++ .werf/python-deps.yaml | 6 +++--- werf.yaml | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 .werf/consts.yaml diff --git a/.werf/consts.yaml b/.werf/consts.yaml new file mode 100644 index 00000000..ca9a4cc1 --- /dev/null +++ b/.werf/consts.yaml @@ -0,0 +1,12 @@ +# base images +{{- $_ := set $ "BASE_ALT" "registry.deckhouse.io/base_images/alt:p11@sha256:e47d84424485d3674240cb2f67d3a1801b37d327e6d1eb8cc8d01be8ed3b34f3" }} +{{- $_ := set $ "BASE_ALT_DEV" "registry.deckhouse.io/base_images/dev-alt:p10@sha256:76e6e163fa982f03468166203488b569e6d9fc10855d6a259c662706436cdcad" }} +{{- $_ := set $ "BASE_ALT_P11" "registry.deckhouse.io/base_images/alt:p11@sha256:c396cd7348a48f9236413e2ef5569223c15e554c0a3ca37f9d92fb787d4f1893" }} +{{- $_ := set $ "BASE_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.1-alpine3.20@sha256:716820a183116e643839611ff9eca9bd1c92d2bf8f7a5eda2f9fd16e8acbaa72" }} +{{- $_ := set $ "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }} + + +# component versions +{{- $versions := dict }} + +{{- $_ := set $ "VERSIONS" $versions }} diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index ad711986..06d198da 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -1,8 +1,7 @@ # Python deps image, required to download dependencies and put it to the final module image (bundle) --- image: python-dependencies -from: registry.deckhouse.io/base_images/alpine:3.16.3 -fromCacheVersion: 20240830154106 +from: {{ .Images.BASE_ALT_P11 }} git: - add: / to: / @@ -10,6 +9,7 @@ git: - lib/python shell: beforeInstall: - - apk add --no-cache python3 py3-pip + - apt-get update + - apt-get install -y python3 python3-module-pip-run setup: - pip3 install -r /lib/python/requirements.txt -t /lib/python/dist diff --git a/werf.yaml b/werf.yaml index 4fab11c4..451b8174 100644 --- a/werf.yaml +++ b/werf.yaml @@ -1,6 +1,7 @@ project: sds-node-configurator configVersion: 1 --- +{{ tpl (.Files.Get ".werf/consts.yaml") $ }} {{ tpl (.Files.Get ".werf/images.yaml") $ }} {{ tpl (.Files.Get ".werf/images-digests.yaml") $ }} {{ tpl (.Files.Get ".werf/python-deps.yaml") $ }} From 0026e0bfa9345db9864da2126cf56c6f5e92de04 Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Thu, 9 Jan 2025 11:49:45 +0300 Subject: [PATCH 13/13] Fix Signed-off-by: v.oleynikov --- .werf/consts.yaml | 12 ------------ .werf/python-deps.yaml | 2 +- werf.yaml | 1 - 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 .werf/consts.yaml diff --git a/.werf/consts.yaml b/.werf/consts.yaml deleted file mode 100644 index ca9a4cc1..00000000 --- a/.werf/consts.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# base images -{{- $_ := set $ "BASE_ALT" "registry.deckhouse.io/base_images/alt:p11@sha256:e47d84424485d3674240cb2f67d3a1801b37d327e6d1eb8cc8d01be8ed3b34f3" }} -{{- $_ := set $ "BASE_ALT_DEV" "registry.deckhouse.io/base_images/dev-alt:p10@sha256:76e6e163fa982f03468166203488b569e6d9fc10855d6a259c662706436cdcad" }} -{{- $_ := set $ "BASE_ALT_P11" "registry.deckhouse.io/base_images/alt:p11@sha256:c396cd7348a48f9236413e2ef5569223c15e554c0a3ca37f9d92fb787d4f1893" }} -{{- $_ := set $ "BASE_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.1-alpine3.20@sha256:716820a183116e643839611ff9eca9bd1c92d2bf8f7a5eda2f9fd16e8acbaa72" }} -{{- $_ := set $ "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }} - - -# component versions -{{- $versions := dict }} - -{{- $_ := set $ "VERSIONS" $versions }} diff --git a/.werf/python-deps.yaml b/.werf/python-deps.yaml index 1481c255..8f5da96d 100644 --- a/.werf/python-deps.yaml +++ b/.werf/python-deps.yaml @@ -1,7 +1,7 @@ # Python deps image, required to download dependencies and put it to the final module image (bundle) --- image: python-dependencies -from: {{ .Images.BASE_ALT_P11 }} +from: registry.deckhouse.io/base_images/alt:p11@sha256:c396cd7348a48f9236413e2ef5569223c15e554c0a3ca37f9d92fb787d4f1893 git: - add: / to: / diff --git a/werf.yaml b/werf.yaml index 451b8174..4fab11c4 100644 --- a/werf.yaml +++ b/werf.yaml @@ -1,7 +1,6 @@ project: sds-node-configurator configVersion: 1 --- -{{ tpl (.Files.Get ".werf/consts.yaml") $ }} {{ tpl (.Files.Get ".werf/images.yaml") $ }} {{ tpl (.Files.Get ".werf/images-digests.yaml") $ }} {{ tpl (.Files.Get ".werf/python-deps.yaml") $ }}