From 3b9cb809bfb00defcf34bffaad5ba5aa7b98b9ba Mon Sep 17 00:00:00 2001 From: yy Date: Thu, 17 Oct 2024 15:40:43 +0800 Subject: [PATCH] devbox-offline --- deploy/devbox/Kubefile | 3 ++ deploy/devbox/init.sh | 18 ----------- deploy/devbox/scripts/init.sh | 3 ++ frontend/providers/devbox/deploy/Kubefile | 8 +---- .../devbox/deploy/manifests/deploy.yaml.tmpl | 8 ++--- .../devbox/deploy/manifests/rbac.yaml | 30 ------------------- .../deploy/scripts/update-backup-label.sh | 30 ------------------- 7 files changed, 11 insertions(+), 89 deletions(-) delete mode 100644 frontend/providers/devbox/deploy/manifests/rbac.yaml delete mode 100644 frontend/providers/devbox/deploy/scripts/update-backup-label.sh diff --git a/deploy/devbox/Kubefile b/deploy/devbox/Kubefile index cca1b0f4c0a..415a0cdac4f 100644 --- a/deploy/devbox/Kubefile +++ b/deploy/devbox/Kubefile @@ -7,5 +7,8 @@ COPY registry registry ENV cloudDomain=${cloudDomain:-"127.0.0.1.nip.io"} ENV cloudPort="" +ENV registryAddr=${registryAddr:-"sealos.hub:5000"} +ENV registryUser=${registryUser:-"admin"} +ENV registryPassword=${registryPassword:-"passw0rd"} CMD ["bash scripts/init.sh"] diff --git a/deploy/devbox/init.sh b/deploy/devbox/init.sh index c9b84a1d3dc..875547bca3d 100644 --- a/deploy/devbox/init.sh +++ b/deploy/devbox/init.sh @@ -5,26 +5,8 @@ set -e mkdir -p tars RetryPullImageInterval=3 -RetryPullFileInterval=3 RetrySleepSeconds=3 -retryPullFile() { - local file=$1 - local retry=0 - local retryMax=3 - set +e - while [ $retry -lt $RetryPullFileInterval ]; do - curl $file --create-dirs -o ./etc/minio-binaries/mc >/dev/null && break - retry=$(($retry + 1)) - echo "retry pull file $file, retry times: $retry" - sleep $RetrySleepSeconds - done - set -e - if [ $retry -eq $retryMax ]; then - echo "pull file $file failed" - exit 1 - fi -} retryPullImage() { local image=$1 diff --git a/deploy/devbox/scripts/init.sh b/deploy/devbox/scripts/init.sh index d9628ae71d6..54e779f940c 100644 --- a/deploy/devbox/scripts/init.sh +++ b/deploy/devbox/scripts/init.sh @@ -1,3 +1,6 @@ #!/bin/bash set -e + +sealos run tars/devbox-controller.tar -e cloudDomain=${cloudDomain} -e cloudPort=${cloudPort} -e registryAddr=${registryAddr} -e registryUser=${registryUser} -e registryPassword=${registryPassword} +sealos run tars/devbox-frontend.tar -e cloudDomain=${cloudDomain} -e cloudPort=${cloudPort} diff --git a/frontend/providers/devbox/deploy/Kubefile b/frontend/providers/devbox/deploy/Kubefile index ffb761baf08..b5729882e69 100644 --- a/frontend/providers/devbox/deploy/Kubefile +++ b/frontend/providers/devbox/deploy/Kubefile @@ -8,12 +8,6 @@ COPY manifests manifests ENV cloudDomain="127.0.0.1.nip.io" ENV cloudPort="" ENV certSecretName="wildcard-cert" -ENV monitorUrl="http://database-monitor.sealos.svc.cluster.local:9090" -ENV minioUrl="" -ENV minioAccessKey="" -ENV minioSecretKey="" -ENV minioPort="" -ENV migrateFileImage="" -ENV minioBucketName="" +ENV registryAddr="sealos.hub:5000" CMD ["kubectl apply -f manifests"] diff --git a/frontend/providers/devbox/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/devbox/deploy/manifests/deploy.yaml.tmpl index 6514f1538f2..4790c8b5b86 100644 --- a/frontend/providers/devbox/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/devbox/deploy/manifests/deploy.yaml.tmpl @@ -38,17 +38,17 @@ spec: - name: devbox-frontend env: - name: SEALOS_DOMAIN - value: { { .cloudDomain } } + value: {{ .cloudDomain }} - name: INGRESS_SECRET value: wildcard-cert - name: REGISTRY_ADDR - value: hub.{{ .cloudDomain }}{{ if .cloudPort }}:{{ .cloudPort }}{{ end }} + value: {{ .registryAddr }} - name: DEVBOX_AFFINITY_ENABLE value: 'true' - name: MONITOR_URL value: http://launchpad-monitor.sealos.svc.cluster.local:8428 - name: SQUASH_ENABLE - value: 'true' + value: 'false' - name: ACCOUNT_URL value: http://account-service.account-system.svc.cluster.local:2333 securityContext: @@ -63,7 +63,7 @@ spec: cpu: 2000m memory: 2048Mi requests: - cpu: 10m + cpu: 100m memory: 128Mi # do not modify this image, it is used for CI/CD image: ghcr.io/labring/sealos-devbox-frontend:latest diff --git a/frontend/providers/devbox/deploy/manifests/rbac.yaml b/frontend/providers/devbox/deploy/manifests/rbac.yaml deleted file mode 100644 index ff8e7b80519..00000000000 --- a/frontend/providers/devbox/deploy/manifests/rbac.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: cluster-version-reader - namespace: devbox-frontend ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: cluster-version-reader -rules: - - apiGroups: ['apps.kubeblocks.io'] - resources: ['clusterversions'] - verbs: ['get', 'watch', 'list'] - - apiGroups: ['dataprotection.kubeblocks.io'] - resources: ['backuprepos'] - verbs: ['get', 'watch', 'list'] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: cluster-version-reader-rolebinding -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-version-reader -subjects: - - kind: ServiceAccount - name: cluster-version-reader - namespace: devbox-frontend diff --git a/frontend/providers/devbox/deploy/scripts/update-backup-label.sh b/frontend/providers/devbox/deploy/scripts/update-backup-label.sh deleted file mode 100644 index 016a6fa8c98..00000000000 --- a/frontend/providers/devbox/deploy/scripts/update-backup-label.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -encodeToHex() { - local input="$1" - input=$(echo "$input" | cut -c -30) - echo -n "$input" | xxd -p | tr -d '\n' -} - -decodeFromHex() { - local input="$1" - echo -n "$input" | xxd -r -p -} - -backups=$(kubectl get Backup -A -o json | jq -c '.items[]') - -echo "$backups" | while IFS= read -r backup; do - namespace=$(echo "$backup" | jq -r '.metadata.namespace') - name=$(echo "$backup" | jq -r '.metadata.name') - - current_value=$(echo "$backup" | jq -r '.metadata.labels["backup-remark"] // empty') - if [ -n "$current_value" ]; then - encoded_value=$(encodeToHex "$current_value") - - kubectl patch Backup "$name" -n "$namespace" --type='json' -p="[{\"op\": \"replace\", \"path\": \"/metadata/labels/backup-remark\", \"value\": \"$encoded_value\"}]" - - echo "Updated $namespace/$name: backup-remark before: $current_value, after: $encoded_value" - else - echo "No non-empty backup-remark label found for $namespace/$name" - fi -done \ No newline at end of file