NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-13-204333_amd64-2024-06-13_arm64-2024-06-15

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-13-204331
+OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-15-023320

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

@@ -2,10 +2,10 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:518b56b3ec1e32071ed70f544ba3003583bdc8327bc96f2ab3591f3eb662d1b3
+    digest: sha256:fc1f3093085d401045129adeddec9a0dc14554d1e48d997c4381ced9c1c8257f
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:cff0a22b2a08727e9bb8df1c67c7e4b3cd5ab286d1b400391d7a5c20a4928f0e
+    digest: sha256:cc7d8fb30c42337bd8f9e3a2ea1260e09cb8864926f51cc5f85942cece0aa76b
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
     digest: sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4
@@ -16,12 +16,12 @@ patches:
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff0a22b2a08727e9bb8df1c67c7e4b3cd5ab286d1b400391d7a5c20a4928f0e
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc7d8fb30c42337bd8f9e3a2ea1260e09cb8864926f51cc5f85942cece0aa76b
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE 
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:518b56b3ec1e32071ed70f544ba3003583bdc8327bc96f2ab3591f3eb662d1b3
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1f3093085d401045129adeddec9a0dc14554d1e48d997c4381ced9c1c8257f
     target:
       kind: Deployment
       labelSelector: app=catalog-operator

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-arm64-2024-06-13-204331"
+    "base": "4.15.0-0.nightly-arm64-2024-06-15-023320"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:518b56b3ec1e32071ed70f544ba3003583bdc8327bc96f2ab3591f3eb662d1b3",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff0a22b2a08727e9bb8df1c67c7e4b3cd5ab286d1b400391d7a5c20a4928f0e",
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1f3093085d401045129adeddec9a0dc14554d1e48d997c4381ced9c1c8257f",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc7d8fb30c42337bd8f9e3a2ea1260e09cb8864926f51cc5f85942cece0aa76b",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4"
   }
 }

assets/release/release-aarch64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.15.0-0.nightly-arm64-2024-06-13-204331"
+    "base": "4.15.0-0.nightly-arm64-2024-06-15-023320"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4a6cfbf67a0a5b81c6a4d5eb9eec5cd7671faf813df9e04fb3c5b80e5c1ee8b",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:777a8e914f323bbd68e09d184593b14f9e1283d0089c63f5b99e53371512c593",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b33fdf4da8d2baee9489272ad400c24907a5c2474e81ee1d964f5bdf28f82139",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0b70de6ef3fa69196f8339df6ab139ca67deae411d7b9edf2860a6a7a250e25",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e537e2bc43473025cca81650212a03fde7662a25dcd938614df0ac277936fe4",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e85e4bfc4a311d2778119c33a8b08a052c41e7632a21578a586fe25e14c8641",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3ffdcb70eeeeed5ff09786bd289470f82d907247a9c8ff746f3c1a003193ffa",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b952409c6f6db07128d0a42209c2b4d0d3adca46f73d7db46dcc8f45b2018260",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9be5b5e005c7d87528ba2ebce2c6bda00e02d202c3205db6ca2bcb98b3a64d39",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b0f8ac32926a8011d17526c8bf838f65e86a80216c7f064fc83980e517556c6",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cb07785c83f1576026a2a39e02ba18ee24ca741578e6f57c7df646ad154dc25",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
     "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
     "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111",
     "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765",
-    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95654a02d576e5a8da859476bc7b4447848faabff96348f171fa3e164458e0ce",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:053c5ec21b8bbe1b321acce46cab3f2849eac4c02ad2bccfa48be1f94d606617",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa9c95bb2074863799031e6f76ebe00e4f43a389f21ce4b3784a863e32dc9fe0"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c456fd8d896af8aee7b1d30d8a4a8d09617664ef4a0eefa6e48292728e63fcc",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a6844eb73914e8062840c954881db7cfe40587a3a381c077e1b274e6c7b543b",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6943f23fd8ce7e82bc439767d118d8f88cd824a208289765e7a5f4dd6b05ed3b"
   }
 }

packaging/crio.conf.d/microshift_arm64.conf

@@ -25,6 +25,6 @@ plugin_dirs = [
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3ffdcb70eeeeed5ff09786bd289470f82d907247a9c8ff746f3c1a003193ffa"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b0f8ac32926a8011d17526c8bf838f65e86a80216c7f064fc83980e517556c6"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

@@ -1,33 +0,0 @@
-- cluster-ingress-operator embedded-component 37f7c42f4fea6f4668e5447f420d3a55b8e9f287 to a0ac804cae89b91763ec8d0e16ed918c49eb3411
-  - 6778ce1 2024-06-11T16:29:21-04:00 Add route upgradeable control loop for SHA-1 certs
-  - 3797141 2024-06-11T16:20:34-04:00 Add SignatureAlgorithm argument to generateCertificate
-  - 6c4576b 2024-06-11T16:20:34-04:00 Rename certificate generation E2E helper functions
-  - 09ceb00 2024-06-11T16:20:34-04:00 Bump openshift/api
-  - 26b6b7a 2024-06-11T16:19:14-04:00 Set Upgradeable=False if default cert uses SHA-1
-  - 553e182 2024-06-11T14:52:24-04:00 copyProbe: Refactor to group copying of defaults
-  - 8024aa1 2024-06-11T14:52:24-04:00 Specify parameter values for router probes
-  - 616eff5 2024-06-11T14:51:05-04:00 Modified-by: candita
-  - c111705 2024-06-11T14:30:30-04:00 Set "service-ca-bundle" volume's default mode
-  - 5a88ab0 2024-06-11T14:30:30-04:00 Test_deploymentConfigChanged: Use k8s.io/utils/ptr
-  - 21a7572 2024-06-11T14:30:30-04:00 TestHostNetworkPortBinding: Check service ports
-  - 65fda2b 2024-06-11T14:30:30-04:00 TestHostNetworkPortBinding: Use t.Log, t.Cleanup
-  - e9607ed 2024-06-11T14:30:30-04:00 Test_desiredInternalIngressControllerService: godoc
-  - 56f7cd7 2024-06-11T14:30:30-04:00 Test_desiredLoadBalancerService: Add assertions
-  - c2bc837 2024-06-11T14:30:30-04:00 Set SessionAffinity to avoid confusing diffs
-  - d2117eb 2024-06-11T14:30:30-04:00 crdChanged, nodePortServiceChanged: Fix preserves
-  - 6f41cf1 2024-06-11T14:30:30-04:00 Test_*Changed: Verify that some update was made
-  - c8a8b1d 2024-06-11T14:30:30-04:00 internalServiceChanged: Fix target port logic
-
-- machine-config-operator embedded-component 4a4385ccb8c61013b04e5699d4a8d148e6e2a535 to eac63b92593461d31042085ab5d156bb680006ed
-  - e776b946 2024-04-11T00:44:55+00:00 OCPBUGS-29919: Decrease logs of haproxy
-
-- operator-framework-olm embedded-component 50f148e2b1ed9eed9625d03f0d754bca53da1414 to d863e7cd095d747c6e9e43c6371470f78a064c65
-  - 726e49bc 2024-06-09T14:00:59+02:00 pin test catalog
-  - 2f247250 2024-06-09T14:00:59+02:00 bump to go1.20
-  - eb1a88ea 2024-06-09T14:00:59+02:00 patch subscription e2e flake (#3302)
-  - 25d18450 2024-06-09T14:00:56+02:00 patch installplan e2e (#3301)
-  - 996682cb 2024-06-09T13:57:39+02:00 re-enable seed and skip options for e2e (#3296)
-  - edb54359 2024-06-09T13:57:39+02:00 :seedling: parameterizes the e2e target and pins opm images (#3275)
-  - dbb7d144 2024-06-09T13:57:39+02:00 :seedling: patch flakes (#3281)
-  - 7fa69878 2024-06-09T13:57:39+02:00 bugfix: refactor test package names 'packageA' and 'packageB' because they break naming conventions (#3260)
-

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.15.0-0.nightly-2024-06-13-204333" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-13-204331"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-06-13-204333" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-06-15-023320"