diff --git a/install/installer/pkg/config/v1/config.go b/install/installer/pkg/config/v1/config.go index c8da8f208e3c3a..bdcaf0c7c010a8 100644 --- a/install/installer/pkg/config/v1/config.go +++ b/install/installer/pkg/config/v1/config.go @@ -121,9 +121,6 @@ type Config struct { Database Database `json:"database" validate:"required"` - // Deprecated. - MessageBus *MessageBus `json:"messageBus,omitempty"` - ObjectStorage ObjectStorage `json:"objectStorage" validate:"required"` ContainerRegistry ContainerRegistry `json:"containerRegistry" validate:"required"` @@ -186,10 +183,6 @@ type Tracing struct { SecretName *string `json:"secretName,omitempty"` } -type MessageBus struct { - Credentials *ObjectRef `json:"credentials"` -} - type Database struct { InCluster *bool `json:"inCluster,omitempty"` External *DatabaseExternal `json:"external,omitempty"` diff --git a/install/installer/pkg/config/v1/deprecations.go b/install/installer/pkg/config/v1/deprecations.go index e7a81e1e6aa237..7807bd9c6fc3b5 100644 --- a/install/installer/pkg/config/v1/deprecations.go +++ b/install/installer/pkg/config/v1/deprecations.go @@ -58,13 +58,6 @@ var deprecatedFields = map[string]deprecatedField{ return nil }, }, - // No MapValue can exist as this requires a secret rather than passing in the value - "experimental.common.staticMessagebusPassword": { - Selector: func(cfg *Config) (bool, any) { - val := cfg.Experimental.Common.StaticMessagebusPassword - return val != "", "***" // Redact the password - }, - }, "experimental.ide.resolveLatest": { Selector: func(cfg *Config) (bool, any) { val := cfg.Experimental.IDE.ResolveLatest diff --git a/install/installer/pkg/config/v1/experimental/experimental.go b/install/installer/pkg/config/v1/experimental/experimental.go index 3d59b50e54d33e..22eebb915d787e 100644 --- a/install/installer/pkg/config/v1/experimental/experimental.go +++ b/install/installer/pkg/config/v1/experimental/experimental.go @@ -35,8 +35,6 @@ type Config struct { type CommonConfig struct { // Deprecated. PodConfig map[string]*PodConfig `json:"podConfig,omitempty"` - // Deprecated use a secret instead in messageBus.credentials - StaticMessagebusPassword string `json:"staticMessagebusPassword"` } type PodConfig struct {