NO-ISSUE: rebase-4.14.0-0.nightly-2024-06-14-081235_amd64-2024-06-14_arm64-2024-06-14 (#3494)

* update last_rebase.sh

* update changelog

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>

Author: microshift-rebase-script[bot]

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-13-232528
+OCP_VERSION := 4.14.0-0.nightly-arm64-2024-06-14-162956

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.14.0-0.nightly-2024-06-13-092412
+OCP_VERSION := 4.14.0-0.nightly-2024-06-14-081235

assets/components/openshift-router/deployment.yaml

@@ -63,20 +63,33 @@ spec:
             - name: ROUTER_DOMAIN
               value: apps.{{ .BaseDomain }}
           livenessProbe:
+            failureThreshold: 3
             httpGet:
               path: /healthz
               port: 1936
+              scheme: HTTP
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
             terminationGracePeriodSeconds: 10
           readinessProbe:
+            failureThreshold: 3
             httpGet:
               path: /healthz/ready
               port: 1936
+              scheme: HTTP
+            periodSeconds: 10
+            successThreshold: 1
+            timeoutSeconds: 1
           startupProbe:
             failureThreshold: 120
             httpGet:
               path: /healthz/ready
               port: 1936
+              scheme: HTTP
             periodSeconds: 1
+            successThreshold: 1
+            timeoutSeconds: 1
           resources:
             requests:
               cpu: 100m
@@ -108,12 +121,12 @@ spec:
             secretName: router-certs-default
         - name: service-ca-bundle
           configMap:
+            defaultMode: 420
             items:
               - key: service-ca.crt
                 path: service-ca.crt
             name: service-ca-bundle
             optional: false
-          defaultMode: 420
       restartPolicy: Always
       terminationGracePeriodSeconds: 3600
       dnsPolicy: ClusterFirst

assets/components/openshift-router/service-internal.yaml

@@ -18,6 +18,7 @@ spec:
       port: 1936
       protocol: TCP
       targetPort: metrics
+  sessionAffinity: None
   selector:
     ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
 metadata:

assets/release/release-aarch64.json

@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.14.0-0.nightly-arm64-2024-06-13-232528"
+    "base": "4.14.0-0.nightly-arm64-2024-06-14-162956"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d15ba16c99c08fe49b742c96ded19f3934294bca592418b835bff30bfcebf77",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:292a5b39838be626fea52c0179a2dc41e76d58447f3b18d62f3f2f5f30549325",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6624ec8007ffa9f465e197d9de555a5d9f1acf1b05ba2d0bab013088217aabed",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:561b837414cfa4871bf5660062fc0d964d04120cbec6d28d22342a8a3ead6661",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:54af87eb207b7f05def68326cdb7f4e03ba766312b60e6e41a433beb5c84de37",

assets/release/release-x86_64.json

@@ -1,14 +1,14 @@
 {
   "release": {
-    "base": "4.14.0-0.nightly-2024-06-13-092412"
+    "base": "4.14.0-0.nightly-2024-06-14-081235"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3dd75913ad28f9fbe073aa6b4a4395d983576cb6baa3b951c45a80b721bbc0b",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60eaf6b3d575c07ae9cd6326a7effc11bfd56eeec96b6b8cd1323a87fda6f046",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b78845bccd91ae5fdb91fb0d203453147ba3afa93220fb6aa40f3d8baa8d53d3",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:600c03493940c25ae3381c9a6ffb7f18f67e1601ba20302e460cc4a1ef132216",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e01b534c497be39e26672e61fcb1fa302484aa1205e8904241b72d0b2495c67",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ca250f7a59f6c3262e6d32244d893f5264a1677d392196ab88facf13f7e21d3",
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:937f9ec273be01442ccabb69fce876440ade16598bfd9879c6ff97cbe8a635be",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:53cdb9dbbc53a93861f725ea08a2c8574cdd8e9ff3e7dfd843877758dc571263",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",

scripts/auto-rebase/changelog.txt

@@ -1,3 +1,17 @@
-- machine-config-operator embedded-component a50e9b05e3dbe0e2a0370ca83a7bcf4ac72d4e67 to 3aec7f32a44af5baf4f9af27edeb260ac7853776
-  - f8d88e8e 2024-05-31T07:14:13+00:00 If multiple hostnames are returned, use the first one for the Node name
+- cluster-ingress-operator embedded-component c6fc4df40f69091e864054bc79a88733e7af00fe to fe438b86e3241ffdb13e7a4cbac43060949733cc
+  - 11b9f25 2024-06-12T19:26:47-04:00 copyProbe: Refactor to group copying of defaults
+  - a2f0d48 2024-06-12T19:26:47-04:00 Specify parameter values for router probes
+  - 3b16a4c 2024-06-12T19:26:47-04:00 Specify default mode on configmap/secret volumes
+  - ca387ca 2024-06-12T19:26:47-04:00 Set "service-ca-bundle" volume's default mode
+  - c941a98 2024-06-12T13:10:47-04:00 TestHostNetworkPortBinding: Check service ports
+  - 10c4f90 2024-06-12T13:10:47-04:00 TestHostNetworkPortBinding: Use t.Log, t.Cleanup
+  - cf11716 2024-06-12T13:10:47-04:00 Test_desiredInternalIngressControllerService: godoc
+  - 3287e82 2024-06-12T13:10:47-04:00 Test_desiredLoadBalancerService: Add assertions
+  - d5c9e98 2024-06-12T13:10:47-04:00 Set SessionAffinity to avoid confusing diffs
+  - fd0c3df 2024-06-12T13:10:47-04:00 crdChanged, nodePortServiceChanged: Fix preserves
+  - 4eed6b0 2024-06-12T13:10:47-04:00 Test_*Changed: Verify that some update was made
+  - 71cf9ec 2024-06-12T13:10:47-04:00 internalServiceChanged: Fix target port logic
+
+- oc image-arm64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761 to aa6e2f22f0c7e46757d976b6eb003786196ff907
+  - d0be9d13 2024-06-13T13:33:41-05:00 bump go-git to v5.11.0
 

scripts/auto-rebase/commits.txt

@@ -1,6 +1,6 @@
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component d4a1162514ecbf248b04e6e8625d17bc2b775ccd
 https://github.com/openshift/cluster-dns-operator embedded-component 9964f0b6fce1ba7a26995762602685cd07416928
-https://github.com/openshift/cluster-ingress-operator embedded-component c6fc4df40f69091e864054bc79a88733e7af00fe
+https://github.com/openshift/cluster-ingress-operator embedded-component fe438b86e3241ffdb13e7a4cbac43060949733cc
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4302637f4d521bd9880de93df6bc41d44a4b0756
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 4e059638c2cbf003551ee699106dc024760eece3
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 33f630dc1f890ca59c5e57fb5b6cc24a3f22a1d4
@@ -25,7 +25,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 1a646b98d8864e53accb726
 https://github.com/openshift/ovn-kubernetes image-amd64 bdc67edd064afc3519c4780f43c1c3837cd4143f
 https://github.com/openshift/kubernetes image-amd64 78524260502e5d93191acb29397a01db5df6136b
 https://github.com/openshift/service-ca-operator image-amd64 3c3f82f7112ee4b5656e5c554f9887acdf881175
-https://github.com/openshift/oc image-arm64 f7b14a92857ad1f28be2e2eaec3ae8229d4c2761
+https://github.com/openshift/oc image-arm64 aa6e2f22f0c7e46757d976b6eb003786196ff907
 https://github.com/openshift/coredns image-arm64 7d3fa777871ed2e5a70715e7f3e71d3f01785330
 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541
 https://github.com/openshift/csi-external-snapshotter image-arm64 a6834536936b16dcd9ee81a8753a2ef6dc208541

scripts/auto-rebase/last_rebase.sh

@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-13-092412" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-13-232528"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.14.0-0.nightly-2024-06-14-081235" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.14.0-0.nightly-arm64-2024-06-14-162956"