From b8dfed5d4db16b1285470ba26259c091cfa3cfe0 Mon Sep 17 00:00:00 2001 From: zzjin Date: Thu, 25 May 2023 12:18:08 +0800 Subject: [PATCH 1/4] Add type status hide/show system app. Signed-off-by: zzjin --- controllers/app/api/v1/app_types.go | 3 +++ controllers/app/config/crd/bases/app.sealos.io_apps.yaml | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/controllers/app/api/v1/app_types.go b/controllers/app/api/v1/app_types.go index de3f7c029cf..3f1c411b57d 100644 --- a/controllers/app/api/v1/app_types.go +++ b/controllers/app/api/v1/app_types.go @@ -64,6 +64,9 @@ type AppSpec struct { // AppStatus defines the observed state of App type AppStatus struct { + //+kubebuilder:validation:Enum={ normal, more, hidden } + //+kubebuilder:validation:Optional + DisplayStatus DisplayStatusType `json:"displayStatus,omitempty"` } //+kubebuilder:object:root=true diff --git a/controllers/app/config/crd/bases/app.sealos.io_apps.yaml b/controllers/app/config/crd/bases/app.sealos.io_apps.yaml index b74dd0a91f5..4280e4f9b7f 100644 --- a/controllers/app/config/crd/bases/app.sealos.io_apps.yaml +++ b/controllers/app/config/crd/bases/app.sealos.io_apps.yaml @@ -113,6 +113,13 @@ spec: type: object status: description: AppStatus defines the observed state of App + properties: + displayStatus: + enum: + - normal + - more + - "" + type: string type: object type: object served: true From 2568f21897751b480dbda6fcc453cbaf1adc0e09 Mon Sep 17 00:00:00 2001 From: zzjin Date: Thu, 25 May 2023 12:24:06 +0800 Subject: [PATCH 2/4] Fix typo Signed-off-by: zzjin --- controllers/app/api/v1/app_types.go | 2 +- controllers/app/config/crd/bases/app.sealos.io_apps.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/app/api/v1/app_types.go b/controllers/app/api/v1/app_types.go index 3f1c411b57d..505a6ae9a04 100644 --- a/controllers/app/api/v1/app_types.go +++ b/controllers/app/api/v1/app_types.go @@ -64,7 +64,7 @@ type AppSpec struct { // AppStatus defines the observed state of App type AppStatus struct { - //+kubebuilder:validation:Enum={ normal, more, hidden } + //+kubebuilder:validation:Enum={ normal, more, hidden, } //+kubebuilder:validation:Optional DisplayStatus DisplayStatusType `json:"displayStatus,omitempty"` } diff --git a/controllers/app/config/crd/bases/app.sealos.io_apps.yaml b/controllers/app/config/crd/bases/app.sealos.io_apps.yaml index 4280e4f9b7f..ac3b7ce87d8 100644 --- a/controllers/app/config/crd/bases/app.sealos.io_apps.yaml +++ b/controllers/app/config/crd/bases/app.sealos.io_apps.yaml @@ -118,7 +118,7 @@ spec: enum: - normal - more - - "" + - hidden type: string type: object type: object From 64af0d0e111f78b6714aac47c63abcc6027ee031 Mon Sep 17 00:00:00 2001 From: zzjin Date: Mon, 20 Nov 2023 14:33:21 +0800 Subject: [PATCH 3/4] Rebase app status. Signed-off-by: zzjin --- controllers/app/api/v1/app_types.go | 3 --- controllers/app/config/crd/bases/app.sealos.io_apps.yaml | 7 ------- 2 files changed, 10 deletions(-) diff --git a/controllers/app/api/v1/app_types.go b/controllers/app/api/v1/app_types.go index 505a6ae9a04..de3f7c029cf 100644 --- a/controllers/app/api/v1/app_types.go +++ b/controllers/app/api/v1/app_types.go @@ -64,9 +64,6 @@ type AppSpec struct { // AppStatus defines the observed state of App type AppStatus struct { - //+kubebuilder:validation:Enum={ normal, more, hidden, } - //+kubebuilder:validation:Optional - DisplayStatus DisplayStatusType `json:"displayStatus,omitempty"` } //+kubebuilder:object:root=true diff --git a/controllers/app/config/crd/bases/app.sealos.io_apps.yaml b/controllers/app/config/crd/bases/app.sealos.io_apps.yaml index ac3b7ce87d8..b74dd0a91f5 100644 --- a/controllers/app/config/crd/bases/app.sealos.io_apps.yaml +++ b/controllers/app/config/crd/bases/app.sealos.io_apps.yaml @@ -113,13 +113,6 @@ spec: type: object status: description: AppStatus defines the observed state of App - properties: - displayStatus: - enum: - - normal - - more - - hidden - type: string type: object type: object served: true From 77364025f5836ed93a8ea8d6e2e774ec432540fd Mon Sep 17 00:00:00 2001 From: zzjin Date: Tue, 2 Apr 2024 15:46:57 +0800 Subject: [PATCH 4/4] Update doc typos. Signed-off-by: zzjin --- docs/4.0/docs/examples/blog-platform/install-halo.md | 12 ++++++------ .../zh-Hans/examples/blog-platform/install-halo.md | 12 ++++++------ .../i18n/zh-Hans/self-hosting/sealos/installation.md | 10 +++++----- docs/website/static/global.js | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/4.0/docs/examples/blog-platform/install-halo.md b/docs/4.0/docs/examples/blog-platform/install-halo.md index b65c641676b..1f81e39bc78 100644 --- a/docs/4.0/docs/examples/blog-platform/install-halo.md +++ b/docs/4.0/docs/examples/blog-platform/install-halo.md @@ -89,12 +89,12 @@ Detailed explanation of environment variable configuration: Database link format (here we use the postgresql format): -| Connection Method | Connection Address Format | spring.sql.init.platform | -|--------------------|----------------------------------------------------------------------------------|----------------------------| -| PostgreSQL | r2dbc:pool:postgresql://{HOST}:{PORT}/{DATABASE} | postgresql | -| MySQL | r2dbc:pool:mysql://{HOST}:{PORT}/{DATABASE} | mysql | -| MariaDB | r2dbc:pool:mariadb://{HOST}:{PORT}/{DATABASE} | mysql | -| H2 Database | r2dbc:h2:file:///${halo.work-dir}/db/halo-next?MODE=MySQL&DB_CLOSE_ON_EXIT=FALSE | h2 | +| Connection Method | Connection Address Format | spring.sql.init.platform | +|-------------------|------------------------------------------------------------------------------------|--------------------------| +| PostgreSQL | r2dbc:pool:postgresql://`{HOST}`:`{PORT}`/`{DATABASE}` | postgresql | +| MySQL | r2dbc:pool:mysql://`{HOST}`:`{PORT}`/`{DATABASE}` | mysql | +| MariaDB | r2dbc:pool:mariadb://`{HOST}`:`{PORT}`/`{DATABASE}` | mysql | +| H2 Database | r2dbc:h2:file:///`${halo.work-dir}`/db/halo-next?MODE=MySQL&DB_CLOSE_ON_EXIT=FALSE | h2 | ### Network configuration diff --git a/docs/4.0/i18n/zh-Hans/examples/blog-platform/install-halo.md b/docs/4.0/i18n/zh-Hans/examples/blog-platform/install-halo.md index 00bc8413f31..120af78ff06 100644 --- a/docs/4.0/i18n/zh-Hans/examples/blog-platform/install-halo.md +++ b/docs/4.0/i18n/zh-Hans/examples/blog-platform/install-halo.md @@ -76,12 +76,12 @@ halo.security.initializer.superadminpassword=sealos 数据库的链接格式（这里我们使用 postgresql 的格式）： -| 链接方式 | 链接地址格式 | spring.sql.init.platform | -| ----------- | ------------------------------------------------------------ | ------------------------ | -| PostgreSQL | r2dbc:pool:postgresql://{HOST}:{PORT}/{DATABASE} | postgresql | -| MySQL | r2dbc:pool:mysql://{HOST}:{PORT}/{DATABASE} | mysql | -| MariaDB | r2dbc:pool:mariadb://{HOST}:{PORT}/{DATABASE} | mysql | -| H2 Database | r2dbc:h2:file:///${halo.work-dir}/db/halo-next?MODE=MySQL&DB_CLOSE_ON_EXIT=FALSE | h2 | +| 链接方式 | 链接地址格式 | spring.sql.init.platform | +| ----------- | ---------------------------------------------------------------------------------- | ------------------------ | +| PostgreSQL | r2dbc:pool:postgresql://`{HOST}`:`{PORT}`/`{DATABASE}` | postgresql | +| MySQL | r2dbc:pool:mysql://`{HOST}`:`{PORT}`/`{DATABASE}` | mysql | +| MariaDB | r2dbc:pool:mariadb://`{HOST}`:`{PORT}`/`{DATABASE}` | mysql | +| H2 Database | r2dbc:h2:file:///`${halo.work-dir}`/db/halo-next?MODE=MySQL&DB_CLOSE_ON_EXIT=FALSE | h2 | ### 网络配置 diff --git a/docs/4.0/i18n/zh-Hans/self-hosting/sealos/installation.md b/docs/4.0/i18n/zh-Hans/self-hosting/sealos/installation.md index fceed4922f3..236cced633e 100644 --- a/docs/4.0/i18n/zh-Hans/self-hosting/sealos/installation.md +++ b/docs/4.0/i18n/zh-Hans/self-hosting/sealos/installation.md @@ -147,9 +147,9 @@ $ curl -sfL https://mirror.ghproxy.com/https://raw.githubusercontent.com/labring --key-path= ``` -+ 需要替换成你自己的公网域名。 -+ 需要替换成你的证书位置，通常是 `.crt` 或 `.pem` 文件。例如：`/root/certs/example.crt`。 -+ 需要替换成你的私钥位置，通常是 `.key` 或 `.pem` 文件。例如：`/root/certs/example.key`。 ++ `` 需要替换成你自己的公网域名。 ++ `` 需要替换成你的证书位置，通常是 `.crt` 或 `.pem` 文件。例如：`/root/certs/example.crt`。 ++ `` 需要替换成你的私钥位置，通常是 `.key` 或 `.pem` 文件。例如：`/root/certs/example.key`。 ### 3、有公网域名，想内网访问 @@ -171,7 +171,7 @@ $ curl -sfL https://mirror.ghproxy.com/https://raw.githubusercontent.com/labring --cloud-domain= ``` -其中 需要替换成你自己的公网域名。 +其中 `` 需要替换成你自己的公网域名。 安装过程中 Sealos 会使用 [cert-manager](https://cert-manager.io/docs/) 来自签名证书。 @@ -229,7 +229,7 @@ $ curl -sfL https://mirror.ghproxy.com/https://raw.githubusercontent.com/labring --cloud-domain= ``` -其中 需要替换成你自己的自定义域名。 +其中 `` 需要替换成你自己的自定义域名。 安装过程中 Sealos 会使用 [cert-manager](https://cert-manager.io/docs/) 来自签名证书。 diff --git a/docs/website/static/global.js b/docs/website/static/global.js index 5bdc7fe8852..c4559d524be 100644 --- a/docs/website/static/global.js +++ b/docs/website/static/global.js @@ -1,5 +1,5 @@ document.addEventListener("DOMContentLoaded", function () { - console.log('Handle a tag interception', 111) + // console.log('Handle a tag interception', 111) const parentElement = document.body parentElement.addEventListener("click", function (event) { if (event.target.tagName === "A") { @@ -10,9 +10,9 @@ document.addEventListener("DOMContentLoaded", function () { if (href.includes("sealos.io") || href.includes("sealos.top") || href.includes("sealos.run")) { event.preventDefault() - console.log("Before:" + href) + // console.log("Before:" + href) const modifiedHref = href.replace(/(sealos\.io|sealos\.top|sealos\.run)/, targetHostname) - console.log("After:", modifiedHref) + // console.log("After:", modifiedHref) event.target.href = modifiedHref window.open(modifiedHref) @@ -26,7 +26,7 @@ document.addEventListener("DOMContentLoaded", function () { .then(response => response.json()) .then(data => { const responseBody = JSON.parse(data.body) - console.log(responseBody) + // console.log(responseBody) }) .catch(error => { console.error('请求失败，但这可能是因为达到提交上限:', error) @@ -37,7 +37,7 @@ document.addEventListener("DOMContentLoaded", function () { function handleBannerClose () { const closeButton = document.querySelector('.clean-btn') - console.log(closeButton) + // console.log(closeButton) if (closeButton) { closeButton.click() }