From 0e4ec9acd2c8e3758fea20472fc0b18b58ff758d Mon Sep 17 00:00:00 2001 From: Wen Zhou Date: Wed, 24 Jul 2024 10:38:37 +0200 Subject: [PATCH] api: set manifestUri as deprecated - we do not use this for devFlag in DSCI any more - it was used when we still have odh-manifests repo - if use would set devFlags, it should be done in DSC on component base - keep logic still in code but only set warning on API Signed-off-by: Wen Zhou --- apis/dscinitialization/v1/dscinitialization_types.go | 1 + .../dscinitialization.opendatahub.io_dscinitializations.yaml | 4 +++- .../dscinitialization.opendatahub.io_dscinitializations.yaml | 4 +++- controllers/dscinitialization/suite_test.go | 2 +- controllers/webhook/webhook_suite_test.go | 2 +- docs/api-overview.md | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apis/dscinitialization/v1/dscinitialization_types.go b/apis/dscinitialization/v1/dscinitialization_types.go index c283286021d..7fcf7bb273d 100644 --- a/apis/dscinitialization/v1/dscinitialization_types.go +++ b/apis/dscinitialization/v1/dscinitialization_types.go @@ -66,6 +66,7 @@ type DSCInitializationSpec struct { // DevFlags defines list of fields that can be used by developers to test customizations. This is not recommended // to be used in production environment. type DevFlags struct { + // ## DEPRECATED ## : ManifestsUri set on DSCI is not maintained. // Custom manifests uri for odh-manifests // +optional ManifestsUri string `json:"manifestsUri,omitempty"` diff --git a/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml b/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml index a4138f67837..377cad15951 100644 --- a/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml +++ b/bundle/manifests/dscinitialization.opendatahub.io_dscinitializations.yaml @@ -82,7 +82,9 @@ spec: - default type: string manifestsUri: - description: Custom manifests uri for odh-manifests + description: |- + ## DEPRECATED ## : ManifestsUri set on DSCI is not maintained. + Custom manifests uri for odh-manifests type: string type: object monitoring: diff --git a/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml b/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml index d1750a44756..9bf56ff0e74 100644 --- a/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml +++ b/config/crd/bases/dscinitialization.opendatahub.io_dscinitializations.yaml @@ -82,7 +82,9 @@ spec: - default type: string manifestsUri: - description: Custom manifests uri for odh-manifests + description: |- + ## DEPRECATED ## : ManifestsUri set on DSCI is not maintained. + Custom manifests uri for odh-manifests type: string type: object monitoring: diff --git a/controllers/dscinitialization/suite_test.go b/controllers/dscinitialization/suite_test.go index 10ffa98e404..1ce2046e0c3 100644 --- a/controllers/dscinitialization/suite_test.go +++ b/controllers/dscinitialization/suite_test.go @@ -79,7 +79,7 @@ func TestDataScienceClusterInitialization(t *testing.T) { var testScheme = runtime.NewScheme() -//nolint:fatcontext + var _ = BeforeSuite(func() { // can't use suite's context as the manager should survive the function gCtx, gCancel = context.WithCancel(context.Background()) diff --git a/controllers/webhook/webhook_suite_test.go b/controllers/webhook/webhook_suite_test.go index b936ca30188..49badcb52d8 100644 --- a/controllers/webhook/webhook_suite_test.go +++ b/controllers/webhook/webhook_suite_test.go @@ -73,7 +73,7 @@ func TestAPIs(t *testing.T) { RunSpecs(t, "Webhook Suite") } -//nolint:fatcontext + var _ = BeforeSuite(func() { // can't use suite's context as the manager should survive the function gCtx, gCancel = context.WithCancel(context.Background()) diff --git a/docs/api-overview.md b/docs/api-overview.md index ff78777b9a2..7a1c63aa15b 100644 --- a/docs/api-overview.md +++ b/docs/api-overview.md @@ -1791,7 +1791,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `manifestsUri` _string_ | Custom manifests uri for odh-manifests | | | +| `manifestsUri` _string_ | ## DEPRECATED ## : ManifestsUri set on DSCI is not maintained.
Custom manifests uri for odh-manifests | | | | `logmode` _string_ | ## DEPRECATED ##: Ignored, use LogLevel instead | production | Enum: [devel development prod production default]
| | `logLevel` _string_ | Override Zap log level. Can be "debug", "info", "error" or a number (more verbose). | | |