Remove MessageBus references

gitpod-io · Sep 23, 2023 · 98ad13b · 98ad13b
1 parent 5e587c8
commit 98ad13b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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 {