From 1237f7350e94e3273e5d700f528c6236c3543ebb Mon Sep 17 00:00:00 2001 From: barnettZQG Date: Fri, 22 Apr 2022 16:33:23 +0800 Subject: [PATCH] Feat: change the webservice and config-image-registry definitions (#3732) Signed-off-by: barnettZQG --- .../templates/defwithtemplate/config-image-registry.yaml | 1 + charts/vela-core/templates/defwithtemplate/webservice.yaml | 2 +- .../templates/defwithtemplate/config-image-registry.yaml | 1 + charts/vela-minimal/templates/defwithtemplate/webservice.yaml | 2 +- .../definitions/internal/component/config-image-registry.cue | 1 + vela-templates/definitions/internal/component/webservice.cue | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/vela-core/templates/defwithtemplate/config-image-registry.yaml b/charts/vela-core/templates/defwithtemplate/config-image-registry.yaml index eac7f2fee..53cc3a25f 100644 --- a/charts/vela-core/templates/defwithtemplate/config-image-registry.yaml +++ b/charts/vela-core/templates/defwithtemplate/config-image-registry.yaml @@ -10,6 +10,7 @@ metadata: custom.definition.oam.dev/catalog.config.oam.dev: velacore-config custom.definition.oam.dev/multi-cluster.config.oam.dev: "true" custom.definition.oam.dev/type.config.oam.dev: image-registry + custom.definition.oam.dev/ui-hidden: "true" name: config-image-registry namespace: {{ include "systemDefinitionNamespace" . }} spec: diff --git a/charts/vela-core/templates/defwithtemplate/webservice.yaml b/charts/vela-core/templates/defwithtemplate/webservice.yaml index 199a84f66..344391d8b 100644 --- a/charts/vela-core/templates/defwithtemplate/webservice.yaml +++ b/charts/vela-core/templates/defwithtemplate/webservice.yaml @@ -455,7 +455,7 @@ spec: readinessProbe?: #HealthProbe // +usage=Specify the hostAliases to add - hostAliases: [...{ + hostAliases?: [...{ ip: string hostnames: [...string] }] diff --git a/charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml b/charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml index eac7f2fee..53cc3a25f 100644 --- a/charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml +++ b/charts/vela-minimal/templates/defwithtemplate/config-image-registry.yaml @@ -10,6 +10,7 @@ metadata: custom.definition.oam.dev/catalog.config.oam.dev: velacore-config custom.definition.oam.dev/multi-cluster.config.oam.dev: "true" custom.definition.oam.dev/type.config.oam.dev: image-registry + custom.definition.oam.dev/ui-hidden: "true" name: config-image-registry namespace: {{ include "systemDefinitionNamespace" . }} spec: diff --git a/charts/vela-minimal/templates/defwithtemplate/webservice.yaml b/charts/vela-minimal/templates/defwithtemplate/webservice.yaml index 199a84f66..344391d8b 100644 --- a/charts/vela-minimal/templates/defwithtemplate/webservice.yaml +++ b/charts/vela-minimal/templates/defwithtemplate/webservice.yaml @@ -455,7 +455,7 @@ spec: readinessProbe?: #HealthProbe // +usage=Specify the hostAliases to add - hostAliases: [...{ + hostAliases?: [...{ ip: string hostnames: [...string] }] diff --git a/vela-templates/definitions/internal/component/config-image-registry.cue b/vela-templates/definitions/internal/component/config-image-registry.cue index e9dfa27e5..2133ebdf9 100644 --- a/vela-templates/definitions/internal/component/config-image-registry.cue +++ b/vela-templates/definitions/internal/component/config-image-registry.cue @@ -12,6 +12,7 @@ import ( "catalog.config.oam.dev": "velacore-config" "type.config.oam.dev": "image-registry" "multi-cluster.config.oam.dev": "true" + "ui-hidden": "true" } description: "Config information to authenticate image registry" attributes: workload: type: "autodetects.core.oam.dev" diff --git a/vela-templates/definitions/internal/component/webservice.cue b/vela-templates/definitions/internal/component/webservice.cue index bd1795830..2b1a0ab46 100644 --- a/vela-templates/definitions/internal/component/webservice.cue +++ b/vela-templates/definitions/internal/component/webservice.cue @@ -501,7 +501,7 @@ template: { readinessProbe?: #HealthProbe // +usage=Specify the hostAliases to add - hostAliases: [...{ + hostAliases?: [...{ ip: string hostnames: [...string] }]