From a4ec2834c4bbe8290402f127372556b44f5c4a55 Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Thu, 9 Jan 2025 09:25:57 +0300 Subject: [PATCH 01/30] Bump lib-helm version Signed-off-by: v.oleynikov Signed-off-by: Alexey Yakubov --- charts/deckhouse_lib_helm-1.40.0.tgz | Bin 25822 -> 0 bytes charts/deckhouse_lib_helm-1.41.0.tgz | Bin 0 -> 25851 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 charts/deckhouse_lib_helm-1.40.0.tgz create mode 100644 charts/deckhouse_lib_helm-1.41.0.tgz diff --git a/charts/deckhouse_lib_helm-1.40.0.tgz b/charts/deckhouse_lib_helm-1.40.0.tgz deleted file mode 100644 index 66785378c6436d05c6db5c9f2826cef0cc37f242..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25822 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 diff --git a/charts/deckhouse_lib_helm-1.41.0.tgz b/charts/deckhouse_lib_helm-1.41.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..ed78597f2da7c05795b7399bce6b671edffd1f77 GIT binary patch literal 25851 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%0AmVl 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 Date: Thu, 9 Jan 2025 09:37:08 +0300 Subject: [PATCH 02/30] Add src artifact Signed-off-by: v.oleynikov Signed-off-by: Alexey Yakubov --- .../sds-local-volume-controller/werf.inc.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index ee388814..6496a33d 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -1,4 +1,21 @@ --- +image: {{ $.ImageName }}-src-artifact +from: {{ $.BASE_ALT }} +final: false + +git: + - add: /images/{{ $.ImageName }} + to: / + stageDependencies: + install: + - "**/*" + includePaths: + - patches + +shell: + install: + - echo "src artifact" +--- image: {{ $.ImageName }}-golang-artifact from: {{ $.Root.BASE_GOLANG_1_23 }} final: false From 9057a3e8309a5131f828a7ef327a86dfb5b5eea2 Mon Sep 17 00:00:00 2001 From: "v.oleynikov" Date: Thu, 9 Jan 2025 09:50:45 +0300 Subject: [PATCH 03/30] Fix Signed-off-by: v.oleynikov Signed-off-by: Alexey Yakubov --- .werf/consts.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.werf/consts.yaml b/.werf/consts.yaml index 812713aa..ca9a4cc1 100644 --- a/.werf/consts.yaml +++ b/.werf/consts.yaml @@ -1,4 +1,5 @@ # 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" }} From caa7baa906717dcb66aa0e98c888089f3c28563a Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 10:50:47 +0300 Subject: [PATCH 04/30] Werf prepare for CSE - initial Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/src/go.mod | 1 - .../sds-local-volume-controller/werf.inc.yaml | 32 +++++++------ images/sds-local-volume-csi/werf.inc.yaml | 46 +++++++++++++------ .../src/go.mod | 1 + .../werf.inc.yaml | 46 ++++++++++++++----- images/webhooks/werf.inc.yaml | 46 ++++++++++++++----- 6 files changed, 119 insertions(+), 53 deletions(-) diff --git a/images/sds-local-volume-controller/src/go.mod b/images/sds-local-volume-controller/src/go.mod index abbdbf88..8b2dd43d 100644 --- a/images/sds-local-volume-controller/src/go.mod +++ b/images/sds-local-volume-controller/src/go.mod @@ -76,5 +76,4 @@ require ( ) replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 - replace github.com/deckhouse/sds-local-volume/api => ../../../api diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index 6496a33d..a277d48c 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -1,20 +1,24 @@ --- image: {{ $.ImageName }}-src-artifact -from: {{ $.BASE_ALT }} +from: {{ $.Root.BASE_ALT }} final: false git: - - add: /images/{{ $.ImageName }} - to: / + - add: /images/{{ $.ImageName }}/src + to: /src/images/{{ $.ImageName }}/src + stageDependencies: + install: + - "**/*" + - add: /api + to: /src/api stageDependencies: install: - "**/*" - includePaths: - - patches shell: install: - echo "src artifact" + --- image: {{ $.ImageName }}-golang-artifact from: {{ $.Root.BASE_GOLANG_1_23 }} @@ -23,9 +27,9 @@ final: false git: - add: / to: / - includePaths: - - api - - images/sds-local-volume-controller/src + # includePaths: + # - api + # - src stageDependencies: setup: - "**/*" @@ -35,9 +39,9 @@ mount: to: /go/pkg shell: setup: - - cd /images/sds-local-volume-controller/src/cmd - - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /sds-local-volume-controller - - chmod +x /sds-local-volume-controller + - cd /src/images/{{ $.ImageName }}/src/cmd + - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} + - chmod +x /{{ $.ImageName }} --- image: {{ $.ImageName }} @@ -45,9 +49,9 @@ from: {{ $.Root.BASE_SCRATCH }} import: - image: {{ $.ImageName }}-golang-artifact - add: /sds-local-volume-controller - to: /sds-local-volume-controller + add: /{{ $.ImageName }} + to: /{{ $.ImageName }} before: setup docker: - ENTRYPOINT: ["/sds-local-volume-controller"] + ENTRYPOINT: ["/{{ $.ImageName }}"] diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index b38ed41d..9abcdad3 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -1,26 +1,44 @@ +# Required for external analytics. Do not remove! --- -image: {{ $.ImageName }}-golang-artifact -from: {{ $.Root.BASE_GOLANG_1_23 }} +image: {{ $.ImageName }}-src-artifact +from: {{ $.Root.BASE_ALT }} final: false git: - - add: / - to: / - includePaths: - - api - - images/sds-local-volume-csi/src + - add: /images/{{ $.ImageName }}/src + to: /src/images/{{ $.ImageName }}/src + stageDependencies: + install: + - "**/*" + - add: /api + to: /src/api stageDependencies: - setup: + install: - "**/*" +shell: + install: + - echo "src artifact" + +--- +image: {{ $.ImageName }}-golang-artifact +from: {{ $.Root.BASE_GOLANG_1_23 }} +final: false + +import: + - image: {{ $.ImageName }}-src-artifact + add: / + to: / + before: setup + mount: - fromPath: ~/go-pkg-cache to: /go/pkg shell: setup: - - cd /images/sds-local-volume-csi/src/cmd - - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /sds-local-volume-csi - - chmod +x /sds-local-volume-csi + - cd /src/images/{{ $.ImageName }}/src/cmd + - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} + - chmod +x /{{ $.ImageName }} --- image: {{ $.ImageName }} @@ -28,8 +46,8 @@ from: {{ $.Root.BASE_ALT_P11 }} import: - image: {{ $.ImageName }}-golang-artifact - add: /sds-local-volume-csi - to: /sds-local-volume-csi + add: /{{ $.ImageName }} + to: /{{ $.ImageName }} before: setup shell: @@ -42,4 +60,4 @@ shell: && rm -rf /var/lib/apt/lists/* docker: - ENTRYPOINT: ["/sds-local-volume-csi"] + ENTRYPOINT: ["/{{ $.ImageName }}"] #["/sds-local-volume-csi"] diff --git a/images/sds-local-volume-scheduler-extender/src/go.mod b/images/sds-local-volume-scheduler-extender/src/go.mod index caa009b2..16255f11 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.mod +++ b/images/sds-local-volume-scheduler-extender/src/go.mod @@ -75,3 +75,4 @@ require ( ) replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 +replace github.com/deckhouse/sds-local-volume/api => ../../../api \ No newline at end of file diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 9d74be7e..87d0536a 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -1,24 +1,46 @@ {{- $csiBinaries := "/usr/bin/curl" }} +# Required for external analytics. Do not remove! --- -image: {{ $.ImageName }}-golang-artifact -from: {{ $.Root.BASE_GOLANG_1_23 }} +image: {{ $.ImageName }}-src-artifact +from: {{ $.Root.BASE_ALT }} final: false git: - - add: /images/sds-local-volume-scheduler-extender/src - to: /src + - add: /images/{{ $.ImageName }}/src + to: /src/images/{{ $.ImageName }}/src stageDependencies: - setup: + install: - "**/*" + - add: /api + to: /src/api + stageDependencies: + install: + - "**/*" + +shell: + install: + - echo "src artifact" + +--- +image: {{ $.ImageName }}-golang-artifact +from: {{ $.Root.BASE_GOLANG_1_23 }} +final: false + +import: + - image: {{ $.ImageName }}-src-artifact + add: / + to: / + before: setup + mount: - fromPath: ~/go-pkg-cache to: /go/pkg shell: setup: - - cd /src/cmd - - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o sds-local-volume-scheduler-extender - - mv sds-local-volume-scheduler-extender /sds-local-volume-scheduler-extender - - chmod +x /sds-local-volume-scheduler-extender + - cd /src/images/{{ $.ImageName }}/src/cmd + - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} +# - mv sds-local-volume-scheduler-extender /sds-local-volume-scheduler-extender + - chmod +x /{{ $.ImageName }} --- image: {{ $.ImageName }}-binaries-artifact @@ -66,8 +88,8 @@ fromImage: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact - add: /sds-local-volume-scheduler-extender - to: /sds-local-volume-scheduler-extender + add: /{{ $.ImageName }} + to: /{{ $.ImageName }} before: setup - image: {{ $.ImageName }}-binaries-artifact add: /relocate @@ -76,4 +98,4 @@ import: includePaths: - '**/*' docker: - ENTRYPOINT: ["/sds-local-volume-scheduler-extender"] + ENTRYPOINT: ["/{{ $.ImageName }}"] diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index cd95b350..918b48dc 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -1,32 +1,54 @@ +# Required for external analytics. Do not remove! --- -image: {{ $.ImageName }}-golang-artifact -from: {{ $.Root.BASE_GOLANG_1_23 }} +image: {{ $.ImageName }}-src-artifact +from: {{ $.Root.BASE_ALT }} final: false git: - - add: /images/webhooks/src - to: /src + - add: /images/{{ $.ImageName }}/src + to: /src/images/{{ $.ImageName }}/src + stageDependencies: + install: + - "**/*" + - add: /api + to: /src/api stageDependencies: - setup: + install: - "**/*" + +shell: + install: + - echo "src artifact" + +--- +image: {{ $.ImageName }}-golang-artifact +from: {{ $.Root.BASE_GOLANG_1_23 }} +final: false + +import: + - image: {{ $.ImageName }}-src-artifact + add: / + to: / + before: setup + mount: - fromPath: ~/go-pkg-cache to: /go/pkg shell: setup: - - cd /src - - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o webhooks - - mv webhooks /webhooks - - chmod +x /webhooks + - cd /src/images/{{ $.ImageName }}/src + - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} +# - mv webhooks /webhooks + - chmod +x /{{ $.ImageName }} --- image: {{ $.ImageName }} from: {{ $.Root.BASE_SCRATCH }} import: - image: {{ $.ImageName }}-golang-artifact - add: /webhooks - to: /webhooks + add: /{{ $.ImageName }} + to: /{{ $.ImageName }} before: setup docker: - ENTRYPOINT: ["/webhooks"] + ENTRYPOINT: ["/{{ $.ImageName }}"] From 871c06947ab36461b329207120255fa69cfa8b2e Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 12:21:24 +0300 Subject: [PATCH 05/30] Fix copying files depending on stages Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 3 ++- images/sds-local-volume-csi/werf.inc.yaml | 4 ++-- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 6 +++--- images/webhooks/werf.inc.yaml | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index a277d48c..b324c870 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -31,7 +31,8 @@ git: # - api # - src stageDependencies: - setup: + #setup: + install: - "**/*" mount: diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 9abcdad3..b39159f4 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -29,7 +29,7 @@ import: - image: {{ $.ImageName }}-src-artifact add: / to: / - before: setup + before: install #setup mount: - fromPath: ~/go-pkg-cache @@ -48,7 +48,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: setup + before: install #setup shell: beforeInstall: diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 87d0536a..9bab328e 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -30,7 +30,7 @@ import: - image: {{ $.ImageName }}-src-artifact add: / to: / - before: setup + before: install #setup mount: - fromPath: ~/go-pkg-cache @@ -80,7 +80,7 @@ import: - image: {{ $.ImageName }}-distroless-artifact add: /relocate to: / - before: setup + before: install #setup --- image: {{ $.ImageName }} @@ -90,7 +90,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: setup + before: install #setup - image: {{ $.ImageName }}-binaries-artifact add: /relocate to: / diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index 918b48dc..f3b8f3ce 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -29,7 +29,7 @@ import: - image: {{ $.ImageName }}-src-artifact add: / to: / - before: setup + before: install #setup mount: - fromPath: ~/go-pkg-cache @@ -48,7 +48,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: setup + before: install #setup docker: ENTRYPOINT: ["/{{ $.ImageName }}"] From a198a763f75ffef47f23a7339d8c9b0676ad16af Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 12:27:38 +0300 Subject: [PATCH 06/30] Fix golang-artifact import in controller Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index b324c870..79955ba6 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -24,16 +24,11 @@ image: {{ $.ImageName }}-golang-artifact from: {{ $.Root.BASE_GOLANG_1_23 }} final: false -git: - - add: / +import: + - image: {{ $.ImageName }}-src-artifact + add: / to: / - # includePaths: - # - api - # - src - stageDependencies: - #setup: - install: - - "**/*" + before: install #setup mount: - fromPath: ~/go-pkg-cache From 4db8e40c3f6090a23056bd5cbe36a1c6767f038a Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 15:25:02 +0300 Subject: [PATCH 07/30] Fix: BASE_ALT_DEV -> BASE_ALT Signed-off-by: Alexey Yakubov --- .werf/consts.yaml | 3 +-- images/sds-local-volume-csi/werf.inc.yaml | 1 + .../sds-local-volume-scheduler-extender/werf.inc.yaml | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.werf/consts.yaml b/.werf/consts.yaml index ca9a4cc1..d072f7f8 100644 --- a/.werf/consts.yaml +++ b/.werf/consts.yaml @@ -1,11 +1,10 @@ # base images -{{- $_ := set $ "BASE_ALT" "registry.deckhouse.io/base_images/alt:p11@sha256:e47d84424485d3674240cb2f67d3a1801b37d327e6d1eb8cc8d01be8ed3b34f3" }} +{{- $_ := set $ "BASE_ALT" "registry.deckhouse.io/base_images/alt:p10@sha256:f105773c682498700680d7cd61a702a4315c4235aee3622757591fd510fb8b4a" }} {{- $_ := 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 }} diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index b39159f4..47f85b24 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -53,6 +53,7 @@ import: shell: beforeInstall: - export DEBIAN_FRONTEND=noninteractive + - apt-get install -y make automake pkg-config gcc libtool git curl - | apt-get update \ && apt-get -y install lvm2 e2fsprogs xfsprogs \ diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 9bab328e..fd52c285 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -44,20 +44,24 @@ shell: --- image: {{ $.ImageName }}-binaries-artifact -from: {{ $.Root.BASE_ALT_DEV }} +from: {{ $.Root.BASE_ALT_P11 }} final: false shell: install: - - apt-get install curl + # Make BASE_ALT BASE_ALT_DEV + - apt-get install -y make automake pkg-config gcc libtool git curl - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate --- image: {{ $.ImageName }}-distroless-artifact -from: {{ $.Root.BASE_ALT_DEV }} +from: {{ $.Root.BASE_ALT_P11 }} final: false shell: + before install: + # Make BASE_ALT BASE_ALT_DEV + - apt-get install -y make automake pkg-config gcc libtool git curl install: - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share - cp -pr /tmp /relocate From eec67e669b5b8af8a50c69f3c802e04470036431 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 15:35:52 +0300 Subject: [PATCH 08/30] Bug fix Signed-off-by: Alexey Yakubov --- images/sds-local-volume-csi/werf.inc.yaml | 2 +- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 47f85b24..d9f25244 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -61,4 +61,4 @@ shell: && rm -rf /var/lib/apt/lists/* docker: - ENTRYPOINT: ["/{{ $.ImageName }}"] #["/sds-local-volume-csi"] + ENTRYPOINT: ["/{{ $.ImageName }}"] diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index fd52c285..43d35283 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -59,7 +59,7 @@ from: {{ $.Root.BASE_ALT_P11 }} final: false shell: - before install: + beforeInstall: # Make BASE_ALT BASE_ALT_DEV - apt-get install -y make automake pkg-config gcc libtool git curl install: From 0587295fd31d631e449a5e6c53788ccf3db7e5ee Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 16:32:31 +0300 Subject: [PATCH 09/30] ALT_DEV replacement fix Signed-off-by: Alexey Yakubov --- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 43d35283..0e2b0e5b 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -50,7 +50,7 @@ final: false shell: install: # Make BASE_ALT BASE_ALT_DEV - - apt-get install -y make automake pkg-config gcc libtool git curl + #- apt-get install -y automake pkg-config gcc libtool git curl - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate --- @@ -59,9 +59,6 @@ from: {{ $.Root.BASE_ALT_P11 }} final: false shell: - beforeInstall: - # Make BASE_ALT BASE_ALT_DEV - - apt-get install -y make automake pkg-config gcc libtool git curl install: - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share - cp -pr /tmp /relocate From 0c5c62236d1f437c2549cf2f9743c5856241877b Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 16:36:24 +0300 Subject: [PATCH 10/30] /usr/share/ca-certificates doesnt exist in ALT_p11 Signed-off-by: Alexey Yakubov --- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 0e2b0e5b..9d6b6375 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -49,8 +49,6 @@ final: false shell: install: - # Make BASE_ALT BASE_ALT_DEV - #- apt-get install -y automake pkg-config gcc libtool git curl - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate --- @@ -63,7 +61,7 @@ shell: - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share - cp -pr /tmp /relocate - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc - - cp -pr /usr/share/ca-certificates /relocate/usr/share + #- cp -pr /usr/share/ca-certificates /relocate/usr/share - cp -pr /usr/share/zoneinfo /relocate/usr/share # changed from /etc/ssl/* to ALTLinux specific - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl From c8c5ec658f6f3cfc37703662a1b8837841d17a37 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 17:45:58 +0300 Subject: [PATCH 11/30] Added: binary_replace.sh Signed-off-by: Alexey Yakubov --- .../werf.inc.yaml | 11 ++ .../additional_tools/binary_replace.sh | 129 ++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 tools/dev_images/additional_tools/binary_replace.sh diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 9d6b6375..076dc141 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -47,8 +47,19 @@ image: {{ $.ImageName }}-binaries-artifact from: {{ $.Root.BASE_ALT_P11 }} final: false +git: + - add: /tools/dev_images/additional_tools/binary_replace.sh + to: /binary_replace.sh + stageDependencies: + install: + - '**/*' + shell: install: + - apt-get update + - apt-get -y install glibc-utils mount nfs-utils + - rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial + - chmod +x /binary_replace.sh - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate --- diff --git a/tools/dev_images/additional_tools/binary_replace.sh b/tools/dev_images/additional_tools/binary_replace.sh new file mode 100644 index 00000000..eee7370c --- /dev/null +++ b/tools/dev_images/additional_tools/binary_replace.sh @@ -0,0 +1,129 @@ +#!/bin/bash + +# Copyright 2023 Flant JSC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -Eeuo pipefail +shopt -s failglob + +FILE_TEMPLATE_BINS="" +TEMPLATE_BINS="" +RDIR="" + +tools=("ldd" "readlink" "awk" "dirname" "ls" "cat") +for tool in "${tools[@]}"; do + if ! command -v "$tool" >/dev/null 2>&1; then + echo "$tool is not installed." + exit 1 + fi +done + +function Help() { + # Display Help + echo "Copy binaries and their libraries to a folder" + echo "Only one input parameter allowed (-f or -i) !!!" + echo + echo "Syntax: scriptTemplate [-h|f|i|o]" + echo "options:" + echo "f Files with paths to binaries; Support mask like /sbin/m*" + echo "i Paths to binaries separated by space; Support mask like /sbin/m*; Example: /bin/chmod /bin/mount /sbin/m*" + echo ' List of binaries should be in double quotes, -i "/bin/chmod /bin/mount" ' + echo "o Output directory (Default value: '/relocate')" + echo "h Print this help" + echo + echo +} + +while getopts ":h:i:f:o:" option; do + case $option in + h) # display Help + Help + exit;; + f) + FILE_TEMPLATE_BINS=$OPTARG + ;; + i) + TEMPLATE_BINS=$OPTARG + ;; + o) + RDIR=$OPTARG + ;; + \?) + echo "Error: Invalid option" + exit;; + esac +done + +if [[ -z $RDIR ]];then + RDIR="/relocate" +fi +mkdir -p "${RDIR}" + +function relocate() { + local binary=$1 + relocate_item ${binary} + + for lib in $(ldd ${binary} 2>/dev/null | awk '{if ($2=="=>") print $3; else print $1}'); do + # don't try to relocate linux-vdso.so lib due to this lib is virtual + if [[ "${lib}" =~ "linux-vdso" ]]; then + continue + fi + relocate_item ${lib} + done +} + +function relocate_item() { + local file=$1 + local new_place="${RDIR}$(dirname ${file})" + + mkdir -p ${new_place} + cp -a ${file} ${new_place} + + # if symlink, copy original file too + local orig_file="$(readlink -f ${file})" + if [[ "${file}" != "${orig_file}" ]]; then + cp -a ${orig_file} ${new_place} + fi +} + +function get_binary_path () { + local bin + BINARY_LIST=() + + for bin in "$@"; do + if [[ ! -f $bin ]] || [ "${bin}" == "${RDIR}" ]; then + echo "Not found $bin" + exit 1 + fi + BINARY_LIST+=$(ls -la $bin 2>/dev/null | awk '{print $9}')" " + done + + if [[ -z $BINARY_LIST ]]; then echo "No binaryes for replace"; exit 1; fi; +} + +# if get file with binaryes (-f) +if [[ -n $FILE_TEMPLATE_BINS ]] && [[ -f $FILE_TEMPLATE_BINS ]] && [[ -z $TEMPLATE_BINS ]]; then + BIN_TEMPLATE=$(cat $FILE_TEMPLATE_BINS) + get_binary_path ${BIN_TEMPLATE} +# Or get paths to bin via raw input (-i) +elif [[ -n $TEMPLATE_BINS ]] && [[ -z $FILE_TEMPLATE_BINS ]]; then + get_binary_path ${TEMPLATE_BINS} +else + Help + exit +fi + +for binary in ${BINARY_LIST[@]}; do + relocate ${binary} +done From 13cf529b7380ebb6a30077657313353f5ba1219e Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Fri, 10 Jan 2025 17:48:34 +0300 Subject: [PATCH 12/30] Removed: /usr/share/zoneinfo relocate Signed-off-by: Alexey Yakubov --- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 076dc141..57008559 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -73,7 +73,7 @@ shell: - cp -pr /tmp /relocate - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc #- cp -pr /usr/share/ca-certificates /relocate/usr/share - - cp -pr /usr/share/zoneinfo /relocate/usr/share + #- cp -pr /usr/share/zoneinfo /relocate/usr/share # changed from /etc/ssl/* to ALTLinux specific - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl - cp -pr /etc/pki/tls/certs /relocate/etc/ssl From d757bf69ebf3da8737e0d86ff9794ada620763fa Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 10:54:06 +0300 Subject: [PATCH 13/30] Fix path Signed-off-by: Alexey Yakubov --- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 57008559..052c803e 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -75,8 +75,6 @@ shell: #- cp -pr /usr/share/ca-certificates /relocate/usr/share #- cp -pr /usr/share/zoneinfo /relocate/usr/share # changed from /etc/ssl/* to ALTLinux specific - - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl - - cp -pr /etc/pki/tls/certs /relocate/etc/ssl - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd - echo "deckhouse:x:64535:" >> /relocate/etc/group - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow From 617ee9448ac4fb24cd8a3c5399927d44b53f5f66 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 11:14:06 +0300 Subject: [PATCH 14/30] Path fix 2 Signed-off-by: Alexey Yakubov --- .../sds-local-volume-scheduler-extender/werf.inc.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 052c803e..ed107a08 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -44,7 +44,7 @@ shell: --- image: {{ $.ImageName }}-binaries-artifact -from: {{ $.Root.BASE_ALT_P11 }} +from: {{ $.Root.BASE_ALT }} final: false git: @@ -64,17 +64,21 @@ shell: --- image: {{ $.ImageName }}-distroless-artifact -from: {{ $.Root.BASE_ALT_P11 }} +from: {{ $.Root.BASE_ALT }} final: false shell: install: + - apt-get update + - apt-get -y install ca-certificates - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share - cp -pr /tmp /relocate - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc - #- cp -pr /usr/share/ca-certificates /relocate/usr/share + - cp -pr /usr/share/ca-certificates /relocate/usr/share #- cp -pr /usr/share/zoneinfo /relocate/usr/share # changed from /etc/ssl/* to ALTLinux specific + - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl + - cp -pr /etc/pki/tls/certs /relocate/etc/ssl - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd - echo "deckhouse:x:64535:" >> /relocate/etc/group - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow From c899ea630737edc5a14e24830e20bd9d20526198 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 11:16:06 +0300 Subject: [PATCH 15/30] Fix curl Signed-off-by: Alexey Yakubov --- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index ed107a08..77942f1f 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -57,7 +57,7 @@ git: shell: install: - apt-get update - - apt-get -y install glibc-utils mount nfs-utils + - apt-get -y install glibc-utils mount nfs-utils curl - rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial - chmod +x /binary_replace.sh - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate From 0470f881beea3581505f30c55d0afef2fe593b12 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 11:40:58 +0300 Subject: [PATCH 16/30] Small syntax fix Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 4 ++-- images/sds-local-volume-csi/werf.inc.yaml | 4 ++-- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index 79955ba6..4eeccc77 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -28,7 +28,7 @@ import: - image: {{ $.ImageName }}-src-artifact add: / to: / - before: install #setup + before: install mount: - fromPath: ~/go-pkg-cache @@ -47,7 +47,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: setup + before: install docker: ENTRYPOINT: ["/{{ $.ImageName }}"] diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index d9f25244..01b3d5e5 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -29,7 +29,7 @@ import: - image: {{ $.ImageName }}-src-artifact add: / to: / - before: install #setup + before: install mount: - fromPath: ~/go-pkg-cache @@ -48,7 +48,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: install #setup + before: install shell: beforeInstall: diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 77942f1f..dd4bf5e9 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -30,7 +30,7 @@ import: - image: {{ $.ImageName }}-src-artifact add: / to: / - before: install #setup + before: install mount: - fromPath: ~/go-pkg-cache @@ -75,7 +75,7 @@ shell: - cp -pr /tmp /relocate - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc - cp -pr /usr/share/ca-certificates /relocate/usr/share - #- cp -pr /usr/share/zoneinfo /relocate/usr/share + # - cp -pr /usr/share/zoneinfo /relocate/usr/share # changed from /etc/ssl/* to ALTLinux specific - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl - cp -pr /etc/pki/tls/certs /relocate/etc/ssl @@ -92,7 +92,7 @@ import: - image: {{ $.ImageName }}-distroless-artifact add: /relocate to: / - before: install #setup + before: install --- image: {{ $.ImageName }} @@ -102,7 +102,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: install #setup + before: install - image: {{ $.ImageName }}-binaries-artifact add: /relocate to: / From cfbf7567229677625d5d9fde0754b561dc39fce8 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 12:27:27 +0300 Subject: [PATCH 17/30] Clarified: import path in golang-artifact Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 4 ++-- images/sds-local-volume-csi/werf.inc.yaml | 4 ++-- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 5 ++--- images/webhooks/werf.inc.yaml | 9 ++++----- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index 4eeccc77..2230e378 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -26,8 +26,8 @@ final: false import: - image: {{ $.ImageName }}-src-artifact - add: / - to: / + add: /src + to: /src before: install mount: diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 01b3d5e5..009c38ba 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -27,8 +27,8 @@ final: false import: - image: {{ $.ImageName }}-src-artifact - add: / - to: / + add: /src + to: /src before: install mount: diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index dd4bf5e9..083edad7 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -28,8 +28,8 @@ final: false import: - image: {{ $.ImageName }}-src-artifact - add: / - to: / + add: /src + to: /src before: install mount: @@ -39,7 +39,6 @@ shell: setup: - cd /src/images/{{ $.ImageName }}/src/cmd - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} -# - mv sds-local-volume-scheduler-extender /sds-local-volume-scheduler-extender - chmod +x /{{ $.ImageName }} --- diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index f3b8f3ce..93ff0ff5 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -27,9 +27,9 @@ final: false import: - image: {{ $.ImageName }}-src-artifact - add: / - to: / - before: install #setup + add: /src + to: /src + before: install mount: - fromPath: ~/go-pkg-cache @@ -38,7 +38,6 @@ shell: setup: - cd /src/images/{{ $.ImageName }}/src - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} -# - mv webhooks /webhooks - chmod +x /{{ $.ImageName }} --- image: {{ $.ImageName }} @@ -48,7 +47,7 @@ import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} - before: install #setup + before: install docker: ENTRYPOINT: ["/{{ $.ImageName }}"] From ec624ed9a56eb308fd5d28ac2e5d58f1240efa92 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 12:31:18 +0300 Subject: [PATCH 18/30] CSI final image fix Signed-off-by: Alexey Yakubov --- images/sds-local-volume-csi/werf.inc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 009c38ba..be9e433d 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -53,7 +53,7 @@ import: shell: beforeInstall: - export DEBIAN_FRONTEND=noninteractive - - apt-get install -y make automake pkg-config gcc libtool git curl + - apt-get install -y curl # make automake pkg-config gcc libtool git - | apt-get update \ && apt-get -y install lvm2 e2fsprogs xfsprogs \ From 9928ff6a78a1c130a5fef34c7ea2904ca205cac5 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 12:33:48 +0300 Subject: [PATCH 19/30] One more CSI fix - apt update added Signed-off-by: Alexey Yakubov --- images/sds-local-volume-csi/werf.inc.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index be9e433d..85ef93cd 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -53,10 +53,10 @@ import: shell: beforeInstall: - export DEBIAN_FRONTEND=noninteractive + - apt-get update - apt-get install -y curl # make automake pkg-config gcc libtool git - | - apt-get update \ - && apt-get -y install lvm2 e2fsprogs xfsprogs \ + apt-get -y install lvm2 e2fsprogs xfsprogs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 3481b8eb96b4cd6c3ddfca2e325f34ca9c987a63 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 13:37:09 +0300 Subject: [PATCH 20/30] Upgraded: golang x/net up to 0.33.0 Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/src/go.mod | 9 +++++---- images/sds-local-volume-controller/src/go.sum | 16 +++++++-------- images/sds-local-volume-csi/src/go.mod | 10 +++++----- images/sds-local-volume-csi/src/go.sum | 20 +++++++++---------- .../src/go.mod | 11 +++++----- .../src/go.sum | 18 ++++++++--------- images/webhooks/src/go.mod | 8 ++++---- images/webhooks/src/go.sum | 16 +++++++-------- 8 files changed, 54 insertions(+), 54 deletions(-) diff --git a/images/sds-local-volume-controller/src/go.mod b/images/sds-local-volume-controller/src/go.mod index 8b2dd43d..4a30148a 100644 --- a/images/sds-local-volume-controller/src/go.mod +++ b/images/sds-local-volume-controller/src/go.mod @@ -57,11 +57,11 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.22.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect @@ -76,4 +76,5 @@ require ( ) replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 + replace github.com/deckhouse/sds-local-volume/api => ../../../api diff --git a/images/sds-local-volume-controller/src/go.sum b/images/sds-local-volume-controller/src/go.sum index bf80a0fd..092c15d6 100644 --- a/images/sds-local-volume-controller/src/go.sum +++ b/images/sds-local-volume-controller/src/go.sum @@ -119,8 +119,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -129,14 +129,14 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/images/sds-local-volume-csi/src/go.mod b/images/sds-local-volume-csi/src/go.mod index 6ea14af9..b1269029 100644 --- a/images/sds-local-volume-csi/src/go.mod +++ b/images/sds-local-volume-csi/src/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - golang.org/x/sync v0.8.0 + golang.org/x/sync v0.10.0 google.golang.org/grpc v1.66.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.31.0 @@ -52,11 +52,11 @@ require ( github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.6.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/images/sds-local-volume-csi/src/go.sum b/images/sds-local-volume-csi/src/go.sum index 6c8e65fc..3382f538 100644 --- a/images/sds-local-volume-csi/src/go.sum +++ b/images/sds-local-volume-csi/src/go.sum @@ -111,27 +111,27 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/images/sds-local-volume-scheduler-extender/src/go.mod b/images/sds-local-volume-scheduler-extender/src/go.mod index 16255f11..ce0108ec 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.mod +++ b/images/sds-local-volume-scheduler-extender/src/go.mod @@ -56,11 +56,11 @@ require ( github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect - golang.org/x/net v0.28.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.6.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.34.2 // indirect @@ -75,4 +75,5 @@ require ( ) replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 -replace github.com/deckhouse/sds-local-volume/api => ../../../api \ No newline at end of file + +replace github.com/deckhouse/sds-local-volume/api => ../../../api diff --git a/images/sds-local-volume-scheduler-extender/src/go.sum b/images/sds-local-volume-scheduler-extender/src/go.sum index 8d429953..cc430b1c 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.sum +++ b/images/sds-local-volume-scheduler-extender/src/go.sum @@ -7,8 +7,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckhouse/sds-local-volume/api v0.0.0-20241030133552-b9f48131ef9f h1:7jnAEWU8u4D2LdJV3NjRF8sSBfDvy19886tFykt0fP0= -github.com/deckhouse/sds-local-volume/api v0.0.0-20241030133552-b9f48131ef9f/go.mod h1:cYxHYJmIl6g9lXb1etqmLeQL/vsPMgscmact/FObd+U= github.com/deckhouse/sds-node-configurator/api v0.0.0-20241205120718-db6ffba1689b h1:7/31qbj61tdToVqc1P5seXHT2xNbx0gO1Ifza4nsxgk= github.com/deckhouse/sds-node-configurator/api v0.0.0-20241205120718-db6ffba1689b/go.mod h1:ROmrnlcAdtYX8HPb0pe1qsnmISpy5FSW5fn2n67JOoE= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= @@ -127,8 +125,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -137,14 +135,14 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/images/webhooks/src/go.mod b/images/webhooks/src/go.mod index a0ca7fa1..a1a388bb 100644 --- a/images/webhooks/src/go.mod +++ b/images/webhooks/src/go.mod @@ -39,11 +39,11 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.19.0 // indirect - golang.org/x/sys v0.21.0 // indirect - golang.org/x/term v0.21.0 // indirect - golang.org/x/text v0.16.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/images/webhooks/src/go.sum b/images/webhooks/src/go.sum index 8d29a6a8..f883f6bd 100644 --- a/images/webhooks/src/go.sum +++ b/images/webhooks/src/go.sum @@ -107,8 +107,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.19.0 h1:9+E/EZBCbTLNrbN35fHv/a/d/mOBatymz1zbtQrXpIg= golang.org/x/oauth2 v0.19.0/go.mod h1:vYi7skDa1x015PmRRYZ7+s1cWyPgrPiSYRe4rnsexc8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -118,14 +118,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 709a3c9be911f2ba7ff1c51b7808986cbabeb153 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 13:40:20 +0300 Subject: [PATCH 21/30] golang/x/net upgraded up to 0.33.0 in api Signed-off-by: Alexey Yakubov --- api/go.mod | 4 ++-- api/go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/api/go.mod b/api/go.mod index 902fd82c..4e37c392 100644 --- a/api/go.mod +++ b/api/go.mod @@ -11,8 +11,8 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/text v0.21.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/klog/v2 v2.120.1 // indirect diff --git a/api/go.sum b/api/go.sum index f4573374..8a599564 100644 --- a/api/go.sum +++ b/api/go.sum @@ -39,8 +39,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -49,8 +49,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= From 3190f2d2ac3e22816a5bfcd7ab66e50922e5389b Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Mon, 13 Jan 2025 16:31:02 +0300 Subject: [PATCH 22/30] Added: docker user directive Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 1 + images/sds-local-volume-csi/werf.inc.yaml | 1 + images/sds-local-volume-scheduler-extender/werf.inc.yaml | 1 + images/webhooks/werf.inc.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index 2230e378..d59d2946 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -51,3 +51,4 @@ import: docker: ENTRYPOINT: ["/{{ $.ImageName }}"] + USER: deckhouse:deckhouse diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 85ef93cd..15d4e5a8 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -62,3 +62,4 @@ shell: docker: ENTRYPOINT: ["/{{ $.ImageName }}"] + USER: deckhouse:deckhouse diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 083edad7..db1d5bad 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -110,3 +110,4 @@ import: - '**/*' docker: ENTRYPOINT: ["/{{ $.ImageName }}"] + USER: deckhouse:deckhouse diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index 93ff0ff5..01df2459 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -51,3 +51,4 @@ import: docker: ENTRYPOINT: ["/{{ $.ImageName }}"] + USER: deckhouse:deckhouse From f3b60686daaa2fb4bf9c7422ae421f2af3aced41 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Tue, 14 Jan 2025 11:37:26 +0300 Subject: [PATCH 23/30] Distroless, binaries artifacts and distroless images have been added Signed-off-by: Alexey Yakubov --- .../sds-local-volume-controller/werf.inc.yaml | 61 ++++++++++++++++++- images/sds-local-volume-csi/werf.inc.yaml | 61 ++++++++++++++++++- .../werf.inc.yaml | 6 +- images/webhooks/werf.inc.yaml | 61 ++++++++++++++++++- 4 files changed, 183 insertions(+), 6 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index d59d2946..bc77986c 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -39,15 +39,74 @@ shell: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} - chmod +x /{{ $.ImageName }} + --- -image: {{ $.ImageName }} +image: {{ $.ImageName }}-binaries-artifact +from: {{ $.Root.BASE_ALT }} +final: false + +git: + - add: /tools/dev_images/additional_tools/binary_replace.sh + to: /binary_replace.sh + stageDependencies: + install: + - '**/*' + +shell: + install: + - apt-get update + - apt-get -y install glibc-utils mount nfs-utils curl + - rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial + - chmod +x /binary_replace.sh + - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate + +--- +image: {{ $.ImageName }}-distroless-artifact +from: {{ $.Root.BASE_ALT }} +final: false + +shell: + install: + - apt-get update + - apt-get -y install ca-certificates tzdata + - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share + - cp -pr /tmp /relocate + - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc + - cp -pr /usr/share/ca-certificates /relocate/usr/share + - cp -pr /usr/share/zoneinfo /relocate/usr/share + # changed from /etc/ssl/* to ALTLinux specific + - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl + - cp -pr /etc/pki/tls/certs /relocate/etc/ssl + - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd + - echo "deckhouse:x:64535:" >> /relocate/etc/group + - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow + +--- +image: {{ $.ImageName }}-distroless from: {{ $.Root.BASE_SCRATCH }} +final: false + +import: + - image: {{ $.ImageName }}-distroless-artifact + add: /relocate + to: / + before: install + +--- +image: {{ $.ImageName }} +from: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} before: install + - image: {{ $.ImageName }}-binaries-artifact + add: /relocate + to: / + before: install + includePaths: + - '**/*' docker: ENTRYPOINT: ["/{{ $.ImageName }}"] diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 15d4e5a8..c0a2808f 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -40,15 +40,74 @@ shell: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} - chmod +x /{{ $.ImageName }} +--- +image: {{ $.ImageName }}-binaries-artifact +from: {{ $.Root.BASE_ALT }} +final: false + +git: + - add: /tools/dev_images/additional_tools/binary_replace.sh + to: /binary_replace.sh + stageDependencies: + install: + - '**/*' + +shell: + install: + - apt-get update + - apt-get -y install glibc-utils mount nfs-utils curl + - rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial + - chmod +x /binary_replace.sh + - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate + +--- +image: {{ $.ImageName }}-distroless-artifact +from: {{ $.Root.BASE_ALT }} +final: false + +shell: + install: + - apt-get update + - apt-get -y install ca-certificates tzdata + - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share + - cp -pr /tmp /relocate + - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc + - cp -pr /usr/share/ca-certificates /relocate/usr/share + - cp -pr /usr/share/zoneinfo /relocate/usr/share + # changed from /etc/ssl/* to ALTLinux specific + - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl + - cp -pr /etc/pki/tls/certs /relocate/etc/ssl + - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd + - echo "deckhouse:x:64535:" >> /relocate/etc/group + - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow + +--- +image: {{ $.ImageName }}-distroless +from: {{ $.Root.BASE_SCRATCH }} +final: false + +import: + - image: {{ $.ImageName }}-distroless-artifact + add: /relocate + to: / + before: install + + --- image: {{ $.ImageName }} -from: {{ $.Root.BASE_ALT_P11 }} +from: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} before: install + - image: {{ $.ImageName }}-binaries-artifact + add: /relocate + to: / + before: install + includePaths: + - '**/*' shell: beforeInstall: diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index db1d5bad..86b0443d 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -69,12 +69,12 @@ final: false shell: install: - apt-get update - - apt-get -y install ca-certificates + - apt-get -y install ca-certificates tzdata - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share - cp -pr /tmp /relocate - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc - cp -pr /usr/share/ca-certificates /relocate/usr/share - # - cp -pr /usr/share/zoneinfo /relocate/usr/share + - cp -pr /usr/share/zoneinfo /relocate/usr/share # changed from /etc/ssl/* to ALTLinux specific - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl - cp -pr /etc/pki/tls/certs /relocate/etc/ssl @@ -95,7 +95,7 @@ import: --- image: {{ $.ImageName }} -fromImage: {{ $.ImageName }}-distroless +from: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index 01df2459..0bf9d487 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -39,15 +39,74 @@ shell: - cd /src/images/{{ $.ImageName }}/src - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} - chmod +x /{{ $.ImageName }} + --- -image: {{ $.ImageName }} +image: {{ $.ImageName }}-binaries-artifact +from: {{ $.Root.BASE_ALT }} +final: false + +git: + - add: /tools/dev_images/additional_tools/binary_replace.sh + to: /binary_replace.sh + stageDependencies: + install: + - '**/*' + +shell: + install: + - apt-get update + - apt-get -y install glibc-utils mount nfs-utils curl + - rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial + - chmod +x /binary_replace.sh + - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate + +--- +image: {{ $.ImageName }}-distroless-artifact +from: {{ $.Root.BASE_ALT }} +final: false + +shell: + install: + - apt-get update + - apt-get -y install ca-certificates tzdata + - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share + - cp -pr /tmp /relocate + - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc + - cp -pr /usr/share/ca-certificates /relocate/usr/share + - cp -pr /usr/share/zoneinfo /relocate/usr/share + # changed from /etc/ssl/* to ALTLinux specific + - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl + - cp -pr /etc/pki/tls/certs /relocate/etc/ssl + - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd + - echo "deckhouse:x:64535:" >> /relocate/etc/group + - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow + +--- +image: {{ $.ImageName }}-distroless from: {{ $.Root.BASE_SCRATCH }} +final: false + +import: + - image: {{ $.ImageName }}-distroless-artifact + add: /relocate + to: / + before: install + +--- +image: {{ $.ImageName }} +from: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} before: install + - image: {{ $.ImageName }}-binaries-artifact + add: /relocate + to: / + before: install + includePaths: + - '**/*' docker: ENTRYPOINT: ["/{{ $.ImageName }}"] From 081d31534a72de4041642b47fa7eb9fb73f533f9 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Tue, 14 Jan 2025 11:41:06 +0300 Subject: [PATCH 24/30] csiBinary fixed everywhere Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 2 ++ images/sds-local-volume-csi/werf.inc.yaml | 1 + images/webhooks/werf.inc.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index bc77986c..92830092 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -1,3 +1,5 @@ +{{- $csiBinaries := "/usr/bin/curl" }} +# Required for external analytics. Do not remove! --- image: {{ $.ImageName }}-src-artifact from: {{ $.Root.BASE_ALT }} diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index c0a2808f..255650e0 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -1,3 +1,4 @@ +{{- $csiBinaries := "/usr/bin/curl" }} # Required for external analytics. Do not remove! --- image: {{ $.ImageName }}-src-artifact diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index 0bf9d487..a5b56547 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -1,3 +1,4 @@ +{{- $csiBinaries := "/usr/bin/curl" }} # Required for external analytics. Do not remove! --- image: {{ $.ImageName }}-src-artifact From 4231f18b62d39c26eef66da0b651179fd37ef0f9 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Tue, 14 Jan 2025 11:49:47 +0300 Subject: [PATCH 25/30] Final images - fromImage Signed-off-by: Alexey Yakubov --- images/sds-local-volume-controller/werf.inc.yaml | 2 +- images/sds-local-volume-csi/werf.inc.yaml | 2 +- images/sds-local-volume-scheduler-extender/werf.inc.yaml | 2 +- images/webhooks/werf.inc.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/sds-local-volume-controller/werf.inc.yaml b/images/sds-local-volume-controller/werf.inc.yaml index 92830092..5e672249 100644 --- a/images/sds-local-volume-controller/werf.inc.yaml +++ b/images/sds-local-volume-controller/werf.inc.yaml @@ -96,7 +96,7 @@ import: --- image: {{ $.ImageName }} -from: {{ $.ImageName }}-distroless +fromImage: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 255650e0..53eb6399 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -96,7 +96,7 @@ import: --- image: {{ $.ImageName }} -from: {{ $.ImageName }}-distroless +fromImage: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact diff --git a/images/sds-local-volume-scheduler-extender/werf.inc.yaml b/images/sds-local-volume-scheduler-extender/werf.inc.yaml index 86b0443d..3909b850 100644 --- a/images/sds-local-volume-scheduler-extender/werf.inc.yaml +++ b/images/sds-local-volume-scheduler-extender/werf.inc.yaml @@ -95,7 +95,7 @@ import: --- image: {{ $.ImageName }} -from: {{ $.ImageName }}-distroless +fromImage: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact diff --git a/images/webhooks/werf.inc.yaml b/images/webhooks/werf.inc.yaml index a5b56547..81ec20c0 100644 --- a/images/webhooks/werf.inc.yaml +++ b/images/webhooks/werf.inc.yaml @@ -95,7 +95,7 @@ import: --- image: {{ $.ImageName }} -from: {{ $.ImageName }}-distroless +fromImage: {{ $.ImageName }}-distroless import: - image: {{ $.ImageName }}-golang-artifact From 66f8f93f79cc8caab93f71137bb4a90ed4250512 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Tue, 14 Jan 2025 12:03:52 +0300 Subject: [PATCH 26/30] CSI - use ALT_P11 images for final Signed-off-by: Alexey Yakubov --- images/sds-local-volume-csi/werf.inc.yaml | 65 ++--------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 53eb6399..4414716f 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -1,4 +1,3 @@ -{{- $csiBinaries := "/usr/bin/curl" }} # Required for external analytics. Do not remove! --- image: {{ $.ImageName }}-src-artifact @@ -41,74 +40,15 @@ shell: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w" -o /{{ $.ImageName }} - chmod +x /{{ $.ImageName }} ---- -image: {{ $.ImageName }}-binaries-artifact -from: {{ $.Root.BASE_ALT }} -final: false - -git: - - add: /tools/dev_images/additional_tools/binary_replace.sh - to: /binary_replace.sh - stageDependencies: - install: - - '**/*' - -shell: - install: - - apt-get update - - apt-get -y install glibc-utils mount nfs-utils curl - - rm -rf /var/lib/apt/lists/* /var/cache/apt/* && mkdir -p /var/lib/apt/lists/partial /var/cache/apt/archives/partial - - chmod +x /binary_replace.sh - - /binary_replace.sh -i "{{ $csiBinaries }}" -o /relocate - ---- -image: {{ $.ImageName }}-distroless-artifact -from: {{ $.Root.BASE_ALT }} -final: false - -shell: - install: - - apt-get update - - apt-get -y install ca-certificates tzdata - - mkdir -p /relocate/bin /relocate/sbin /relocate/etc /relocate/etc/ssl /relocate/usr/bin /relocate/usr/sbin /relocate/usr/share - - cp -pr /tmp /relocate - - cp -pr /etc/passwd /etc/group /etc/hostname /etc/hosts /etc/shadow /etc/protocols /etc/services /etc/nsswitch.conf /relocate/etc - - cp -pr /usr/share/ca-certificates /relocate/usr/share - - cp -pr /usr/share/zoneinfo /relocate/usr/share - # changed from /etc/ssl/* to ALTLinux specific - - cp -pr /etc/pki/tls/cert.pem /relocate/etc/ssl - - cp -pr /etc/pki/tls/certs /relocate/etc/ssl - - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd - - echo "deckhouse:x:64535:" >> /relocate/etc/group - - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow - ---- -image: {{ $.ImageName }}-distroless -from: {{ $.Root.BASE_SCRATCH }} -final: false - -import: - - image: {{ $.ImageName }}-distroless-artifact - add: /relocate - to: / - before: install - - --- image: {{ $.ImageName }} -fromImage: {{ $.ImageName }}-distroless +from: {{ $.Root.BASE_ALT_P11 }} import: - image: {{ $.ImageName }}-golang-artifact add: /{{ $.ImageName }} to: /{{ $.ImageName }} before: install - - image: {{ $.ImageName }}-binaries-artifact - add: /relocate - to: / - before: install - includePaths: - - '**/*' shell: beforeInstall: @@ -119,6 +59,9 @@ shell: apt-get -y install lvm2 e2fsprogs xfsprogs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* + - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd + - echo "deckhouse:x:64535:" >> /relocate/etc/group + - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow docker: ENTRYPOINT: ["/{{ $.ImageName }}"] From b2600b5c1c89a79179ad5c277d68509479006ad3 Mon Sep 17 00:00:00 2001 From: Alexey Yakubov Date: Tue, 14 Jan 2025 12:06:34 +0300 Subject: [PATCH 27/30] CSI path fix Signed-off-by: Alexey Yakubov --- images/sds-local-volume-csi/werf.inc.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index 4414716f..ac705d1a 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -54,14 +54,14 @@ shell: beforeInstall: - export DEBIAN_FRONTEND=noninteractive - apt-get update - - apt-get install -y curl # make automake pkg-config gcc libtool git + - apt-get install -y curl - | apt-get -y install lvm2 e2fsprogs xfsprogs \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* - - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /relocate/etc/passwd - - echo "deckhouse:x:64535:" >> /relocate/etc/group - - echo "deckhouse:!::0:::::" >> /relocate/etc/shadow + - echo "deckhouse:x:64535:64535:deckhouse:/:/sbin/nologin" >> /etc/passwd + - echo "deckhouse:x:64535:" >> /etc/group + - echo "deckhouse:!::0:::::" >> /etc/shadow docker: ENTRYPOINT: ["/{{ $.ImageName }}"] From 0885736aca190e2a7ccdae16bee1c1c49caac9d9 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Tue, 14 Jan 2025 17:52:15 +0300 Subject: [PATCH 28/30] bump go ver Signed-off-by: Aleksandr Zimin --- .werf/consts.yaml | 2 +- images/sds-local-volume-controller/src/go.mod | 2 +- images/sds-local-volume-csi/src/go.mod | 2 +- images/sds-local-volume-scheduler-extender/src/go.mod | 2 +- images/webhooks/src/go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.werf/consts.yaml b/.werf/consts.yaml index d072f7f8..ea9d8aad 100644 --- a/.werf/consts.yaml +++ b/.werf/consts.yaml @@ -2,7 +2,7 @@ {{- $_ := set $ "BASE_ALT" "registry.deckhouse.io/base_images/alt:p10@sha256:f105773c682498700680d7cd61a702a4315c4235aee3622757591fd510fb8b4a" }} {{- $_ := 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_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.4-bookworm@sha256:a9147a48ac5e925a66764afae7cf4b1cfd37a6e94ad7519eca74c1fd8993ae45" }} {{- $_ := set $ "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }} # component versions diff --git a/images/sds-local-volume-controller/src/go.mod b/images/sds-local-volume-controller/src/go.mod index 4a30148a..79d1ad78 100644 --- a/images/sds-local-volume-controller/src/go.mod +++ b/images/sds-local-volume-controller/src/go.mod @@ -1,6 +1,6 @@ module sds-local-volume-controller -go 1.22.2 +go 1.23.4 require ( github.com/deckhouse/sds-local-volume/api v0.0.0-20241030133552-b9f48131ef9f diff --git a/images/sds-local-volume-csi/src/go.mod b/images/sds-local-volume-csi/src/go.mod index b1269029..e8c81f86 100644 --- a/images/sds-local-volume-csi/src/go.mod +++ b/images/sds-local-volume-csi/src/go.mod @@ -1,6 +1,6 @@ module sds-local-volume-csi -go 1.22.3 +go 1.23.4 require ( github.com/container-storage-interface/spec v1.10.0 diff --git a/images/sds-local-volume-scheduler-extender/src/go.mod b/images/sds-local-volume-scheduler-extender/src/go.mod index ce0108ec..0a646e64 100644 --- a/images/sds-local-volume-scheduler-extender/src/go.mod +++ b/images/sds-local-volume-scheduler-extender/src/go.mod @@ -1,6 +1,6 @@ module sds-local-volume-scheduler-extender -go 1.22.2 +go 1.23.4 require ( github.com/deckhouse/sds-local-volume/api v0.0.0-20241030133552-b9f48131ef9f diff --git a/images/webhooks/src/go.mod b/images/webhooks/src/go.mod index a1a388bb..9fc49b9c 100644 --- a/images/webhooks/src/go.mod +++ b/images/webhooks/src/go.mod @@ -1,6 +1,6 @@ module webhooks -go 1.22.3 +go 1.23.4 require ( github.com/deckhouse/sds-local-volume/api v0.0.0-20241030133552-b9f48131ef9f From dde587229985e762d5c40304e646887c42547ff0 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Tue, 14 Jan 2025 17:53:34 +0300 Subject: [PATCH 29/30] bump go ver2 Signed-off-by: Aleksandr Zimin --- api/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/go.mod b/api/go.mod index 4e37c392..bc3742de 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/deckhouse/sds-local-volume/api -go 1.22.2 +go 1.23.4 require k8s.io/apimachinery v0.30.2 From df3b5fd5272bef3b6d02ab74a8bb95dfc6acc306 Mon Sep 17 00:00:00 2001 From: Aleksandr Zimin Date: Tue, 14 Jan 2025 18:08:02 +0300 Subject: [PATCH 30/30] fix alt p11 Signed-off-by: Aleksandr Zimin --- .werf/consts.yaml | 2 +- images/sds-local-volume-csi/werf.inc.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werf/consts.yaml b/.werf/consts.yaml index ea9d8aad..c6277108 100644 --- a/.werf/consts.yaml +++ b/.werf/consts.yaml @@ -1,7 +1,7 @@ # base images {{- $_ := set $ "BASE_ALT" "registry.deckhouse.io/base_images/alt:p10@sha256:f105773c682498700680d7cd61a702a4315c4235aee3622757591fd510fb8b4a" }} {{- $_ := 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_ALT_P11" "registry.deckhouse.io/base_images/alt:p11@sha256:e47d84424485d3674240cb2f67d3a1801b37d327e6d1eb8cc8d01be8ed3b34f3" }} {{- $_ := set $ "BASE_GOLANG_1_23" "registry.deckhouse.io/base_images/golang:1.23.4-bookworm@sha256:a9147a48ac5e925a66764afae7cf4b1cfd37a6e94ad7519eca74c1fd8993ae45" }} {{- $_ := set $ "BASE_SCRATCH" "registry.deckhouse.io/base_images/scratch@sha256:653ae76965c98c8cd1c8c9ff7725316d2983986f896655b30e0f44d2f8b2dd7e" }} diff --git a/images/sds-local-volume-csi/werf.inc.yaml b/images/sds-local-volume-csi/werf.inc.yaml index ac705d1a..439eb9a3 100644 --- a/images/sds-local-volume-csi/werf.inc.yaml +++ b/images/sds-local-volume-csi/werf.inc.yaml @@ -1,7 +1,7 @@ # Required for external analytics. Do not remove! --- image: {{ $.ImageName }}-src-artifact -from: {{ $.Root.BASE_ALT }} +from: {{ $.Root.BASE_ALT_P11 }} final: false git: