Merge pull request #54358 from openshift-bot/auto-config-brancher

Automate config brancher by auto-config-brancher job at Mon, 15 Jul 2024 12:09:20 UTC
openshift · Jul 15, 2024 · 64ee6b2 · 64ee6b2
2 parents 3e97c9c + 3c3a307
commit 64ee6b2
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 21 deletions.
diff --git a/...onfig/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml b/...onfig/openshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-main.yaml
@@ -44,8 +44,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint

diff --git a/...enshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.17.yaml b/...enshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.17.yaml
@@ -45,8 +45,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint

diff --git a/...enshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml b/...enshift-priv/cluster-capi-operator/openshift-priv-cluster-capi-operator-release-4.18.yaml
@@ -44,8 +44,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint

diff --git a/.../config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.17.yaml b/.../config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.17.yaml
@@ -44,8 +44,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint

diff --git a/.../config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml b/.../config/openshift/cluster-capi-operator/openshift-cluster-capi-operator-release-4.18.yaml
@@ -43,8 +43,8 @@ resources:
     limits:
       memory: 4Gi
     requests:
-      cpu: 100m
-      memory: 200Mi
+      cpu: 200m
+      memory: 400Mi
 tests:
 - as: lint
   commands: make lint

diff --git a/...or/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml b/...or/config/stolostron/multicluster-global-hub/stolostron-multicluster-global-hub-main.yaml
@@ -3,10 +3,6 @@ base_images:
     name: ubi-minimal
     namespace: ocp
     tag: "9"
-  stolostron_builder_go1.21-linux:
-    name: builder
-    namespace: stolostron
-    tag: go1.21-linux
   stolostron_builder_go1.22-linux:
     name: builder
     namespace: stolostron
@@ -20,23 +16,23 @@ images:
 - dockerfile_path: operator/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.22-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
   to: multicluster-global-hub-operator
 - dockerfile_path: manager/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.22-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
   to: multicluster-global-hub-manager
 - dockerfile_path: agent/Dockerfile
   from: base
   inputs:
-    stolostron_builder_go1.21-linux:
+    stolostron_builder_go1.22-linux:
       as:
-      - registry.ci.openshift.org/stolostron/builder:go1.21-linux
+      - registry.ci.openshift.org/stolostron/builder:go1.22-linux
   to: multicluster-global-hub-agent
 promotion:
   to:

diff --git a/...d-mgmt/hive/pools/ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml b/...d-mgmt/hive/pools/ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0_clusterimageset.yaml
@@ -3,7 +3,6 @@ kind: ClusterImageSet
 metadata:
   annotations:
     version_lower: 4.16.0-0
-    version_stream: 4-stable
     version_upper: 4.17.0-0
   creationTimestamp: null
   name: ocp-release-4.16.3-x86-64-for-4.16.0-0-to-4.17.0-0