Skip to content

Commit cef6257

Browse files
committed
Merge branch 'main' into feat/appconfig-more
chore(devbox): complete merging Signed-off-by: Nixieboluo <[email protected]> chore(frontend): fix lockfile Signed-off-by: Nixieboluo <[email protected]>
2 parents 3ca6cab + 7e2b790 commit cef6257

File tree

191 files changed

+15407
-9075
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+15407
-9075
lines changed

.github/workflows/check-link-error.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/import-patch-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
run: bash "./${PROJECT_PATH}/scripts/resolve-patch-modules.sh" "${INPUT_ARCH}"
6969
build:
7070
needs: [ resolve-modules ]
71-
runs-on: ubuntu-24.04
71+
runs-on: ${{ matrix.runs-on || 'ubuntu-24.04' }}
7272
strategy:
7373
matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
7474
steps:
@@ -94,7 +94,7 @@ jobs:
9494
- name: Install Dependencies
9595
if: ${{ (matrix.binary == 'sealos' || matrix.binary == 'sealctl') && matrix.arch == 'arm64' }}
9696
run: |
97-
sudo apt update && sudo apt install -y gcc-aarch64-linux-gnu
97+
sudo apt update && sudo apt install -y gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
9898
9999
- name: Build Binaries
100100
env:
@@ -143,7 +143,7 @@ jobs:
143143
path: ${{ env.PROJECT_PATH }}/test/e2e/e2e.test
144144
docker:
145145
needs: [ resolve-modules-arch,build ]
146-
runs-on: ubuntu-24.04
146+
runs-on: ${{ matrix.runs-on || 'ubuntu-24.04' }}
147147
if: ${{ (inputs.image == true) }}
148148
services:
149149
registry:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- name: Install Dependencies
3232
run: |
33-
sudo apt update && sudo apt install -y gcc-aarch64-linux-gnu \
33+
sudo apt update && sudo apt install -y gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu \
3434
libbtrfs-dev libgpgme-dev libdevmapper-dev \
3535
qemu-user-static binfmt-support
3636

controllers/app/deploy/manifests/deploy.yaml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -583,29 +583,6 @@ spec:
583583
control-plane: controller-manager
584584
spec:
585585
containers:
586-
- args:
587-
- --secure-listen-address=0.0.0.0:8443
588-
- --upstream=http://127.0.0.1:8080/
589-
- --logtostderr=true
590-
- --v=0
591-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
592-
name: kube-rbac-proxy
593-
ports:
594-
- containerPort: 8443
595-
name: https
596-
protocol: TCP
597-
resources:
598-
limits:
599-
cpu: 500m
600-
memory: 128Mi
601-
requests:
602-
cpu: 5m
603-
memory: 64Mi
604-
securityContext:
605-
allowPrivilegeEscalation: false
606-
capabilities:
607-
drop:
608-
- ALL
609586
- args:
610587
- --health-probe-bind-address=:8081
611588
- --metrics-bind-address=127.0.0.1:8080

controllers/node/deploy/charts/node/templates/deployment.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ spec:
1212
template:
1313
metadata:
1414
annotations:
15-
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
1615
{{- with .Values.podAnnotations }}
1716
{{- toYaml . | nindent 8 }}
1817
{{- end }}

controllers/objectstorage/deploy/manifests/deploy.yaml.tmpl

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -478,29 +478,6 @@ spec:
478478
values:
479479
- linux
480480
containers:
481-
- args:
482-
- --secure-listen-address=0.0.0.0:8443
483-
- --upstream=http://127.0.0.1:8080/
484-
- --logtostderr=true
485-
- --v=0
486-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
487-
name: kube-rbac-proxy
488-
ports:
489-
- containerPort: 8443
490-
name: https
491-
protocol: TCP
492-
resources:
493-
limits:
494-
cpu: 500m
495-
memory: 512Mi
496-
requests:
497-
cpu: 5m
498-
memory: 64Mi
499-
securityContext:
500-
allowPrivilegeEscalation: false
501-
capabilities:
502-
drop:
503-
- ALL
504481
- args:
505482
- --health-probe-bind-address=:8081
506483
- --metrics-bind-address=127.0.0.1:8080

deploy/objectstorage/Kubefile

Lines changed: 0 additions & 16 deletions
This file was deleted.

deploy/objectstorage/README.md

Lines changed: 0 additions & 30 deletions
This file was deleted.

deploy/objectstorage/etc/minio/policy/kubeblocks.json

Lines changed: 0 additions & 64 deletions
This file was deleted.

deploy/objectstorage/etc/minio/policy/user_deny_write.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)