Add topologyMode to Console backend

jeremyary · Mar 9, 2022 · 09346cd · 09346cd
1 parent 6575a64
commit 09346cd
Show file tree

Hide file tree

Showing 47 changed files with 13,782 additions and 3 deletions.
diff --git a/pkg/serverconfig/types.go b/pkg/serverconfig/types.go
@@ -1,5 +1,9 @@
 package serverconfig
 
+import (
+ configv1 "github.com/openshift/api/config/v1"
+)
+
 // This file is a copy of the struct within the console operator:
 // https://github.com/openshift/console-operator/blob/master/pkg/console/subresource/consoleserver/types.go
 // These structs need to remain in sync.
@@ -59,9 +63,10 @@ type MonitoringInfo struct {
 
 // ClusterInfo holds information the about the cluster such as master public URL and console public URL.
 type ClusterInfo struct {
- ConsoleBaseAddress string `yaml:"consoleBaseAddress,omitempty"`
- ConsoleBasePath string `yaml:"consoleBasePath,omitempty"`
- MasterPublicURL string `yaml:"masterPublicURL,omitempty"`
+ ConsoleBaseAddress string `yaml:"consoleBaseAddress,omitempty"`
+ ConsoleBasePath string `yaml:"consoleBasePath,omitempty"`
+ MasterPublicURL string `yaml:"masterPublicURL,omitempty"`
+ ControlPlaneToplogy configv1.TopologyMode `yaml:"controlPlaneTopology,omitempty"`
 }
 
 // Auth holds configuration for authenticating with OpenShift. The auth method is assumed to be "openshift".

diff --git a/vendor/github.com/openshift/api/config/install.go b/vendor/github.com/openshift/api/config/install.go
diff --git a/....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml b/....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml