Merge remote-tracking branch 'origin/main' into mv-9

.github/workflows/check-semgrep.yml

@@ -2,11 +2,23 @@
 name: Check-Semgrep
 
 on:
-  # Scan changed files in PRs (diff-aware scanning):
-  pull_request: {}
-  # Scan mainline branches and report all findings:
+  workflow_dispatch:
   push:
-    branches: ["main"]
+    branches: [ "main" ]
+    paths-ignore:
+      - "docs/**"
+      - "**/*.md"
+      - "**/*.yaml"
+      - "CONTRIBUTORS"
+      - "CHANGELOG/**"
+  pull_request:
+    branches: [ "*" ]
+    paths-ignore:
+      - "docs/**"
+      - "**/*.md"
+      - "**/*.yaml"
+      - "CONTRIBUTORS"
+      - "CHANGELOG/**"
 
 jobs:
   semgrep:

.github/workflows/controllers.yml

@@ -82,6 +82,8 @@ jobs:
           - { name: app, path: app }
           - { name: db-bytebase, path: db/bytebase }
           - { name: db-adminer, path: db/adminer }
+          - { name: license, path: license }
+          - { name: job-init, path: job/init }
           - { name: resources, path: resources }
           - { name: resources-metering, path: resources/metering }
           - { name: node, path: node }
@@ -103,14 +105,14 @@ jobs:
       - name: Build ${{ matrix.module.name }} amd64
         working-directory: controllers/${{ matrix.module.path }}
         run: |
-          GOARCH=amd64 make build
+          GOARCH=amd64 TARGETARCH=amd64 make build
           mv bin/manager bin/controller-${{ matrix.module.name }}-amd64
           chmod +x bin/controller-${{ matrix.module.name }}-amd64
 
       - name: Build ${{ matrix.module.name }} arm64
         working-directory: controllers/${{ matrix.module.path }}
         run: |
-          GOARCH=arm64 make build
+          GOARCH=arm64 TARGETARCH=arm64 make build
           mv bin/manager bin/controller-${{ matrix.module.name }}-arm64
           chmod +x bin/controller-${{ matrix.module.name }}-arm64
 
@@ -183,6 +185,8 @@ jobs:
           - { name: app, path: app }
           - { name: db-bytebase, path: db/bytebase }
           - { name: db-adminer, path: db/adminer }
+          - { name: license, path: license }
+          - { name: job-init, path: job/init }
           - { name: resources, path: resources }
           - { name: resources-metering, path: resources/metering }
           - { name: node, path: node }

.gitignore

@@ -11,8 +11,9 @@ scripts/release/Note.md
 .ossutil_checkpoint
 bin
 .run
-tools
 coverage.out
+tools/*
+tools/!*.go
 tmp
 **/.DS_Store
 node_modules

CHANGELOG/CHANGELOG-4.4.0-beta2.md

@@ -0,0 +1,17 @@
+Welcome to the v4.4.0-beta2 release of Sealos!🎉🎉!
+
+
+
+## Changelog
+### Bug fixes
+* 62e8e007558ebbe2000a8ac55bd27771eef2a1d2: fix: #4081 (#4083) (#4085) (@sealos-ci-robot)
+* 33aee733b0586427b5b41963c8826a1e1f598ab8: fix: merge cluster.spec.env (#4100) (#4105) (@sealos-ci-robot)
+* 6ff39a8a812f1576290c49771e8087a38fa7eab4: fix: remove default vip (#4087) (#4093) (@sealos-ci-robot)
+
+**Full Changelog**: https://github.com/labring/sealos/compare/v4.4.0-beta1...v4.4.0-beta2
+
+See [the CHANGELOG](https://github.com/labring/sealos/blob/main/CHANGELOG/CHANGELOG.md) for more details.
+
+Your patronage towards Sealos is greatly appreciated 🎉🎉.
+
+If you encounter any problems during its usage, please create an issue in the [GitHub repository](https://github.com/labring/sealos), we're committed to resolving your problem as soon as possible.

CHANGELOG/CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 
 - [CHANGELOG-5.0.0-alpha1.md](./CHANGELOG-5.0.0-alpha1.md)
+- [CHANGELOG-4.4.0-beta2.md](./CHANGELOG-4.4.0-beta2.md)
 - [CHANGELOG-4.4.0-beta1.md](./CHANGELOG-4.4.0-beta1.md)
 - [CHANGELOG-4.4.0-alpha3.md](./CHANGELOG-4.4.0-alpha3.md)
 - [CHANGELOG-4.4.0-alpha1.md](./CHANGELOG-4.4.0-alpha1.md)

README.md

@@ -28,7 +28,11 @@ A Cloud Operating System designed for managing cloud-native applications
 
 https://github.com/labring/sealos/assets/82700206/b1f8a25a-55cf-4d15-a47b-38cf7d507134
 
-> [Docs](https://sealos.io/docs/Intro) | [简体中文](./README_zh.md) | [Roadmap](https://github.com/orgs/labring/projects/4/views/9)
+<p align="center">
+  <a href="https://sealos.io/docs/Intro">Docs</a> |
+  <a href="./README_zh.md">简体中文</a> | 
+  <a href="https://github.com/orgs/labring/projects/4/views/9">Roadmap</a>
+</p>
 
 Sealos['siːləs] is a cloud operating system distribution based on the Kubernetes kernel. This allows enterprises to use the cloud as effortlessly as they would use a personal computer.
 
@@ -58,17 +62,15 @@ Sealos['siːləs] is a cloud operating system distribution based on the Kubernet
 
 ## 💡 Core features
 
-✅ **Instant Kubernetes Usage Upon Login**: There is no need to install a Kubernetes cluster. Sealos provides the ability for **multiple tenants** to share a Kubernetes on the public internet. It also offers strong  isolation capabilities to ensure the data safety of each tenant.
+- 🚀 **Application Management**: Efficient deployment of any distributed applications with public internet accessibility.
+- 🗄️ **Database Management**: Create high-availability databases in seconds, offering support for MySQL, PostgreSQL, MongoDB, and Redis.
+- 📬 **Support for Message Queues**: Catering to a variety of message queues such as Kafka, RocketMQ, and RabbitMQ.
 
-✅ **Swiftly deploy any application on Sealos**: With the in-built App Launchpad, effortlessly deploy any application in an astonishingly short span of time.
+## 🌟 Advantages
 
-✅ **Resource Saving and Cost Reduction**: You only pay for the container. The automatic scaling function fundamentally solves the problem of resource wastage, saving between 10% to 40% in costs.
-
-✅ **Easy Public Network Access**: Sealos automatically assigns a secondary domain name to your business,  helping you achieve easy public network access. It also supports custom  domain name binding.
-
-✅ **Efficient Database Service**: Sealos offers a service that allows businesses to create  high-availability databases within seconds. Through service discovery,  the internal network DNS can connect directly to the database.
-
-✅ **User-Friendly Operating Experience**: Sealos has an in-built terminal that supports command-line operation of the Kubernetes cluster, and also has in-built App Launchpad, allowing you to have a good user experience on Sealos, regardless of your familiarity with cloud-native  technology.
+- 💰 **Resource Efficiency & Cost Reduction**: Pay exclusively for the containers. The automatic scaling feature fundamentally tackles resource wastage, thus offering substantial cost benefits.
+- 🌐 **High Universality & Ease of Use**: Users can concentrate solely on their operations without the distraction of external complexities. Regardless of one's knowledge level of Kubernetes, Sealos remains user-friendly.
+- 🛡️ **Agility & Security**: The distinctive multi-tenancy sharing model ensures both effective resource segmentation and collaboration, all under a secure framework.
 
 
 ## 🏘️ Community & support

README_zh.md

@@ -28,7 +28,11 @@
 
 https://github.com/labring/sealos/assets/82700206/b1f8a25a-55cf-4d15-a47b-38cf7d507134
 
-> [文档](https://www.sealos.io/docs/Intro) | [English](README.md) | [发展规划](https://github.com/orgs/labring/projects/4/views/9)
+<p align="center">
+  <a href="https://sealos.io/zh-Hans/docs/Intro">文档</a> |
+  <a href="./README.md">English</a> | 
+  <a href="https://github.com/orgs/labring/projects/4/views/9">发展规划</a>
+</p>
 
 Sealos 是一款以 Kubernetes 为内核的**云操作系统发行版**。它以云原生的方式，抛弃了传统的云计算架构，转向以 Kubernetes 为云内核的新架构，使企业能够**像使用个人电脑一样**简单地使用云。
 
@@ -60,17 +64,15 @@ Sealos 是一款以 Kubernetes 为内核的**云操作系统发行版**。它以
 
 ## 💡 核心功能
 
-✅ **登录即可使用 Kubernetes**：无需安装 Kubernetes 集群，Sealos 提供**多租户**在公网环境共享一个 Kubernetes 的能力。除此之外还提供了强隔离能力，以保障各个租户的数据安全。
+- **应用管理**：快速部署具有公网访问能力的任意分布式应用。
+- **数据库管理**：秒级创建高可用数据库，支持 MySQL、PostgreSQL、MongoDB 和 Redis。
+- **消息队列支持**：支持多种消息队列，包含 Kafka、RocketMQ 和 RabbitMQ 等。
 
-✅ **快速部署任意应用**：通过内置的应用管理，您可以在短时间内快速部署任意分布式应用。
+## 🌟 优势
 
-✅ **节省资源，降低开销**：只需为容器付费，自动伸缩功能从根本上解决了资源浪费的问题，可以节省10%～40%的成本。
-
-✅ **轻松实现公网访问**：为您的业务自动分配二级域名，帮助您轻松实现公网访问，同时还支持自定义域名绑定。
-
-✅ **高效数据库服务**：提供秒级创建高可用数据库的服务，使业务通过服务发现内网 DNS 能直接数据库。
-
-✅ **用户友好的操作体验**：内置终端直接支持命令行操作 Kubernetes 集群，同时支持部署 Kubernetes 管理界面，让您无论对云原生技术是否熟悉，都能在 Sealos 上拥有良好的使用体验。
+- **节省资源，降低开销**：只需为容器付费，自动伸缩功能从根本上解决了资源浪费的问题，可以节省大量的成本。
+- **通用性强，无心智负担**：用户只需专注于自己的业务，无需被其他无关的复杂性所困扰。无论用户对 Kubernetes 的掌握程度如何，都可以轻松使用 Sealos。
+- **灵活 & 安全**：其独特的多租户共享机制，能在保障安全的前提下实现资源的有效隔离和协作。
 
 
 ## 🏘️ 社区与支持

booter/pkg/apply/processor/create.go

@@ -97,9 +97,11 @@ func (c *CreateProcessor) preProcess(cluster *v2.Cluster) error {
 	if err := MountClusterImages(c.Buildah, cluster, false); err != nil {
 		return err
 	}
+	// env in cluster.spec will be merged into every mounts object
+	env := maps.FromSlice(cluster.Spec.Env)
 	// extra env must been set at the very first
 	for i := range cluster.Status.Mounts {
-		cluster.Status.Mounts[i].Env = maps.Merge(cluster.Status.Mounts[i].Env, c.ExtraEnvs)
+		cluster.Status.Mounts[i].Env = maps.Merge(cluster.Status.Mounts[i].Env, env, c.ExtraEnvs)
 	}
 
 	rt, err := factory.New(cluster, c.ClusterFile.GetRuntimeConfig())