Skip to content

Commit e2319cb

Browse files
committed
Add WebUI for S3 bucket
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 249bf35 commit e2319cb

14 files changed

Lines changed: 202 additions & 0 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build:
1010
make -C packages/system/kubeovn image
1111
make -C packages/system/dashboard image
1212
make -C packages/system/kamaji image
13+
make -C packages/system/bucket image
1314
make -C packages/core/testing image
1415
make -C packages/core/installer image
1516
make manifests

‎packages/apps/bucket/templates/dashboard-resourcemap.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,12 @@ rules:
99
- secrets
1010
resourceNames:
1111
- {{ .Release.Name }}
12+
- {{ .Release.Name }}-credentials
13+
verbs: ["get", "list", "watch"]
14+
- apiGroups:
15+
- networking.k8s.io
16+
resources:
17+
- ingresses
18+
resourceNames:
19+
- {{ .Release.Name }}-ui
1220
verbs: ["get", "list", "watch"]
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: helm.toolkit.fluxcd.io/v2
2+
kind: HelmRelease
3+
metadata:
4+
name: {{ .Release.Name }}-system
5+
spec:
6+
chart:
7+
spec:
8+
chart: cozy-bucket
9+
reconcileStrategy: Revision
10+
sourceRef:
11+
kind: HelmRepository
12+
name: cozystack-system
13+
namespace: cozy-system
14+
version: '*'
15+
interval: 1m0s
16+
timeout: 5m0s
17+
values:
18+
bucketName: {{ .Release.Name }}

‎packages/system/bucket/.helmignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
hack
2+
.gitkeep

‎packages/system/bucket/Chart.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
apiVersion: v2
2+
name: cozy-bucket
3+
version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process

‎packages/system/bucket/Makefile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
S3MANAGER_TAG=v0.5.0
2+
3+
export NAME=s3manager-system
4+
5+
include ../../../scripts/common-envs.mk
6+
include ../../../scripts/package.mk
7+
8+
update:
9+
rm -rf charts
10+
helm pull oci://ghcr.io/aenix-io/charts/etcd-operator --untar --untardir charts
11+
12+
image: image-s3manager
13+
14+
image-s3manager:
15+
docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/s3manager \
16+
--provenance false \
17+
--tag $(REGISTRY)/s3manager:$(call settag,$(S3MANAGER_TAG)) \
18+
--cache-from type=registry,ref=$(REGISTRY)/s3manager:latest \
19+
--cache-to type=inline \
20+
--metadata-file images/s3manager.json \
21+
--push=$(PUSH) \
22+
--load=$(LOAD)
23+
echo "$(REGISTRY)/s3manager:$(call settag,$(S3MANAGER_TAG))@$$(yq e '."containerimage.digest"' images/s3manager.json -o json -r)" \
24+
> images/s3manager.tag
25+
rm -f images/s3manager.json
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ghcr.io/aenix-io/cozystack/s3manager:latest@sha256:7a1a0864f823dc3343d79dffa44ab73f77f0e1b3642a0fe0fa29b280c3184a9b
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Source: https://github.com/cloudlena/s3manager/blob/main/Dockerfile
2+
3+
FROM docker.io/library/golang:1 AS builder
4+
WORKDIR /usr/src/app
5+
RUN wget -O- https://github.com/cloudlena/s3manager/archive/9a7c8e446b422f8973b8c461990f39fdafee9c27.tar.gz | tar -xzf- --strip 1
6+
ADD cozystack.patch /
7+
RUN git apply /cozystack.patch
8+
RUN CGO_ENABLED=0 go build -ldflags="-s -w" -a -installsuffix cgo -o bin/s3manager
9+
10+
FROM docker.io/library/alpine:latest
11+
WORKDIR /usr/src/app
12+
RUN addgroup -S s3manager && adduser -S s3manager -G s3manager
13+
RUN apk add --no-cache \
14+
ca-certificates \
15+
dumb-init
16+
COPY --from=builder --chown=s3manager:s3manager /usr/src/app/bin/s3manager ./
17+
USER s3manager
18+
EXPOSE 8080
19+
ENTRYPOINT [ "/usr/bin/dumb-init", "--" ]
20+
CMD [ "/usr/src/app/s3manager" ]
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/web/template/bucket.html.tmpl b/web/template/bucket.html.tmpl
2+
index e2f8d28..87add13 100644
3+
--- a/web/template/bucket.html.tmpl
4+
+++ b/web/template/bucket.html.tmpl
5+
@@ -13,7 +13,7 @@
6+
7+
<nav class="nav-extended">
8+
<div class="nav-wrapper container">
9+
- <a href="/buckets/{{$.BucketName}}" class="brand-logo center"><i class="material-icons">folder_open</i>{{ .BucketName }}</a>
10+
+ <a href="/" class="brand-logo">Cozystack S3 Manager</a>
11+
{{ if not .Objects }}
12+
<ul class="right">
13+
<li>
14+
diff --git a/web/template/buckets.html.tmpl b/web/template/buckets.html.tmpl
15+
index c7ea184..fb1dce7 100644
16+
--- a/web/template/buckets.html.tmpl
17+
+++ b/web/template/buckets.html.tmpl
18+
@@ -1,7 +1,7 @@
19+
{{ define "content" }}
20+
<nav>
21+
<div class="nav-wrapper container">
22+
- <a href="/" class="brand-logo">S3 Manager</a>
23+
+ <a href="/" class="brand-logo">Cozystack S3 Manager</a>
24+
</div>
25+
</nav>
26+
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: {{ .Values.bucketName }}-ui
5+
spec:
6+
replicas: 1
7+
selector:
8+
matchLabels:
9+
app: {{ .Values.bucketName }}-ui
10+
template:
11+
metadata:
12+
labels:
13+
app: {{ .Values.bucketName }}-ui
14+
spec:
15+
containers:
16+
- name: s3manager
17+
image: "{{ $.Files.Get "images/s3manager.tag" | trim }}"
18+
env:
19+
- name: ENDPOINT
20+
valueFrom:
21+
secretKeyRef:
22+
name: {{ .Values.bucketName }}-credentials
23+
key: endpoint
24+
- name: SKIP_SSL_VERIFICATION
25+
value: "true"
26+
- name: ACCESS_KEY_ID
27+
valueFrom:
28+
secretKeyRef:
29+
name: {{ .Values.bucketName }}-credentials
30+
key: accessKey
31+
- name: SECRET_ACCESS_KEY
32+
valueFrom:
33+
secretKeyRef:
34+
name: {{ .Values.bucketName }}-credentials
35+
key: secretKey

0 commit comments

Comments
 (0)