Fix template evaluation errors in PR tests (#600)

* Fix template evaluation errors in PR tests Signed-off-by: Joe Gdaniec <[email protected]> * Add updates from go generate Signed-off-by: Joe Gdaniec <[email protected]> --------- Signed-off-by: Joe Gdaniec <[email protected]>
stolostron · Feb 20, 2024 · f4f06ed · f4f06ed
1 parent 8002f78
commit f4f06ed
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 4 deletions.
diff --git a/hack/bundle-automation/chart-templates/values.yaml b/hack/bundle-automation/chart-templates/values.yaml
@@ -6,12 +6,13 @@ org: open-cluster-management
 
 global:
   pullSecret: null
-  imageOverrides:
-    imageOverride: ""
+  imageOverrides: {}
+  templateOverrides: {}
   namespace: default
 
 hubconfig:
   nodeSelector: null
   replicaCount: 1
   proxyConfigs: {}
   tolerations: []
+  ocpVersion: 4.12.0
diff --git a/pkg/templates/charts/toggle/assisted-service/values.yaml b/pkg/templates/charts/toggle/assisted-service/values.yaml
@@ -8,8 +8,10 @@ global:
     postgresql_12: ''
   namespace: default
   pullSecret: null
+  templateOverrides: {}
 hubconfig:
   nodeSelector: null
+  ocpVersion: 4.12.0
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []

diff --git a/pkg/templates/charts/toggle/cluster-lifecycle/values.yaml b/pkg/templates/charts/toggle/cluster-lifecycle/values.yaml
@@ -5,11 +5,13 @@ global:
     clusterclaims_controller: quay.io/test/test:test
     clusterlifecycle_state_metrics: quay.io/test/test:test
     provider_credential_controller: quay.io/test/test:test
+  templateOverrides: {}
   pullSecret: ""
   namespace: default
 hubconfig:
   nodeSelector: {}
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []
+  ocpVersion: "4.12.0"
 org: open-cluster-management
diff --git a/pkg/templates/charts/toggle/cluster-manager/values.yaml b/pkg/templates/charts/toggle/cluster-manager/values.yaml
@@ -3,8 +3,10 @@ global:
     registration_operator: ''
   namespace: default
   pullSecret: null
+  templateOverrides: {}
 hubconfig:
   nodeSelector: null
+  ocpVersion: 4.12.0
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []

diff --git a/pkg/templates/charts/toggle/cluster-proxy-addon/values.yaml b/pkg/templates/charts/toggle/cluster-proxy-addon/values.yaml
@@ -5,12 +5,12 @@ global:
   imageOverrides:
     cluster_proxy_addon: ""
     cluster_proxy: ""
-
+  templateOverrides: {}
 hubconfig:
   nodeSelector: null
   replicaCount: 1
   proxyConfigs: {}
   tolerations: []
-  ocpVersion: ""
+  ocpVersion: "4.12.0"
 org: open-cluster-management
 
diff --git a/pkg/templates/charts/toggle/discovery-operator/values.yaml b/pkg/templates/charts/toggle/discovery-operator/values.yaml
@@ -3,8 +3,10 @@ global:
     discovery_operator: ''
   namespace: default
   pullSecret: null
+  templateOverrides: {}
 hubconfig:
   nodeSelector: null
+  ocpVersion: 4.12.0
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []

diff --git a/pkg/templates/charts/toggle/hive-operator/values.yaml b/pkg/templates/charts/toggle/hive-operator/values.yaml
@@ -3,8 +3,10 @@ global:
     openshift_hive: ''
   namespace: default
   pullSecret: null
+  templateOverrides: {}
 hubconfig:
   nodeSelector: null
+  ocpVersion: 4.12.0
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []

diff --git a/pkg/templates/charts/toggle/hypershift/values.yaml b/pkg/templates/charts/toggle/hypershift/values.yaml
@@ -10,11 +10,13 @@ global:
     hypershift_operator: ""
     cluster_api_provider_kubevirt: ""
     kube_rbac_proxy_mce: "registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.10"
+  templateOverrides: {}
   namespace: default
   pullSecret: null
 hubconfig:
   nodeSelector: null
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []
+  ocpVersion: "4.12.0"
 org: open-cluster-management
diff --git a/pkg/templates/charts/toggle/image-based-install-operator/values.yaml b/pkg/templates/charts/toggle/image-based-install-operator/values.yaml
@@ -3,8 +3,10 @@ global:
     image_based_install_operator: ''
   namespace: default
   pullSecret: null
+  templateOverrides: {}
 hubconfig:
   nodeSelector: null
+  ocpVersion: 4.12.0
   proxyConfigs: {}
   replicaCount: 1
   tolerations: []

diff --git a/pkg/templates/charts/toggle/managed-serviceaccount/values.yaml b/pkg/templates/charts/toggle/managed-serviceaccount/values.yaml
@@ -1,6 +1,7 @@
 global:
   imageOverrides:
     managed_serviceaccount: ''
+  templateOverrides: {}
   namespace: default
   pullSecret: null
 hubconfig:

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