Hubsize update (#677)

* Updated values.yaml for hubsize Signed-off-by: Nathaniel Graham <[email protected]> * Updated HubSize default to Small Signed-off-by: Nathaniel Graham <[email protected]> * Removed incorrect comment Signed-off-by: Nathaniel Graham <[email protected]> * Updated default to Small - Also changed ExtraLarge to XLarge Signed-off-by: Nathaniel Graham <[email protected]> * Removed component CRD from crd/bases Signed-off-by: Nathaniel Graham <[email protected]> --------- Signed-off-by: Nathaniel Graham <[email protected]>
stolostron · Apr 26, 2024 · 6eee632 · 6eee632
1 parent 15d21f8
commit 6eee632
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 49 deletions.
diff --git a/api/v1/multiclusterengine_types.go b/api/v1/multiclusterengine_types.go
@@ -28,12 +28,11 @@ type AvailabilityType string
 
 type HubSize string
 
-// Putting medium first here defaults it to Medium
 const (
-	Small      = "Small"
-	Medium     = "Medium"
-	Large      = "Large"
-	ExtraLarge = "ExtraLarge"
+	Small  = "Small"
+	Medium = "Medium"
+	Large  = "Large"
+	XLarge = "XLarge"
 )
 
 // DeploymentMode
@@ -61,9 +60,9 @@ type MultiClusterEngineSpec struct {
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
 
 	// The resource allocation bucket for this hub to use.
-	// Small, Medium, Large, ExtraLarge]. Defaults to Medium if not specified.
-	//+kubebuilder:validation:Enum:=Small;Medium;Large;ExtraLarge
-	//+kubebuilder:default:=Medium
+	// Small, Medium, Large, XLarge]. Defaults to Small if not specified.
+	//+kubebuilder:validation:Enum:=Small;Medium;Large;XLarge
+	//+kubebuilder:default:=Small
 	//+kubebuilder:validation:Type:=string
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Hub Size",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
 	HubSize HubSize `json:"hubSize,omitempty"`

diff --git a/bundle/manifests/multicluster-engine.clusterserviceversion.yaml b/bundle/manifests/multicluster-engine.clusterserviceversion.yaml
@@ -14,7 +14,7 @@ metadata:
         }
       ]
     capabilities: Basic Install
-    createdAt: "2024-04-01T22:23:48Z"
+    createdAt: "2024-04-25T18:14:26Z"
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: multicluster-engine.v0.0.1
@@ -41,7 +41,7 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:select:High
         - urn:alm:descriptor:com.tectonic.ui:select:Basic
       - description: The resource allocation bucket for this hub to use. Small, Medium,
-          Large, ExtraLarge]. Defaults to Medium if not specified.
+          Large, XLarge]. Defaults to Small if not specified.
         displayName: Hub Size
         path: hubSize
         x-descriptors:
@@ -594,6 +594,23 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - addon.open-cluster-management.io
+          resources:
+          - clustermanagementaddons
+          - clustermanagementaddons/finalizers
+          - clustermanagementaddons/status
+          - managedclusteraddons
+          - managedclusteraddons/finalizers
+          - managedclusteraddons/status
+          verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
         - apiGroups:
           - addon.open-cluster-management.io
           resources:
@@ -1553,6 +1570,8 @@ spec:
           - dnses
           verbs:
           - get
+          - list
+          - watch
         - apiGroups:
           - config.openshift.io
           resources:

diff --git a/bundle/manifests/multicluster.openshift.io_multiclusterengines.yaml b/bundle/manifests/multicluster.openshift.io_multiclusterengines.yaml
@@ -53,14 +53,14 @@ spec:
                   Options are: Basic and High (default)'
                 type: string
               hubSize:
-                default: Medium
+                default: Small
                 description: The resource allocation bucket for this hub to use. Small,
-                  Medium, Large, ExtraLarge]. Defaults to Medium if not specified.
+                  Medium, Large, XLarge]. Defaults to Small if not specified.
                 enum:
                 - Small
                 - Medium
                 - Large
-                - ExtraLarge
+                - XLarge
                 type: string
               imagePullSecret:
                 description: Override pull secret for accessing MultiClusterEngine

diff --git a/config/crd/bases/multicluster.openshift.io_multiclusterengines.yaml b/config/crd/bases/multicluster.openshift.io_multiclusterengines.yaml
@@ -54,14 +54,14 @@ spec:
                   Options are: Basic and High (default)'
                 type: string
               hubSize:
-                default: Medium
+                default: Small
                 description: The resource allocation bucket for this hub to use. Small,
-                  Medium, Large, ExtraLarge]. Defaults to Medium if not specified.
+                  Medium, Large, XLarge]. Defaults to Small if not specified.
                 enum:
                 - Small
                 - Medium
                 - Large
-                - ExtraLarge
+                - XLarge
                 type: string
               imagePullSecret:
                 description: Override pull secret for accessing MultiClusterEngine

diff --git a/config/manifests/bases/multicluster-engine.clusterserviceversion.yaml b/config/manifests/bases/multicluster-engine.clusterserviceversion.yaml
@@ -28,7 +28,7 @@ spec:
         - urn:alm:descriptor:com.tectonic.ui:select:High
         - urn:alm:descriptor:com.tectonic.ui:select:Basic
       - description: The resource allocation bucket for this hub to use. Small, Medium,
-          Large, ExtraLarge]. Defaults to Medium if not specified.
+          Large, XLarge]. Defaults to Small if not specified.
         displayName: Hub Size
         path: hubSize
         x-descriptors:

diff --git a/hack/bundle-automation/chart-templates/values.yaml b/hack/bundle-automation/chart-templates/values.yaml
@@ -6,6 +6,7 @@ global:
   templateOverrides: {}
   namespace: default
   pullSecret: null
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}

diff --git a/hack/bundle-automation/chart-values/managed-serviceaccount/values.yaml b/hack/bundle-automation/chart-values/managed-serviceaccount/values.yaml
@@ -7,3 +7,5 @@ featureGates:
 agentImagePullSecret: ""
 enableAddOnDeploymentConfig: true
 hubDeployMode: AddOnTemplate
+global:
+  hubSize: Small
diff --git a/pkg/rendering/renderer.go b/pkg/rendering/renderer.go
@@ -40,6 +40,7 @@ type Global struct {
 	PullSecret        string            `json:"pullSecret" structs:"pullSecret"`
 	Namespace         string            `json:"namespace" structs:"namespace"`
 	ConfigSecret      string            `json:"configSecret" structs:"configSecret"`
+	HubSize           v1.HubSize        `json:"hubSize" structs:"hubSize" yaml:"hubSize"`
 }
 
 type HubConfig struct {
@@ -313,6 +314,8 @@ func injectValuesOverrides(values *Values, backplaneConfig *v1.MultiClusterEngin
 
 	values.Global.Namespace = backplaneConfig.Spec.TargetNamespace
 
+	values.Global.HubSize = backplaneConfig.Spec.HubSize
+
 	values.Global.PullSecret = backplaneConfig.Spec.ImagePullSecret
 
 	if v1.IsInHostedMode(backplaneConfig) {

diff --git a/pkg/templates/charts/always/rbac-aggregates/values.yaml b/pkg/templates/charts/always/rbac-aggregates/values.yaml
@@ -1,6 +1,7 @@
 global:
   imageOverrides: []
   pullSecret: null
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}

diff --git a/pkg/templates/charts/hosted/server-foundation/values.yaml b/pkg/templates/charts/hosted/server-foundation/values.yaml
@@ -1,11 +1,12 @@
 global:
-    imageOverrides:
-        multicloud_manager: quay.io/test/test:test
-    pullSecret: ""
-    namespace: default
+  imageOverrides:
+    multicloud_manager: quay.io/test/test:test
+  pullSecret: ""
+  namespace: default
+  hubSize: Small
 hubconfig:
-    nodeSelector: {}
-    proxyConfigs: {}
-    replicaCount: 1
-    tolerations: []
+  nodeSelector: {}
+  proxyConfigs: {}
+  replicaCount: 1
+  tolerations: []
 org: open-cluster-management
diff --git a/pkg/templates/charts/hosting/server-foundation/values.yaml b/pkg/templates/charts/hosting/server-foundation/values.yaml
@@ -1,11 +1,12 @@
 global:
-    imageOverrides:
-        multicloud_manager: quay.io/test/test:test
-    pullSecret: ""
-    namespace: default
+  imageOverrides:
+    multicloud_manager: quay.io/test/test:test
+  pullSecret: ""
+  namespace: default
+  hubSize: Small
 hubconfig:
-    nodeSelector: {}
-    proxyConfigs: {}
-    replicaCount: 1
-    tolerations: []
+  nodeSelector: {}
+  proxyConfigs: {}
+  replicaCount: 1
+  tolerations: []
 org: open-cluster-management
diff --git a/pkg/templates/charts/toggle/assisted-service/values.yaml b/pkg/templates/charts/toggle/assisted-service/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     assisted_image_service: ''
     assisted_installer: ''

diff --git a/pkg/templates/charts/toggle/cluster-lifecycle/values.yaml b/pkg/templates/charts/toggle/cluster-lifecycle/values.yaml
@@ -8,6 +8,7 @@ global:
   templateOverrides: {}
   pullSecret: ""
   namespace: default
+  hubSize: Small
 hubconfig:
   nodeSelector: {}
   proxyConfigs: {}

diff --git a/pkg/templates/charts/toggle/cluster-manager/values.yaml b/pkg/templates/charts/toggle/cluster-manager/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     registration_operator: ''
   namespace: default

diff --git a/pkg/templates/charts/toggle/cluster-proxy-addon/values.yaml b/pkg/templates/charts/toggle/cluster-proxy-addon/values.yaml
@@ -6,11 +6,11 @@ global:
     cluster_proxy_addon: ""
     cluster_proxy: ""
   templateOverrides: {}
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   replicaCount: 1
   proxyConfigs: {}
   tolerations: []
   ocpVersion: "4.12.0"
 org: open-cluster-management
-
diff --git a/pkg/templates/charts/toggle/console-mce/values.yaml b/pkg/templates/charts/toggle/console-mce/values.yaml
@@ -8,14 +8,15 @@ global:
   imageOverrides:
     console_mce: ""
   templateOverrides: {}
-    # Available template overrides:
-    # console_mce_deployment_container_memory_request: <memory-value>
-    # console_mce_deployment_container_memory_limit: <memory-value>
-    # console_mce_deployment_container_cpu_request: <cpu-value>
-    # console_mce_deployment_container_cpu_limit: <cpu-value>
+  # Available template overrides:
+  # console_mce_deployment_container_memory_request: <memory-value>
+  # console_mce_deployment_container_memory_limit: <memory-value>
+  # console_mce_deployment_container_cpu_request: <cpu-value>
+  # console_mce_deployment_container_cpu_limit: <cpu-value>
   pullPolicy: Always
   namespace: default
   pullSecret: null
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}

diff --git a/pkg/templates/charts/toggle/discovery-operator/values.yaml b/pkg/templates/charts/toggle/discovery-operator/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     discovery_operator: ''
   namespace: default

diff --git a/pkg/templates/charts/toggle/hive-operator/values.yaml b/pkg/templates/charts/toggle/hive-operator/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     openshift_hive: ''
   namespace: default

diff --git a/pkg/templates/charts/toggle/hypershift/values.yaml b/pkg/templates/charts/toggle/hypershift/values.yaml
@@ -9,6 +9,7 @@ global:
   templateOverrides: {}
   namespace: default
   pullSecret: null
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}

diff --git a/pkg/templates/charts/toggle/image-based-install-operator/values.yaml b/pkg/templates/charts/toggle/image-based-install-operator/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     image_based_install_operator: ''
   namespace: default

diff --git a/pkg/templates/charts/toggle/managed-serviceaccount/values.yaml b/pkg/templates/charts/toggle/managed-serviceaccount/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     managed_serviceaccount: ''
   namespace: default

diff --git a/pkg/templates/charts/toggle/server-foundation/values.yaml b/pkg/templates/charts/toggle/server-foundation/values.yaml
@@ -1,13 +1,14 @@
 global:
-    imageOverrides:
-        multicloud_manager: quay.io/test/test:test
-    templateOverrides: {}
-    pullSecret: ""
-    namespace: default
+  imageOverrides:
+    multicloud_manager: quay.io/test/test:test
+  templateOverrides: {}
+  pullSecret: ""
+  namespace: default
+  hubSize: Small
 hubconfig:
-    nodeSelector: {}
-    proxyConfigs: {}
-    replicaCount: 1
-    tolerations: []
-    ocpVersion: "4.12.0"
+  nodeSelector: {}
+  proxyConfigs: {}
+  replicaCount: 1
+  tolerations: []
+  ocpVersion: "4.12.0"
 org: open-cluster-management