[release-1.31] fix: update source-to-image image (#2384)

* fix: update source-to-image image The previous image hash 8a70f501 contained bug. Signed-off-by: Matej Vasek <[email protected]> * Rerun make generated-files --------- Signed-off-by: Matej Vasek <[email protected]> Co-authored-by: Matej Vasek <[email protected]> Co-authored-by: David Simansky <[email protected]>
openshift-knative · Nov 10, 2023 · fadffbd · fadffbd
1 parent 7065614
commit fadffbd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml b/olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml
@@ -890,7 +890,7 @@ spec:
                       - name: "IMAGE_KN_PLUGIN_FUNC_UTIL"
                         value: "quay.io/boson/alpine-socat:1.7.4.3-r1-non-root"
                       - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I"
-                        value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:8a70f50122691cca6ba4a97bacd56bd5f4e55bcdd37ba86712da0e41160d0263"
+                        value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4"
                       - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH"
                         value: "registry.redhat.io/rhel8/buildah@sha256:55f5c7d88c77e1ab5a2ab8e877172b2b66cb196e21f10dc45148470d0ee8bbae"
                       - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_16"
@@ -1055,7 +1055,7 @@ spec:
                       - name: "IMAGE_KN_PLUGIN_FUNC_UTIL"
                         value: "quay.io/boson/alpine-socat:1.7.4.3-r1-non-root"
                       - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I"
-                        value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:8a70f50122691cca6ba4a97bacd56bd5f4e55bcdd37ba86712da0e41160d0263"
+                        value: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4"
                       - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH"
                         value: "registry.redhat.io/rhel8/buildah@sha256:55f5c7d88c77e1ab5a2ab8e877172b2b66cb196e21f10dc45148470d0ee8bbae"
                       - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_16"
@@ -1330,7 +1330,7 @@ spec:
     - name: "IMAGE_KN_PLUGIN_FUNC_UTIL"
       image: "quay.io/boson/alpine-socat:1.7.4.3-r1-non-root"
     - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_S2I"
-      image: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:8a70f50122691cca6ba4a97bacd56bd5f4e55bcdd37ba86712da0e41160d0263"
+      image: "registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4"
     - name: "IMAGE_KN_PLUGIN_FUNC_TEKTON_BUILDAH"
       image: "registry.redhat.io/rhel8/buildah@sha256:55f5c7d88c77e1ab5a2ab8e877172b2b66cb196e21f10dc45148470d0ee8bbae"
     - name: "IMAGE_KN_PLUGIN_FUNC_NODEJS_16"

diff --git a/olm-catalog/serverless-operator/project.yaml b/olm-catalog/serverless-operator/project.yaml
@@ -54,7 +54,7 @@ dependencies:
     cli: 1.10.0
     func:
         util: quay.io/boson/alpine-socat:1.7.4.3-r1-non-root
-        tekton_s2i: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:8a70f50122691cca6ba4a97bacd56bd5f4e55bcdd37ba86712da0e41160d0263
+        tekton_s2i: registry.redhat.io/source-to-image/source-to-image-rhel8@sha256:6a6025914296a62fdf2092c3a40011bd9b966a6806b094d51eec5e1bd5026ef4
         tekton_buildah: registry.redhat.io/rhel8/buildah@sha256:55f5c7d88c77e1ab5a2ab8e877172b2b66cb196e21f10dc45148470d0ee8bbae
         nodejs_16: registry.access.redhat.com/ubi8/nodejs-16@sha256:720a3a2594a1804b5ecd7046a5ce4be82885bfa7c83df4c9bcade0e1e00db078
         openjdk_17: registry.access.redhat.com/ubi8/openjdk-17@sha256:b00f687d913b8d1e027f7eabd6765de6c8d469629bef9550f10dbf207af24fe5

diff --git a/openshift-knative-operator/cmd/operator/kodata/ingress/1.10/kourier/1-net-kourier.yaml b/openshift-knative-operator/cmd/operator/kodata/ingress/1.10/kourier/1-net-kourier.yaml
@@ -401,7 +401,7 @@ spec:
               cpu: 200m
               memory: 200Mi
             limits:
-              cpu: 500m
+              cpu: "1"
               memory: 500Mi
       restartPolicy: Always
       serviceAccountName: net-kourier