Hubsize chart (stolostron#1464)

ngraham20 · web-flow · commit bf48289aab6f · 2024-04-26T15:56:04.000Z
* Added HubSize to render

Signed-off-by: Nathaniel Graham &lt;ngraham@redhat.com&gt;

* Added hubSize to values.yaml in several places

Signed-off-by: Nathaniel Graham &lt;ngraham@redhat.com&gt;

* Updated HubSize default to Small

Signed-off-by: Nathaniel Graham &lt;ngraham@redhat.com&gt;

* Updated cluster-permission values.yaml

Signed-off-by: Nathaniel Graham &lt;ngraham@redhat.com&gt;

* cluster-permission values updated

Signed-off-by: Nathaniel Graham &lt;ngraham@redhat.com&gt;

---------

Signed-off-by: Nathaniel Graham &lt;ngraham@redhat.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ vendor/
 bundle/manifests/multiclusterhub-operator_v1_serviceaccount.yaml
 
 hack/prereqs/pull-secret.yaml
+hack/bundle-automation/tmp/
 
 test/function_tests/results
 hack/bundle-automation/__pycache__
diff --git a/api/v1/multiclusterhub_types.go b/api/v1/multiclusterhub_types.go
@@ -79,7 +79,7 @@ type MultiClusterHubSpec struct {
 	// 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
+	//+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/multiclusterhub-operator.clusterserviceversion.yaml b/bundle/manifests/multiclusterhub-operator.clusterserviceversion.yaml
@@ -17,7 +17,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     certified: "false"
-    createdAt: "2024-04-02T20:35:16Z"
+    createdAt: "2024-04-22T16:20:47Z"
     description: Open management of Openshift and Kubernetes clusters
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
diff --git a/hack/bundle-automation/chart-templates/values.yaml b/hack/bundle-automation/chart-templates/values.yaml
@@ -3,13 +3,12 @@
 # Copyright Contributors to the Open Cluster Management project
 
 org: open-cluster-management
-
 global:
   pullSecret: null
   imageOverrides: {}
   templateOverrides: {}
   namespace: default
-    
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   replicaCount: 1
diff --git a/hack/bundle-automation/chart-values/managed-serviceaccount/values.yaml b/hack/bundle-automation/chart-values/managed-serviceaccount/values.yaml
@@ -5,3 +5,5 @@ agentInstallAll: false
 featureGates:
   ephemeralIdentity: true
 agentImagePullSecret: ""
+global:
+  hubSize: Small
diff --git a/pkg/rendering/renderer.go b/pkg/rendering/renderer.go
@@ -43,6 +43,7 @@ type Global struct {
 	InstallPlanApproval subv1alpha1.Approval `json:"installPlanApproval" structs:"installPlanApproval"`
 	Source              string               `json:"source" structs:"source"`
 	SourceNamespace     string               `json:"sourceNamespace" structs:"sourceNamespace"`
+	HubSize             v1.HubSize           `json:"hubSize" structs:"hubSize" yaml:"hubSize"`
 }
 
 type HubConfig struct {
@@ -312,6 +313,8 @@ func injectValuesOverrides(values *Values, mch *v1.MultiClusterHub, images map[s
 
 	values.Global.ImageRepository = utils.GetImageRepository(mch)
 
+	values.Global.HubSize = mch.Spec.HubSize
+
 	values.HubConfig.ReplicaCount = utils.DefaultReplicaCount(mch)
 
 	values.HubConfig.NodeSelector = mch.Spec.NodeSelector
diff --git a/pkg/templates/charts/toggle/cluster-backup/values.yaml b/pkg/templates/charts/toggle/cluster-backup/values.yaml
@@ -5,7 +5,6 @@
 # Declare variables to be passed into your templates.
 
 org: open-cluster-management
-
 global:
   pullPolicy: Always
   pullSecret: null
@@ -17,7 +16,7 @@ global:
   installPlanApproval: Automatic
   source: redhat-operators
   sourceNamespace: openshift-marketplace
-
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   replicaCount: 1
@@ -27,50 +26,43 @@ hubconfig:
     - key: dedicated
       operator: Exists
       effect: NoSchedule
-    - effect: NoSchedule 
-      key: node-role.kubernetes.io/infra 
+    - effect: NoSchedule
+      key: node-role.kubernetes.io/infra
       operator: Exists
-
 affinity:
   podAntiAffinity:
     preferredDuringSchedulingIgnoredDuringExecution:
-    - weight: 70
-      podAffinityTerm:
-        topologyKey: topology.kubernetes.io/zone
-        labelSelector:
-          matchExpressions:
-          - key: ocm-antiaffinity-selector
-            operator: In
-            values:
-            - clusterbackup
-    - weight: 35
-      podAffinityTerm:
-        topologyKey: kubernetes.io/hostname
-        labelSelector:
-          matchExpressions:
-          - key: ocm-antiaffinity-selector
-            operator: In
-            values:
-            - clusterbackup
-
+      - weight: 70
+        podAffinityTerm:
+          topologyKey: topology.kubernetes.io/zone
+          labelSelector:
+            matchExpressions:
+              - key: ocm-antiaffinity-selector
+                operator: In
+                values:
+                  - clusterbackup
+      - weight: 35
+        podAffinityTerm:
+          topologyKey: kubernetes.io/hostname
+          labelSelector:
+            matchExpressions:
+              - key: ocm-antiaffinity-selector
+                operator: In
+                values:
+                  - clusterbackup
 arch:
-- amd64
-- ppc64le
-- s390x
-- arm64
-
+  - amd64
+  - ppc64le
+  - s390x
+  - arm64
 enabled: true
-
 clusterbackup:
   resources:
     requests:
       memory: "256Mi"
       cpu: "50m"
-
-
 BackupRestorePolicyName: backup-restore-enabled
 ClusterCollisionPhase: BackupCollision
-
 oadpOperator:
   name: redhat-oadp-operator
   channel: stable-1.3
diff --git a/pkg/templates/charts/toggle/cluster-lifecycle/values.yaml b/pkg/templates/charts/toggle/cluster-lifecycle/values.yaml
@@ -5,6 +5,7 @@ global:
   namespace: default
   pullSecret: null
   imageRepository: "" # utils.GetImageRepository(m)
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
diff --git a/pkg/templates/charts/toggle/cluster-permission/Chart.yaml b/pkg/templates/charts/toggle/cluster-permission/Chart.yaml
@@ -1,9 +1,6 @@
-# Copyright (c) 2024 Red Hat, Inc.
-# Copyright Contributors to the Open Cluster Management project
-
 apiVersion: v2
-appVersion: 2.11.0
+appVersion: 1.16.0
 description: A controller for managing RBAC resources to the managed clusters.
 name: cluster-permission
 type: application
-version: 2.11.0
+version: 2.3.0
diff --git a/pkg/templates/charts/toggle/cluster-permission/values.yaml b/pkg/templates/charts/toggle/cluster-permission/values.yaml
@@ -1,13 +1,13 @@
 global:
+  hubSize: Small
+  templateOverrides: {}
   imageOverrides:
     cluster_permission: ''
-  templateOverrides: {}
   namespace: open-cluster-management
   pullSecret: null
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []
-  ocpVersion: 4.12.0
 org: open-cluster-management
diff --git a/pkg/templates/charts/toggle/console/values.yaml b/pkg/templates/charts/toggle/console/values.yaml
@@ -3,19 +3,19 @@
 # Declare variables to be passed into your templates.
 
 org: open-cluster-management
-
 global:
   imageOverrides:
     console: ""
   templateOverrides: {}
-    # Available template overrides:
-    # console_deployment_container_memory_request: <memory-value>
-    # console_deployment_container_memory_limit: <memory-value>
-    # console_deployment_container_cpu_request: <cpu-value>
-    # console_deployment_container_cpu_limit: <cpu-value>
+  # Available template overrides:
+  # console_deployment_container_memory_request: <memory-value>
+  # console_deployment_container_memory_limit: <memory-value>
+  # console_deployment_container_cpu_request: <cpu-value>
+  # console_deployment_container_cpu_limit: <cpu-value>
   namespace: default
   pullSecret: null
   pullPolicy: Always
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
@@ -24,7 +24,6 @@ hubconfig:
   hubVersion: ""
   ocpIngress: ""
   subscriptionPause: "false"
-
 # clusterImageSets:
 #   subscriptionPause: "false"
 #   acmHiveOpenshiftReleaseUrl: "https://github.com/stolostron/acm-hive-openshift-releases.git"
diff --git a/pkg/templates/charts/toggle/grc/values.yaml b/pkg/templates/charts/toggle/grc/values.yaml
@@ -13,6 +13,7 @@ global:
   namespace: default
   pullSecret: null
   pullPolicy: Always
+  hubSize: Small
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
diff --git a/pkg/templates/charts/toggle/insights/values.yaml b/pkg/templates/charts/toggle/insights/values.yaml
@@ -2,16 +2,16 @@
 # Copyright Contributors to the Open Cluster Management project
 
 org: open-cluster-management
-
 global:
   pullPolicy: Always
   pullSecret: null
+  hubSize: Small
   namespace: open-cluster-management
   arch:
-  - amd64
-  - ppc64le
-  - s390x
-  - arm64
+    - amd64
+    - ppc64le
+    - s390x
+    - arm64
   certificateAuthority:
     issuer: multicloud-ca-issuer
     kind: Issuer
@@ -21,59 +21,55 @@ global:
     kube_rbac_proxy: ""
   templateOverrides: {}
 ocpingress: ""
-    
 hubconfig:
   nodeSelector: null
   replicaCount: 1
   tolerations: []
   ocpVersion: 4.12.0
-
 client:
   affinity:
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 70
-        podAffinityTerm:
-          topologyKey: topology.kubernetes.io/zone
-          labelSelector:
-            matchExpressions:
-            - key: ocm-antiaffinity-selector
-              operator: In
-              values:
-              - insightsclient 
-      - weight: 35
-        podAffinityTerm:
-          topologyKey: kubernetes.io/hostname
-          labelSelector:
-            matchExpressions:
-            - key: ocm-antiaffinity-selector
-              operator: In
-              values:
-              - insightsclient 
-
+        - weight: 70
+          podAffinityTerm:
+            topologyKey: topology.kubernetes.io/zone
+            labelSelector:
+              matchExpressions:
+                - key: ocm-antiaffinity-selector
+                  operator: In
+                  values:
+                    - insightsclient
+        - weight: 35
+          podAffinityTerm:
+            topologyKey: kubernetes.io/hostname
+            labelSelector:
+              matchExpressions:
+                - key: ocm-antiaffinity-selector
+                  operator: In
+                  values:
+                    - insightsclient
 metrics:
   affinity:
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
-      - weight: 70
-        podAffinityTerm:
-          topologyKey: topology.kubernetes.io/zone
-          labelSelector:
-            matchExpressions:
-            - key: ocm-antiaffinity-selector
-              operator: In
-              values:
-              - insightsmetrics
-      - weight: 35
-        podAffinityTerm:
-          topologyKey: kubernetes.io/hostname
-          labelSelector:
-            matchExpressions:
-            - key: ocm-antiaffinity-selector
-              operator: In
-              values:
-              - insightsmetrics
-
+        - weight: 70
+          podAffinityTerm:
+            topologyKey: topology.kubernetes.io/zone
+            labelSelector:
+              matchExpressions:
+                - key: ocm-antiaffinity-selector
+                  operator: In
+                  values:
+                    - insightsmetrics
+        - weight: 35
+          podAffinityTerm:
+            topologyKey: kubernetes.io/hostname
+            labelSelector:
+              matchExpressions:
+                - key: ocm-antiaffinity-selector
+                  operator: In
+                  values:
+                    - insightsmetrics
 insights:
   name: insights
   client:
diff --git a/pkg/templates/charts/toggle/multicloud-operators-subscription/values.yaml b/pkg/templates/charts/toggle/multicloud-operators-subscription/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     multicloud_integrations: ''
     multicluster_operators_application: ''
diff --git a/pkg/templates/charts/toggle/multicluster-observability-operator/values.yaml b/pkg/templates/charts/toggle/multicluster-observability-operator/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     multicluster_observability_operator: ''
   namespace: default
diff --git a/pkg/templates/charts/toggle/search-v2-operator/values.yaml b/pkg/templates/charts/toggle/search-v2-operator/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     kube_rbac_proxy: ''
     postgresql_13: ''
diff --git a/pkg/templates/charts/toggle/submariner-addon/values.yaml b/pkg/templates/charts/toggle/submariner-addon/values.yaml
@@ -1,4 +1,5 @@
 global:
+  hubSize: Small
   imageOverrides:
     submariner_addon: ''
   namespace: default
diff --git a/pkg/templates/charts/toggle/volsync-controller/values.yaml b/pkg/templates/charts/toggle/volsync-controller/values.yaml
@@ -1,13 +1,11 @@
 org: stolostron
-
 global:
   pullPolicy: Always
   imageOverrides:
     volsync_addon_controller: ""
   templateOverrides: {}
-
+  hubSize: Small
 pullSecret: null
-
 hubconfig:
   nodeSelector: null
   replicaCount: 1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`global:`
	`2`	`+ hubSize: Small`
`2`	`3`	`imageOverrides:`
`3`	`4`	`multicloud_integrations: ''`
`4`	`5`	`multicluster_operators_application: ''`