Skip to content

Commit 062976e

Browse files
committed
Merge remote-tracking branch 'origin/main' into k0s-1-29
2 parents b828b4f + 31bd3c3 commit 062976e

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

.github/workflows/image-deps-updater.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
INPUT_VELERO_VERSION: ${{ github.event.inputs.velero_version }}
7979
INPUT_VELERO_AWS_PLUGIN_VERSION: ${{ github.event.inputs.velero_aws_plugin_version }}
8080
INPUT_KUBECTL_VERSION: ${{ github.event.inputs.kubectl_version }}
81-
INPUT_SEAWEEDFS_VERSION: ${{ github.event.inputs.seaweedfs_version }}
81+
INPUT_SEAWEEDFS_VERSION: ${{ github.event.inputs.seaweedfs_version || '3.79' }}
8282
ARCHS: "amd64,arm64"
8383
run: |
8484
chmod +x ./output/bin/buildtools

.github/workflows/update-addons.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
CHARTS_DESTINATION: registry.replicated.com/ec-charts
6868
INPUT_OPENEBS_CHART_VERSION: ${{ github.event.inputs.openebs_chart_version }}
6969
INPUT_VELERO_CHART_VERSION: ${{ github.event.inputs.velero_chart_version }}
70-
INPUT_SEAWEEDFS_CHART_VERSION: ${{ github.event.inputs.seaweedfs_chart_version }}
70+
INPUT_SEAWEEDFS_CHART_VERSION: ${{ github.event.inputs.seaweedfs_chart_version || '4.0.379' }}
7171
ARCHS: "amd64,arm64"
7272
run: |
7373
chmod 755 ./output/bin/buildtools

deploy/images/seaweedfs/apko.tmpl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ contents:
66
keyring:
77
- https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
88
packages:
9-
- busybox-full # busybox wget needed for seaweedfs-bucket-hook, wget from package repos does not work
9+
- wolfi-base
1010
- seaweedfs~${PACKAGE_VERSION}
1111
- fuse3 # for weed mount
1212

pkg/addons/openebs/static/metadata.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ images:
1616
openebs-linux-utils:
1717
repo: proxy.replicated.com/anonymous/replicated/ec-openebs-linux-utils
1818
tag:
19-
amd64: 4.1.3-amd64@sha256:f5fb7b9978e8fd2fc918b96f9940adf5f795fd594d2428c8e67ce1e957574a8e
20-
arm64: 4.1.3-arm64@sha256:bcc8f78abb87472cee8803b527892f34dbebc09488c8429277890006f591f83f
19+
amd64: 4.1.3-amd64@sha256:6df513145f2e0fa33a6ffce89581e9970d65108bea8616ac5ac5d33c0a67b895
20+
arm64: 4.1.3-arm64@sha256:b44ed4e2a9244ec5a20e3cb28ddbc0fa2fb0c43601c3c7701d8626ea04d07b2e
2121
openebs-provisioner-localpv:
2222
repo: proxy.replicated.com/anonymous/replicated/ec-openebs-provisioner-localpv
2323
tag:
24-
amd64: 4.1.4-r0-amd64@sha256:37ac863546f51d24966d890099a9d222b9f09a541abad26962d44d1068f11de0
25-
arm64: 4.1.4-r0-arm64@sha256:1c000074fe4b288a0ec2af4c7bff34312b5d02e9b7e89c6457d2957f02496507
24+
amd64: 4.1.4-r0-amd64@sha256:670451b159ba0917097eda82b5d96a3d6215b9e0acecd09eb9f5a5c7bb4b5c12
25+
arm64: 4.1.4-r0-arm64@sha256:ed937b81373d5b9fa5a33ceeb1c8636991e13cc5089fddbf359df5748534e630

pkg/addons/seaweedfs/static/metadata.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
# $ make buildtools
66
# $ output/bin/buildtools update addon <addon name>
77
#
8-
version: 4.0.384
8+
version: 4.0.379
99
location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/seaweedfs
1010
images:
1111
seaweedfs:
1212
repo: proxy.replicated.com/anonymous/replicated/ec-seaweedfs
1313
tag:
14-
amd64: 3.84-r1-amd64@sha256:bbf639c52960754cd8ab0282c47098aa9628bc5294d2c63990b282b06e226ded
15-
arm64: 3.84-r1-arm64@sha256:a63e7d93fe0bc1a0dc4e71750eb5b1a0e874e017330bcd4489c1abae394fbc0a
14+
amd64: 3.79-r0-amd64@sha256:f86f30cf779f30a08293db302141cb3d2bf693b23d2c4af64575ce00c26cc783
15+
arm64: 3.79-r0-arm64@sha256:bfe68bc9e38fd4686a0ba5c825600ccd2dc18343f613f574a240330d34c6eb42

0 commit comments

Comments
 (0)