rebase 4.14.0 + fix for router assets' source path

Makefile.version.aarch64.var

@@ -1 +1 @@
-OCP_VERSION := 4.14.0-0.nightly-arm64-2023-07-20-052619
+OCP_VERSION := 4.14.0-0.nightly-arm64-2023-07-25-210314

Makefile.version.x86_64.var

@@ -1 +1 @@
-OCP_VERSION := 4.14.0-0.nightly-2023-07-20-215234
+OCP_VERSION := 4.14.0-0.nightly-2023-07-26-001154

assets/release/release-aarch64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.14.0-0.nightly-arm64-2023-07-20-052619"
+    "base": "4.14.0-0.nightly-arm64-2023-07-25-210314"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:997bc66ba8f3f37d57c2c96bd214470897839ca4f2db33fe78ab311f93dab286",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beb26fcadbab64068dad686e2494347f6cc507d65e129802ade5a3a9c819e238",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb5e07db75ee89af1041fd75db935a6d46f85e278e74525b751baefabb7c1910",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1c46f404fb2656336debe5fedd5aa2ddf1cb81c4598b792e51abf4c46c698d9",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ab36ca97fa3c5c12ed333ee8fd3f3b4a6f67b9c24dc7a8cd05919573d47fbf6",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:129ef0d9f91c1cd5a9b1b3d31ef4dec0489d80c5abd0ddbb4438dcb57f72eed3",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1168ce05107eb7442555887c36bd9d9e0ecc232446820fbea46fdd9df6fc6c14",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72653b66c4291a720613faf68540e5ecb9597f7efcc2f534bb371a84568bd81b",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccf102b08dd84aee1019f3f6642e356525ed56bc337189d0970ec49a0ec34e03",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d0fdc325b4b1ccd01a09e523136cf722dcc0b95ac192a150482b8d426b34e97",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f427a61494fd186413a426e64731e1962f1f8e440ff121df1a9624cf8af98fe5",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:798b1dd2aaf14e94cc7f9bdbf58b9cc4cabd4269f6a1f89481f77d8727551217",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be8c7b4d68bbcf58c6c6617bd8cd9daae842663c3e88ab109a1eacb5d6e379fa",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47ca2a0be99ddb306c426e3d58ff70f42e61ffe598af1a1eb26defab6278a639",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:f676e20b8ecdbe9f5fc994e2ff236a02d2afe666bf325e8ac02cd3a043df107e",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:71d42a2b26fca9690036c95e54aa3641702c4dc7ba1912f8804d777320f9fbf8",
     "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:3c63c06561f20f5ead423946c6cc22030c397f0fe190004e6b5ccdb3bfaccdc4",
     "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87",
     "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504",
-    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99317a95080d79eb5430799a1adf7198abb09818a9031b44ebe00ac85919827",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11b62223364340222c33d49a6a554b677277b2aac6c5c17a22ad632d65ab4190",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c8aa4c32d837a6e703b4e78d8de647e2f7c12587ed79c62565fdc36cb22e115"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c01de2ac10e42ba9db7ed23bd48676f604623fae76690a7a933fc6c89e30a0d1",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16cef2ae8296a69c10456a854278e2170308749fc85c4aeb4541e5d7710de974",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:587a039aa3c4a7fac7b049743a3e4886aaef4394f62f00cdef70950837adb16c"
   }
 }

assets/release/release-x86_64.json

@@ -1,23 +1,23 @@
 {
   "release": {
-    "base": "4.14.0-0.nightly-2023-07-20-215234"
+    "base": "4.14.0-0.nightly-2023-07-26-001154"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fadd0485ede81d642109142a0baffddabc9d841c8d519a24cdd01eb05b29d2c1",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab5ffd476330032c5636667997d427bcb9df449af62c7524764e3db70bab8cff",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2aabff0b600729b09627cbc85825720d19006ae9f3be5eac555d3d75c746710",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e9caa594bfc72ca10445e45acb279d3267c6e53e7b79189b03b41f71e758a92",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cb2c7434e9efac3be32f61eb762746688425b4854c42b58bf30723e1ff6c676",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:724e78c5fefd7433d3120d52e2bcc1f6814123f825896cd3ed37880e732f2185",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b53086cc2268903df4cf9108317663bf35697e28a4a1b726dd4e6c15bf49ae1",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25b55b9980509d9845171fb39554ca66c6c8771182a14331986214fd482b7f25",
     "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdffb5b5757978800ccd2ccbbb182593a175fc1e9149fbc752da49a86660459f",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28504e275b2642536c091ccff83918f25bb60b0b74fdcc8f9a8b1e08697358e6",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab9196052661c799f157668b089a3ec382cbcdaef6bf4341a432790f79b34a5d",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0ae209c3966ec795e1502b69d0260311ac008d863d750a82b5491c45357fe49",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec37cb9ba0e30ca4a70fdbaf7dca3ec771c553d221ec31758b3e9937f81d8a5e",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0b3e1dc36f07f876a59535a1bc9b5325da507d4314eae00758d1e8b02843fd6",
     "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:f676e20b8ecdbe9f5fc994e2ff236a02d2afe666bf325e8ac02cd3a043df107e",
     "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:71d42a2b26fca9690036c95e54aa3641702c4dc7ba1912f8804d777320f9fbf8",
     "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:3c63c06561f20f5ead423946c6cc22030c397f0fe190004e6b5ccdb3bfaccdc4",
     "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87",
     "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504",
-    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5912945ef16f470e895902739d520fa275b6b277b1d24727d49ecad160680f6",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6254006efd598427056b00f34a51076c87dac98d6d959a9548eb500da7c53c42",
-    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5e86e7cd7cc77074ba7f57bdf45d3b43f634acb4d8ac98158ab4ea83ccea2a8e"
+    "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0da6a3ae37a10924c7bf900cbd68b953ae38afca510c0354a8b478a44cbdfe73",
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:012b60f11c4303bb13f4fa727b1ec494b07888570d0d400890f23750930c85d3",
+    "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b89b0461f8d5672b254223edbf30e790dcfcbe8a1717b9fdad215000dfea5bf"
   }
 }

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/openshift/api v0.0.0-20230703134140-1c2204a0195c
 	github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533
 	github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
-	github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15
+	github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084
 	github.com/openshift/library-go v0.0.0-20230516103935-9536341565eb
 	github.com/openshift/route-controller-manager v0.0.0-20230720095017-5710699f4e7e
 	github.com/pkg/errors v0.9.1 // indirect

go.sum

@@ -513,8 +513,8 @@ github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533 h1:mh
 github.com/openshift/build-machinery-go v0.0.0-20230306181456-d321ffa04533/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb h1:Nij5OnaECrkmcRQMAE9LMbQXPo95aqFnf+12B7SyFVI=
 github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb/go.mod h1:Rhb3moCqeiTuGHAbXBOlwPubUMlOZEkrEWTRjIF3jzs=
-github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15 h1:c0rEyhtLJ/GIHIGvIoeNhufVD7rtrSgCIKQKQzvZ7xU=
-github.com/openshift/cluster-policy-controller v0.0.0-20230720122606-838f4d0c9d15/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g=
+github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084 h1:CjBZbphEb/DshnvH7Ms/aY/FpewUqFWnD17BURRQtgs=
+github.com/openshift/cluster-policy-controller v0.0.0-20230724103459-8501bc8c4084/go.mod h1:aT2kl3fRiSSElTibdfFs3MQnyLtviMcB7lZt9rdy46g=
 github.com/openshift/kubernetes v0.0.0-20230714130253-4aaeaec06c95 h1:mLt4kQRVu95usOEiBNKJUrpxQHEuw/F+EYxHIK/wB08=
 github.com/openshift/kubernetes v0.0.0-20230714130253-4aaeaec06c95/go.mod h1:SQgN09RomqsG6haNxyFe9QXKtmbmITfRZYHTNZYmGEE=
 github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20230525153147-77c90ab82b46 h1:RfVBJVSRy3Wk8j0lB9J1RbokSmg/K0Z43tygihlDUZo=

packaging/crio.conf.d/microshift_amd64.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:28504e275b2642536c091ccff83918f25bb60b0b74fdcc8f9a8b1e08697358e6"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec37cb9ba0e30ca4a70fdbaf7dca3ec771c553d221ec31758b3e9937f81d8a5e"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

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:6d0fdc325b4b1ccd01a09e523136cf722dcc0b95ac192a150482b8d426b34e97"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be8c7b4d68bbcf58c6c6617bd8cd9daae842663c3e88ab109a1eacb5d6e379fa"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"

scripts/auto-rebase/assets.yaml

@@ -22,7 +22,7 @@ assets:
       - file: update-node-resolver.sh
 
   - dir: components/openshift-router/
-    src: cluster-ingress-operator/assets/router/
+    src: cluster-ingress-operator/pkg/manifests/assets/router/
     files:
       - file: cluster-role-binding.yaml
       - file: cluster-role.yaml