Skip to content

Commit b9d22e4

Browse files
duckhawkduckhawk
authored
Add metadata cleanup (#80)
* Signed-off-by: v.oleynikov <[email protected]>
1 parent a74d29a commit b9d22e4

File tree

8 files changed

+118
-35
lines changed

8 files changed

+118
-35
lines changed

‎.github/workflows/build_dev.yml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,13 @@ jobs:
8585
echo MODULE_EDITION=$MODULE_EDITION
8686
8787
- uses: actions/checkout@v4
88-
- uses: deckhouse/modules-actions/setup@v1
89-
- uses: deckhouse/modules-actions/build@v1
88+
- uses: deckhouse/modules-actions/setup@v2
89+
with:
90+
registry: ${{ vars.DEV_REGISTRY }}
91+
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
92+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
93+
- uses: deckhouse/modules-actions/build@v2
94+
with:
95+
module_source: "${{ vars.DEV_MODULE_SOURCE }}"
96+
module_name: ${{ vars.MODULE_NAME }}
97+
module_tag: $(echo pr${{ github.ref_name }} | sed 's/\/.*//g')

‎.github/workflows/build_prod.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ jobs:
3636
name: Show vars
3737
3838
- uses: actions/checkout@v4
39-
- uses: deckhouse/modules-actions/setup@v1.2
39+
- uses: deckhouse/modules-actions/setup@v2
4040
with:
4141
registry: ${{ vars.PROD_REGISTRY }}
4242
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
4343
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
44-
- uses: deckhouse/modules-actions/setup@v1.2
44+
- uses: deckhouse/modules-actions/setup@v2
4545
with:
4646
registry: ${{ vars.DEV_REGISTRY }}
4747
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
4848
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
49-
- uses: deckhouse/modules-actions/build@v1.2
49+
- uses: deckhouse/modules-actions/build@v2
5050
with:
5151
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ce/modules"
5252
module_name: ${{ vars.MODULE_NAME }}
@@ -71,17 +71,17 @@ jobs:
7171
name: Show vars
7272
7373
- uses: actions/checkout@v4
74-
- uses: deckhouse/modules-actions/setup@v1.2
74+
- uses: deckhouse/modules-actions/setup@v2
7575
with:
7676
registry: ${{ vars.PROD_REGISTRY }}
7777
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
7878
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
79-
- uses: deckhouse/modules-actions/setup@v1.2
79+
- uses: deckhouse/modules-actions/setup@v2
8080
with:
8181
registry: ${{ vars.DEV_REGISTRY }}
8282
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
8383
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
84-
- uses: deckhouse/modules-actions/build@v1.2
84+
- uses: deckhouse/modules-actions/build@v2
8585
with:
8686
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ee/modules"
8787
module_name: ${{ vars.MODULE_NAME }}
@@ -106,17 +106,17 @@ jobs:
106106
name: Show vars
107107
108108
- uses: actions/checkout@v4
109-
- uses: deckhouse/modules-actions/setup@v1.2
109+
- uses: deckhouse/modules-actions/setup@v2
110110
with:
111111
registry: ${{ vars.PROD_REGISTRY }}
112112
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
113113
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
114-
- uses: deckhouse/modules-actions/setup@v1.2
114+
- uses: deckhouse/modules-actions/setup@v2
115115
with:
116116
registry: ${{ vars.DEV_REGISTRY }}
117117
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
118118
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
119-
- uses: deckhouse/modules-actions/build@v1.2
119+
- uses: deckhouse/modules-actions/build@v2
120120
with:
121121
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/fe/modules"
122122
module_name: ${{ vars.MODULE_NAME }}
@@ -141,17 +141,17 @@ jobs:
141141
name: Show vars
142142
143143
- uses: actions/checkout@v4
144-
- uses: deckhouse/modules-actions/setup@v1.2
144+
- uses: deckhouse/modules-actions/setup@v2
145145
with:
146146
registry: ${{ vars.PROD_REGISTRY }}
147147
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
148148
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
149-
- uses: deckhouse/modules-actions/setup@v1.2
149+
- uses: deckhouse/modules-actions/setup@v2
150150
with:
151151
registry: ${{ vars.DEV_REGISTRY }}
152152
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
153153
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
154-
- uses: deckhouse/modules-actions/build@v1.2
154+
- uses: deckhouse/modules-actions/build@v2
155155
with:
156156
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se/modules"
157157
module_name: ${{ vars.MODULE_NAME }}
@@ -176,17 +176,17 @@ jobs:
176176
name: Show vars
177177
178178
- uses: actions/checkout@v4
179-
- uses: deckhouse/modules-actions/setup@v1.2
179+
- uses: deckhouse/modules-actions/setup@v2
180180
with:
181181
registry: ${{ vars.PROD_REGISTRY }}
182182
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
183183
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
184-
- uses: deckhouse/modules-actions/setup@v1.2
184+
- uses: deckhouse/modules-actions/setup@v2
185185
with:
186186
registry: ${{ vars.DEV_REGISTRY }}
187187
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
188188
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
189-
- uses: deckhouse/modules-actions/build@v1.2
189+
- uses: deckhouse/modules-actions/build@v2
190190
with:
191191
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se-plus/modules"
192192
module_name: ${{ vars.MODULE_NAME }}

‎.github/workflows/deploy_dev.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,15 @@ jobs:
5757
shell: bash
5858

5959
- uses: actions/checkout@v4
60-
- uses: deckhouse/modules-actions/setup@v1
60+
- uses: deckhouse/modules-actions/setup@v2
61+
with:
62+
registry: ${{ vars.DEV_REGISTRY }}
63+
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
64+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
6165
- if: ${{ github.event.inputs.enableBuild == 'true' }}
62-
uses: deckhouse/modules-actions/build@v1
63-
- uses: deckhouse/modules-actions/deploy@v1
66+
uses: deckhouse/modules-actions/build@v2
67+
with:
68+
module_source: "${{ vars.DEV_MODULE_SOURCE }}"
69+
module_name: ${{ vars.MODULE_NAME }}
70+
module_tag: $(echo pr${{ github.ref_name }} | sed 's/\/.*//g')
71+
- uses: deckhouse/modules-actions/deploy@v2

‎.github/workflows/deploy_prod.yml‎

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,21 @@ jobs:
7474
run: |
7575
echo $MODULES_MODULE_SOURCE
7676
- uses: actions/checkout@v4
77-
- uses: deckhouse/modules-actions/setup@v1
77+
- uses: deckhouse/modules-actions/setup@v2
78+
with:
79+
registry: ${{ vars.PROD_REGISTRY }}
80+
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
81+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
7882
- name: Check previous release
7983
run: |
8084
chmod +x .github/check_previous_channel_release.sh
8185
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME ce $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
82-
- uses: deckhouse/modules-actions/deploy@v1
86+
- uses: deckhouse/modules-actions/deploy@v2
87+
with:
88+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ce/modules"
89+
module_name: ${{ vars.MODULE_NAME }}
90+
module_tag: ${{ github.event.inputs.tag }}
91+
release_channel: ${{ github.event.inputs.channel }}
8392

8493
job-EE:
8594
name: Edition EE
@@ -94,12 +103,21 @@ jobs:
94103
run: |
95104
echo $MODULES_MODULE_SOURCE
96105
- uses: actions/checkout@v4
97-
- uses: deckhouse/modules-actions/setup@v1
106+
- uses: deckhouse/modules-actions/setup@v2
107+
with:
108+
registry: ${{ vars.PROD_REGISTRY }}
109+
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
110+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
98111
- name: Check previous release
99112
run: |
100113
chmod +x .github/check_previous_channel_release.sh
101114
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME ee $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
102-
- uses: deckhouse/modules-actions/deploy@v1
115+
- uses: deckhouse/modules-actions/deploy@v2
116+
with:
117+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/ee/modules"
118+
module_name: ${{ vars.MODULE_NAME }}
119+
module_tag: ${{ github.event.inputs.tag }}
120+
release_channel: ${{ github.event.inputs.channel }}
103121

104122
job-FE:
105123
name: Edition FE
@@ -114,12 +132,21 @@ jobs:
114132
run: |
115133
echo $MODULES_MODULE_SOURCE
116134
- uses: actions/checkout@v4
117-
- uses: deckhouse/modules-actions/setup@v1
135+
- uses: deckhouse/modules-actions/setup@v2
136+
with:
137+
registry: ${{ vars.PROD_REGISTRY }}
138+
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
139+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
118140
- name: Check previous release
119141
run: |
120142
chmod +x .github/check_previous_channel_release.sh
121143
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME fe $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
122-
- uses: deckhouse/modules-actions/deploy@v1
144+
- uses: deckhouse/modules-actions/deploy@v2
145+
with:
146+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/fe/modules"
147+
module_name: ${{ vars.MODULE_NAME }}
148+
module_tag: ${{ github.event.inputs.tag }}
149+
release_channel: ${{ github.event.inputs.channel }}
123150

124151
job-SE:
125152
name: Edition SE
@@ -134,12 +161,21 @@ jobs:
134161
run: |
135162
echo $MODULES_MODULE_SOURCE
136163
- uses: actions/checkout@v4
137-
- uses: deckhouse/modules-actions/setup@v1
164+
- uses: deckhouse/modules-actions/setup@v2
165+
with:
166+
registry: ${{ vars.PROD_REGISTRY }}
167+
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
168+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
138169
- name: Check previous release
139170
run: |
140171
chmod +x .github/check_previous_channel_release.sh
141172
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME se $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
142-
- uses: deckhouse/modules-actions/deploy@v1
173+
- uses: deckhouse/modules-actions/deploy@v2
174+
with:
175+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se/modules"
176+
module_name: ${{ vars.MODULE_NAME }}
177+
module_tag: ${{ github.event.inputs.tag }}
178+
release_channel: ${{ github.event.inputs.channel }}
143179

144180
job-SE-plus:
145181
name: Edition SE+
@@ -154,9 +190,18 @@ jobs:
154190
run: |
155191
echo $MODULES_MODULE_SOURCE
156192
- uses: actions/checkout@v4
157-
- uses: deckhouse/modules-actions/setup@v1
193+
- uses: deckhouse/modules-actions/setup@v2
194+
with:
195+
registry: ${{ vars.PROD_REGISTRY }}
196+
registry_login: ${{ vars.PROD_MODULES_REGISTRY_LOGIN }}
197+
registry_password: ${{ secrets.PROD_MODULES_REGISTRY_PASSWORD }}
158198
- name: Check previous release
159199
run: |
160200
chmod +x .github/check_previous_channel_release.sh
161201
.github/check_previous_channel_release.sh $MODULES_MODULE_NAME se-plus $RELEASE_CHANNEL $MODULES_MODULE_TAG license-token $MODULES_READ_REGISTRY_PASSWORD
162-
- uses: deckhouse/modules-actions/deploy@v1
202+
- uses: deckhouse/modules-actions/deploy@v2
203+
with:
204+
module_source: "${{ vars.PROD_REGISTRY }}/${{ vars.PROD_MODULE_SOURCE_NAME }}/se-plus/modules"
205+
module_name: ${{ vars.MODULE_NAME }}
206+
module_tag: ${{ github.event.inputs.tag }}
207+
release_channel: ${{ github.event.inputs.channel }}

‎.github/workflows/dev_registry-cleanup.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ jobs:
3838
name: Run cleanup
3939
steps:
4040
- uses: actions/checkout@v4
41-
- uses: deckhouse/modules-actions/setup@v1
42-
41+
- uses: deckhouse/modules-actions/setup@v2
42+
with:
43+
registry: ${{ vars.DEV_REGISTRY }}
44+
registry_login: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }}
45+
registry_password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }}
4346
- name: Cleanup
4447
run: |
4548
werf cleanup \

‎.github/workflows/go_lint.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
- name: Setup Go environment
2222
uses: actions/setup-go@v5
2323
with:
24-
go-version: '1.23.4'
24+
go-version: '1.23'
2525

2626
- name: Install golangci-lint
27-
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0
27+
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.5
2828

2929
- name: Run Go lint
3030
run: |

‎werf-giterminism.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
giterminismConfigVersion: 1
22
config:
33
goTemplateRendering: # The rules for the Go-template functions to be able to pass build context to the release
4-
allowEnvVariables: [ /CI_.+/, MODULES_MODULE_TAG, GOLANG_VERSION, GOPROXY, SOURCE_REPO, MODULE_EDITION ]
4+
allowEnvVariables:
5+
- /CI_.+/
6+
- MODULES_MODULE_TAG
7+
- WERF_DISABLE_META_TAGS
8+
- GOLANG_VERSION
9+
- GOPROXY
10+
- SOURCE_REPO
11+
- MODULE_EDITION
512
stapel:
613
mount:
714
allowBuildDir: true

‎werf.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
project: csi-nfs
22
configVersion: 1
3+
build:
4+
imageSpec:
5+
author: "Deckhouse Kubernetes Platform <[email protected]>"
6+
clearHistory: true
7+
config:
8+
clearWerfLabels: true
9+
removeLabels:
10+
- /.*/
11+
gitWorktree:
12+
forceShallowClone: true
13+
cleanup:
14+
disableGitHistoryBasedPolicy: {{ env "WERF_DISABLE_META_TAGS" "false" }}
315
---
416
{{ tpl (.Files.Get ".werf/consts.yaml") $ }}
517
{{ tpl (.Files.Get ".werf/images.yaml") $ }}

0 commit comments

Comments
 (0)