From 8a784cd62222e46c0ca289352547df3ba246396b 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 73f4717cd62df214f36413eb8cf060f102c2050f 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 8b93b58671425a22a9832a13f54935cda823a75d 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 439668d51b5c4a9ed67b2562c724884f210834d0 Mon Sep 17 00:00:00 2001 From: zzjin Date: Tue, 12 Dec 2023 11:18:04 +0800 Subject: [PATCH 4/4] Fix solver http01 type to ClusterIP to prevent port usage. Signed-off-by: zzjin --- frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts b/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts index 51668832a4c..b6414ee140c 100644 --- a/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts +++ b/frontend/providers/applaunchpad/src/utils/deployYaml2Json.ts @@ -430,7 +430,8 @@ export const json2Ingress = (data: AppEditType) => { { http01: { ingress: { - class: 'nginx' + class: 'nginx', + serviceType: 'ClusterIP' } } }