diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 0102ad674f..b639caad46 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-05-07-025319 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-05-08-090101 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index e0ca51cc4a..6e4ea0f205 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-05-07-065351 +OCP_VERSION := 4.15.0-0.nightly-2024-05-08-194059 diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml index 61ddf78c22..eb2f327a2e 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml @@ -6,12 +6,12 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" rbac.authorization.kubernetes.io/autoupdate: "true" - name: system:openshift:scc:hostmount + name: system:openshift:scc:hostmount-anyuid rules: - apiGroups: - security.openshift.io resourceNames: - - hostmount + - hostmount-anyuid resources: - securitycontextconstraints verbs: diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index cb578a14ed..548dbe1fef 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -8,7 +8,7 @@ images: digest: sha256:ccc2830a5fd8d9bf61fd626a4ad797a2f06a9b7d1fce10564ef43453ca3921bc - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2c1ea3f82b753673cb398813c65520e604337e348fc71b305f8300ce4e3c0a63 + digest: sha256:7e5288df18e61799c8b2f483804be2644609ee03af07a0384fb4996854f39f6b patches: - patch: |- diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 402924da35..7c0ec2ee22 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -8,7 +8,7 @@ images: digest: sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3cdde20bbec18867eadeb32f514528be748650e14975a7a419ad7dbebc9838b6 + digest: sha256:79ab35b2189cca6958fcbad3b060cdd6cadec72ea0284e91b13b53505494f116 patches: - patch: |- diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index c41190df3c..1a6f8885bd 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-05-07-025319" + "base": "4.15.0-0.nightly-arm64-2024-05-08-090101" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3128b3e2be65ff533865c00f1c44c2c4f6d31cf7d714cf94591d5d659b2552d3", "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc2830a5fd8d9bf61fd626a4ad797a2f06a9b7d1fce10564ef43453ca3921bc", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c1ea3f82b753673cb398813c65520e604337e348fc71b305f8300ce4e3c0a63" + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e5288df18e61799c8b2f483804be2644609ee03af07a0384fb4996854f39f6b" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 9a7e2ed890..17c1f5ec53 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-2024-05-07-065351" + "base": "4.15.0-0.nightly-2024-05-08-194059" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4b49b6a46a19d811eb6c8546110dc574bb302238aa9ad6082041e3195858ef3", "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:957e818a3f6d603dc285175359ebf308d0345584130fbd47d181755d05818e63", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cdde20bbec18867eadeb32f514528be748650e14975a7a419ad7dbebc9838b6" + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79ab35b2189cca6958fcbad3b060cdd6cadec72ea0284e91b13b53505494f116" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f1944631ff..acef317292 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,12 +1,12 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-05-07-025319" + "base": "4.15.0-0.nightly-arm64-2024-05-08-090101" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6a89c9fc67a1f64e1fc452c1cec45488ba68850ef174f17c8b22f36932ab0f9", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f73f1e7c4756124fe1a3df9ffb3615ab7f3e21e20030e8a825d64132b257cf1", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:391235ea50d31064e78b601778618c449ef8fd4aa05cc0750fe0be3ccf675400", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d14efa4a695195753e60540c6696534a4315988618a983e28f8869bdb8253af", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c1ea3f82b753673cb398813c65520e604337e348fc71b305f8300ce4e3c0a63", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7d3ee97e248be73d4a3f9ab13c6f602e79b75dc3c1f710590a8461a6312a887", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e5288df18e61799c8b2f483804be2644609ee03af07a0384fb4996854f39f6b", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdc5a38a2422c591d93a4011624163a1ae951cf46c7cb814b0d6aac66736c6be", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:479c998bef536ec97e3a3be5b424e3c53568df7337d49151fbc5ae2b98f90081", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index de9c00e95e..205e3ac803 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,12 +1,12 @@ { "release": { - "base": "4.15.0-0.nightly-2024-05-07-065351" + "base": "4.15.0-0.nightly-2024-05-08-194059" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c6c59d50819ee2d282d106fd75ee927e625d3e3c3927b49523a4f457e883dd8", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74689a85fae8ab9992c7f94511e4dac75139b8d62ac995fe92f68db5906bb4dd", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f983145416621deeb8713ffd6559621b074a7153b6158a23b1b316fa3cfb5717", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a19a320bae57dd073ba6ba7a9ca1953dec636ce074f618a57795761a4d0f0c74", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3cdde20bbec18867eadeb32f514528be748650e14975a7a419ad7dbebc9838b6", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c681b784f8452758bca16cc9c7454f4d5196b3657f104d1e57912fbbf70066cd", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79ab35b2189cca6958fcbad3b060cdd6cadec72ea0284e91b13b53505494f116", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0a5583c18bf17534f8232c84e36851d1b18c3707a6fede75877a29ceaac24a2", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9280df3d25f773251f1179fe9defd8bba30413b86e978920ec3231f65843b0d8", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 9d5c9eff43..7cc7488196 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +1,13 @@ -- operator-framework-olm embedded-component f6374fbc52a33f72763e7dda2b0bf04773a359dd to 50f148e2b1ed9eed9625d03f0d754bca53da1414 - - a6cd494d 2024-04-25T08:43:51-04:00 UPSTREAM: : bump go-jose +- cluster-kube-apiserver-operator embedded-component f5c5a609fa5e318379ceb86d346122814dc81762 to cb537c7a834b1e67210ee4d3620d9e94d402e960 + - 56c1900 2024-05-03T22:27:39+00:00 Fix incorrect name for SCC ClusterRole -- ovn-kubernetes image-amd64 a2cac64f0ce21e324c0d243cb3d12dd3ef3cf3b4 to c108b9f7bb51ad5462f410e54eb2177103c86ee5 - - 1e2f5d2 2024-02-09T16:53:30+00:00 Ignore missing live migratable pod annotation on AddNode +- cluster-network-operator embedded-component 529ce52e7c159addf8a6ebfe9ad5470454d93651 to 071f46acbf9043f9ae9106c56639888e078977a9 + - f7692c4 2024-04-22T07:48:55+00:00 Fix shellcheck warnings on ipsec bash scripts + - 4d5e664 2024-04-22T07:48:55+00:00 Fix wait logic for ipsec certificate signing request -- ovn-kubernetes image-arm64 a2cac64f0ce21e324c0d243cb3d12dd3ef3cf3b4 to c108b9f7bb51ad5462f410e54eb2177103c86ee5 - - 1e2f5d2 2024-02-09T16:53:30+00:00 Ignore missing live migratable pod annotation on AddNode +- router image-amd64 1cac6b72281a3e69141f3a14206d420ab23471d6 to 4b6be4ddcbe7dae2b08f305fc823d1718f2563f7 + - a2a0a50 2024-04-25T13:49:46+00:00 OCPBUGS-29690: Count active services before setting weight to 1 + +- router image-arm64 1cac6b72281a3e69141f3a14206d420ab23471d6 to 4b6be4ddcbe7dae2b08f305fc823d1718f2563f7 + - a2a0a50 2024-04-25T13:49:46+00:00 OCPBUGS-29690: Count active services before setting weight to 1 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 38a97f6a53..5dc168facf 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,10 +1,10 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 87d7080a91e9247c9fde6c3e2d9e222c23df541e https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 https://github.com/openshift/cluster-ingress-operator embedded-component 0106cb99b340a2f266a88700b4250f11457ffb05 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f5c5a609fa5e318379ceb86d346122814dc81762 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component cb537c7a834b1e67210ee4d3620d9e94d402e960 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796 -https://github.com/openshift/cluster-network-operator embedded-component 529ce52e7c159addf8a6ebfe9ad5470454d93651 +https://github.com/openshift/cluster-network-operator embedded-component 071f46acbf9043f9ae9106c56639888e078977a9 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9c4fb818258a579901343fec3c2c47ec20ad2555 https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342 @@ -21,7 +21,7 @@ https://github.com/openshift/coredns image-amd64 22f950eae53fcba187c2303ac4f1a83 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 -https://github.com/openshift/router image-amd64 1cac6b72281a3e69141f3a14206d420ab23471d6 +https://github.com/openshift/router image-amd64 4b6be4ddcbe7dae2b08f305fc823d1718f2563f7 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 https://github.com/openshift/ovn-kubernetes image-amd64 c108b9f7bb51ad5462f410e54eb2177103c86ee5 https://github.com/openshift/kubernetes image-amd64 8ca71f701a70cb3eed8603478e5f6c1676319fc4 @@ -31,7 +31,7 @@ https://github.com/openshift/coredns image-arm64 22f950eae53fcba187c2303ac4f1a83 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 -https://github.com/openshift/router image-arm64 1cac6b72281a3e69141f3a14206d420ab23471d6 +https://github.com/openshift/router image-arm64 4b6be4ddcbe7dae2b08f305fc823d1718f2563f7 https://github.com/openshift/kube-rbac-proxy image-arm64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 https://github.com/openshift/ovn-kubernetes image-arm64 c108b9f7bb51ad5462f410e54eb2177103c86ee5 https://github.com/openshift/kubernetes image-arm64 8ca71f701a70cb3eed8603478e5f6c1676319fc4 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 46e5a4a6f9..a4ddaabb90 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/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-05-07-065351" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-07-025319" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-05-08-194059" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-05-08-090101"