-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/feat/common-module-upgrade'
- Loading branch information
Showing
23 changed files
with
1,468 additions
and
222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,34 +6,37 @@ | |
| image: {{ $.ModuleName }}/{{ $.ImageName }}-{{ $version | replace "." "-" }} | ||
| fromImage: common/distroless | ||
| import: | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| add: /csi-attacher | ||
| to: /csi-attacher | ||
| before: setup | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| add: /csi-attacher | ||
| to: /csi-attacher | ||
| before: setup | ||
| docker: | ||
| ENTRYPOINT: ["/csi-attacher"] | ||
| --- | ||
| artifact: {{ $.ModuleName }}/{{ $.ImageName }}-src-artifact-{{ $version | replace "." "-" }} | ||
| fromArtifact: common/src-artifact | ||
| shell: | ||
| install: | ||
| - git clone --depth 1 --branch {{ $value.csi.attacher }} {{ $.SOURCE_REPO }}/kubernetes-csi/external-attacher.git /src | ||
| - rm -r /src/.git | ||
| --- | ||
| artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| {{- if semverCompare ">=1.30" $version }} | ||
| from: {{ $.Images.BASE_GOLANG_22_ALPINE_DEV }} | ||
| {{- else }} | ||
| from: {{ $.Images.BASE_GOLANG_21_ALPINE_DEV }} | ||
| {{- end }} | ||
| from: {{ $.Images.BASE_GOLANG_23_ALPINE }} | ||
| import: | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-src-artifact-{{ $version | replace "." "-" }} | ||
| add: /src | ||
| to: /src | ||
| before: install | ||
| shell: | ||
| beforeInstall: | ||
| - git clone --depth 1 --branch {{ $value.csi.attacher }} {{ $.SOURCE_REPO }}/kubernetes-csi/external-attacher.git /src | ||
| {{- include "alpine packages proxy" $ | nindent 2 }} | ||
| - apk add --no-cache make bash | ||
| install: | ||
| - export GO_VERSION=${GOLANG_VERSION} GOPROXY={{ $.GOPROXY }} CGO_ENABLED=0 GOOS=linux GOARCH=amd64 | ||
| - cd /src | ||
| {{- if semverCompare "<1.29" $version }} | ||
| - go get golang.org/x/[email protected] | ||
| - go get google.golang.org/[email protected] | ||
| - go mod tidy | ||
| - go mod vendor | ||
| {{- end }} | ||
| - make build | ||
| - cp bin/csi-attacher /csi-attacher | ||
| - chown 64535:64535 /csi-attacher | ||
| - chmod 0755 /csi-attacher | ||
| - export GO_VERSION=${GOLANG_VERSION} GOPROXY={{ $.GOPROXY }} CGO_ENABLED=0 GOOS=linux GOARCH=amd64 | ||
| - cd /src | ||
| - make build | ||
| - cp bin/csi-attacher /csi-attacher | ||
| - chown 64535:64535 /csi-attacher | ||
| - chmod 0755 /csi-attacher | ||
| {{- end }} | ||
| {{- end }} | ||
146 changes: 146 additions & 0 deletions
146
modules/000-common/images/csi-external-provisioner/patches/v5.1.0/001-go-mod.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| diff --git a/go.mod b/go.mod | ||
| index cd5517e..84bccbf 100644 | ||
| --- a/go.mod | ||
| +++ b/go.mod | ||
| @@ -1,6 +1,6 @@ | ||
| module github.com/kubernetes-csi/external-provisioner/v5 | ||
|
|
||
| -go 1.22.5 | ||
| +go 1.23 | ||
|
|
||
| require ( | ||
| github.com/container-storage-interface/spec v1.9.0 | ||
| @@ -16,7 +16,7 @@ require ( | ||
| github.com/spf13/pflag v1.0.5 | ||
| github.com/stretchr/testify v1.9.0 | ||
| google.golang.org/grpc v1.65.0 | ||
| - google.golang.org/protobuf v1.34.2 | ||
| + google.golang.org/protobuf v1.35.1 | ||
| k8s.io/api v0.31.0 | ||
| k8s.io/apimachinery v0.31.0 | ||
| k8s.io/apiserver v0.31.0 | ||
| @@ -81,7 +81,7 @@ require ( | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect | ||
| github.com/opencontainers/go-digest v1.0.0 // indirect | ||
| - github.com/opencontainers/runc v1.1.13 // indirect | ||
| + github.com/opencontainers/runc v1.1.14 // indirect | ||
| github.com/opencontainers/runtime-spec v1.2.0 // indirect | ||
| github.com/opencontainers/selinux v1.11.0 // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| @@ -107,17 +107,17 @@ require ( | ||
| go.opentelemetry.io/proto/otlp v1.3.1 // indirect | ||
| go.uber.org/multierr v1.11.0 // indirect | ||
| go.uber.org/zap v1.27.0 // indirect | ||
| - golang.org/x/crypto v0.26.0 // indirect | ||
| - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect | ||
| - golang.org/x/mod v0.20.0 // indirect | ||
| - golang.org/x/net v0.28.0 // indirect | ||
| + golang.org/x/crypto v0.28.0 // indirect | ||
| + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect | ||
| + golang.org/x/mod v0.21.0 // indirect | ||
| + golang.org/x/net v0.30.0 // indirect | ||
| golang.org/x/oauth2 v0.22.0 // indirect | ||
| golang.org/x/sync v0.8.0 // indirect | ||
| - golang.org/x/sys v0.23.0 // indirect | ||
| - golang.org/x/term v0.23.0 // indirect | ||
| - golang.org/x/text v0.17.0 // indirect | ||
| + golang.org/x/sys v0.26.0 // indirect | ||
| + golang.org/x/term v0.25.0 // indirect | ||
| + golang.org/x/text v0.19.0 // indirect | ||
| golang.org/x/time v0.6.0 // indirect | ||
| - golang.org/x/tools v0.24.0 // indirect | ||
| + golang.org/x/tools v0.26.0 // indirect | ||
| google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect | ||
| diff --git a/go.sum b/go.sum | ||
| index 64d994a..b516929 100644 | ||
| --- a/go.sum | ||
| +++ b/go.sum | ||
| @@ -140,8 +140,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= | ||
| github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= | ||
| github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= | ||
| github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= | ||
| -github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= | ||
| -github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= | ||
| +github.com/opencontainers/runc v1.1.14 h1:rgSuzbmgz5DUJjeSnw337TxDbRuqjs6iqQck/2weR6w= | ||
| +github.com/opencontainers/runc v1.1.14/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA= | ||
| github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= | ||
| github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= | ||
| github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= | ||
| @@ -234,22 +234,22 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= | ||
| golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= | ||
| golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= | ||
| golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= | ||
| -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= | ||
| -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= | ||
| -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= | ||
| -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= | ||
| +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= | ||
| +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= | ||
| +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= | ||
| +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= | ||
| golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||
| golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||
| golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= | ||
| -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= | ||
| -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= | ||
| +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= | ||
| +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= | ||
| golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= | ||
| 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.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= | ||
| -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.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= | ||
| +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= | ||
| 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= | ||
| @@ -265,15 +265,15 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w | ||
| golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | ||
| golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
| golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
| -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= | ||
| -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||
| +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= | ||
| +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||
| golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= | ||
| -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/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= | ||
| +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= | ||
| 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.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= | ||
| +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= | ||
| 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= | ||
| @@ -281,8 +281,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn | ||
| golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= | ||
| golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= | ||
| golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= | ||
| -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= | ||
| -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= | ||
| +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= | ||
| +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= | ||
| golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||
| golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= | ||
| @@ -295,8 +295,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1: | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= | ||
| google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= | ||
| google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= | ||
| -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= | ||
| -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= | ||
| +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= | ||
| +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= | ||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||
| gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= | ||
| gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,35 +6,46 @@ | |
| image: {{ $.ModuleName }}/{{ $.ImageName }}-{{ $version | replace "." "-" }} | ||
| fromImage: common/distroless | ||
| import: | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| add: /csi-provisioner | ||
| to: /csi-provisioner | ||
| before: setup | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| add: /csi-provisioner | ||
| to: /csi-provisioner | ||
| before: setup | ||
| docker: | ||
| ENTRYPOINT: ["/csi-provisioner"] | ||
| --- | ||
| artifact: {{ $.ModuleName }}/{{ $.ImageName }}-src-artifact-{{ $version | replace "." "-" }} | ||
| fromArtifact: common/src-artifact | ||
| git: | ||
| - add: /{{ $.ModulePath }}modules/000-{{ $.ModuleName }}/images/{{ $.ImageName }}/patches | ||
| to: /patches | ||
| stageDependencies: | ||
| install: | ||
| - '**/*' | ||
| shell: | ||
| install: | ||
| - git clone --depth 1 --branch {{ $value.csi.provisioner }} {{ $.SOURCE_REPO }}/kubernetes-csi/external-provisioner.git /src | ||
| - cd /src | ||
| - test -d "/patches/{{ $value.csi.provisioner }}" && git apply /patches/{{ $value.csi.provisioner }}/*.patch --verbose | ||
| - rm -r vendor | ||
| - rm -r .git | ||
| --- | ||
| artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| {{- if semverCompare ">=1.30" $version }} | ||
| from: {{ $.Images.BASE_GOLANG_22_ALPINE_DEV }} | ||
| {{- else }} | ||
| from: {{ $.Images.BASE_GOLANG_21_ALPINE_DEV }} | ||
| {{- end }} | ||
| from: {{ $.Images.BASE_GOLANG_23_ALPINE }} | ||
| import: | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-src-artifact-{{ $version | replace "." "-" }} | ||
| add: /src | ||
| to: /src | ||
| before: install | ||
| shell: | ||
| beforeInstall: | ||
| - git clone --depth 1 --branch {{ $value.csi.provisioner }} {{ $.SOURCE_REPO }}/kubernetes-csi/external-provisioner.git /src | ||
| {{- include "alpine packages proxy" $ | nindent 2 }} | ||
| - apk add --no-cache make bash git | ||
| install: | ||
| - export GO_VERSION=${GOLANG_VERSION} GOPROXY={{ $.GOPROXY }} CGO_ENABLED=0 GOOS=linux GOARCH=amd64 | ||
| - cd /src | ||
| {{- if semverCompare "<1.29" $version }} | ||
| - go get golang.org/x/[email protected] | ||
| - go get google.golang.org/[email protected] | ||
| - go mod tidy | ||
| - go mod vendor | ||
| - go mod edit -dropreplace google.golang.org/grpc | ||
| {{- end }} | ||
| - make build | ||
| - cp bin/csi-provisioner /csi-provisioner | ||
| - chown 64535:64535 /csi-provisioner | ||
| - chmod 0755 /csi-provisioner | ||
| - export GO_VERSION=${GOLANG_VERSION} GOPROXY={{ $.GOPROXY }} CGO_ENABLED=0 GOOS=linux GOARCH=amd64 | ||
| - cd /src | ||
| - make build | ||
| - cp bin/csi-provisioner /csi-provisioner | ||
| - chown 64535:64535 /csi-provisioner | ||
| - chmod 0755 /csi-provisioner | ||
| {{- end }} | ||
| {{- end }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,34 +6,37 @@ | |
| image: {{ $.ModuleName }}/{{ $.ImageName }}-{{ $version | replace "." "-" }} | ||
| fromImage: common/distroless | ||
| import: | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| add: /csi-resizer | ||
| to: /csi-resizer | ||
| before: setup | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| add: /csi-resizer | ||
| to: /csi-resizer | ||
| before: setup | ||
| docker: | ||
| ENTRYPOINT: ["/csi-resizer"] | ||
| --- | ||
| artifact: {{ $.ModuleName }}/{{ $.ImageName }}-src-artifact-{{ $version | replace "." "-" }} | ||
| fromArtifact: common/src-artifact | ||
| shell: | ||
| install: | ||
| - git clone --depth 1 --branch {{ $value.csi.resizer }} {{ $.SOURCE_REPO }}/kubernetes-csi/external-resizer.git /src | ||
| - rm -r /src/.git | ||
| --- | ||
| artifact: {{ $.ModuleName }}/{{ $.ImageName }}-artifact-{{ $version | replace "." "-" }} | ||
| {{- if semverCompare ">=1.30" $version }} | ||
| from: {{ $.Images.BASE_GOLANG_22_ALPINE_DEV }} | ||
| {{- else }} | ||
| from: {{ $.Images.BASE_GOLANG_20_ALPINE_DEV }} | ||
| {{- end }} | ||
| from: {{ $.Images.BASE_GOLANG_23_ALPINE }} | ||
| import: | ||
| - artifact: {{ $.ModuleName }}/{{ $.ImageName }}-src-artifact-{{ $version | replace "." "-" }} | ||
| add: /src | ||
| to: /src | ||
| before: install | ||
| shell: | ||
| beforeInstall: | ||
| - git clone --depth 1 --branch {{ $value.csi.resizer }} {{ $.SOURCE_REPO }}/kubernetes-csi/external-resizer.git /src | ||
| {{- include "alpine packages proxy" $ | nindent 2 }} | ||
| - apk add --no-cache make bash | ||
| install: | ||
| - export GO_VERSION=${GOLANG_VERSION} GOPROXY={{ $.GOPROXY }} CGO_ENABLED=0 GOOS=linux GOARCH=amd64 | ||
| - cd /src | ||
| {{- if semverCompare "<1.29" $version }} | ||
| - go get golang.org/x/[email protected] | ||
| - go get google.golang.org/[email protected] | ||
| - go mod tidy | ||
| - go mod vendor | ||
| {{- end }} | ||
| - make build | ||
| - cp bin/csi-resizer /csi-resizer | ||
| - chown 64535:64535 /csi-resizer | ||
| - chmod 0755 /csi-resizer | ||
| - export GO_VERSION=${GOLANG_VERSION} GOPROXY={{ $.GOPROXY }} CGO_ENABLED=0 GOOS=linux GOARCH=amd64 | ||
| - cd /src | ||
| - make build | ||
| - cp bin/csi-resizer /csi-resizer | ||
| - chown 64535:64535 /csi-resizer | ||
| - chmod 0755 /csi-resizer | ||
| {{- end }} | ||
| {{- end }} | ||
Oops, something went wrong.