diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index ca613fb767..3045f620d5 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-08-28-194707 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-08-29-174154 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 3d3717dd6e..9d36ed0e32 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-08-21-192930 +OCP_VERSION := 4.16.0-0.nightly-2024-08-29-132014 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 40956c408b..ea684e91a6 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:71b560fb108ffc04ba2c5e1718ced113269522c229c3d8b0518ea9b9de66c4f7 + digest: sha256:1c757416981fbc43db6e627766627acdb98ae3f7e772fc00ed825089cea3ef20 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e90c7325f1840492fa28a61af85dc1438ada43e8fbcb2ba2efae2be9540ed848 + digest: sha256:b98814a2af23e89c4ecd1a345c1643958071a3cd7296cd4e01d16778a11fa34e diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 5881dbc3d6..17277e3552 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-08-28-194707" + "base": "4.16.0-0.nightly-arm64-2024-08-29-174154" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9fc68a7ea27c306f2933926d4d44489e37b07e90ca1471d990f3fd4368c9e41", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index feafcc4ea7..8a9d35a5d5 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-2024-08-21-192930" + "base": "4.16.0-0.nightly-2024-08-29-132014" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71b560fb108ffc04ba2c5e1718ced113269522c229c3d8b0518ea9b9de66c4f7", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e90c7325f1840492fa28a61af85dc1438ada43e8fbcb2ba2efae2be9540ed848" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c757416981fbc43db6e627766627acdb98ae3f7e772fc00ed825089cea3ef20", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b98814a2af23e89c4ecd1a345c1643958071a3cd7296cd4e01d16778a11fa34e" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 0b83d9fe3e..6202f5b0c2 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0be60be4f4f37fc675923746e6ce2d5dc1cbfb2268010ce056ead3c205952082 + digest: sha256:8c5bccacb7cdc20477f4bfcefb23c1a0a3e643686b3610d33824a21aeb59bb57 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cb58f3346324869aaf14668a30a74388cfccd4b1e3d564adc394a14f4f9c822a + digest: sha256:56e5c57b9d94bcadad6ff0cd47d157d35affc4bfd2c23a2ac948eee1cac3b8a3 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:22c84ed2af3d9609a7155273f2f34cc8d7b55ccd448807e4443210a331b8bb8c + digest: sha256:70458d010bd9f4e9c43b6452fe79e529af926deab2714e10ba1366789ec15d9f patches: - patch: |- @@ -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:cb58f3346324869aaf14668a30a74388cfccd4b1e3d564adc394a14f4f9c822a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56e5c57b9d94bcadad6ff0cd47d157d35affc4bfd2c23a2ac948eee1cac3b8a3 - 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:0be60be4f4f37fc675923746e6ce2d5dc1cbfb2268010ce056ead3c205952082 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c5bccacb7cdc20477f4bfcefb23c1a0a3e643686b3610d33824a21aeb59bb57 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 5413a29831..0e4edb082f 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-08-28-194707" + "base": "4.16.0-0.nightly-arm64-2024-08-29-174154" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6864af89d06cd087ed321bc35b7ba553a8df9fd86a12b4219210defaee873ae7", 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 657921d5b6..b7a35d0e0b 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.16.0-0.nightly-2024-08-21-192930" + "base": "4.16.0-0.nightly-2024-08-29-132014" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0be60be4f4f37fc675923746e6ce2d5dc1cbfb2268010ce056ead3c205952082", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb58f3346324869aaf14668a30a74388cfccd4b1e3d564adc394a14f4f9c822a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22c84ed2af3d9609a7155273f2f34cc8d7b55ccd448807e4443210a331b8bb8c" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c5bccacb7cdc20477f4bfcefb23c1a0a3e643686b3610d33824a21aeb59bb57", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56e5c57b9d94bcadad6ff0cd47d157d35affc4bfd2c23a2ac948eee1cac3b8a3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70458d010bd9f4e9c43b6452fe79e529af926deab2714e10ba1366789ec15d9f" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index a7aefa0ac9..adda265730 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-08-28-194707" + "base": "4.16.0-0.nightly-arm64-2024-08-29-174154" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:828bfa58b6bd561d6581213b365236442421bc3e80215ccd64750f66ec7c1d66", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 26f7481928..3f04ec4820 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-2024-08-21-192930" + "base": "4.16.0-0.nightly-2024-08-29-132014" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bad8a28142852178a4d2dec06e45b8954582d431121d492c8d2bf044264ee83", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4404f8b086266a45842fc0e866ea4eb7179d37bc569c2950b889a665a33f7dc", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f7116e7323045c05d63b1718454796a7e5832460a0f79a594744b6401a68ecf", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22c84ed2af3d9609a7155273f2f34cc8d7b55ccd448807e4443210a331b8bb8c", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4936653cc548281c7dc835a9b84ca1c780ce5e0b7759217fdb84b694d897896a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2d60281293181fa99352f5d26fbc38fb16c627c87d89619f991c545c7b563eb", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:203353d81a754b0abeb085cbe0056fea9b9d5ae8a21118f43662b63234c414a1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70458d010bd9f4e9c43b6452fe79e529af926deab2714e10ba1366789ec15d9f", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bc63a53e59288f98ed4e157fcb5e89618dbe21ea68d9b0720b5c40cdbf1b0ee", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e10dd60e39eff72f8fe527df7e61d052f58ea34cf6dd6c5915fc94cee074a5f", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4af617dbdbe9b87562dd12714048b4c6ce24ad1b1b450f350e48d632f51ec46", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:911df734560f192dda230fc7758cc0df52c51ac259cff44b84b3ccbcde8278cb", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a762fd5863a28b818a820868f7005687d507c12585eebc9c4c21ca4df97fad8", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34e0487aff89c841b01960dc2f390dd1268d3ee47dca673ac10c64aea2853aef", "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:65c7c4841fadf2bc6130c3808138b182ce05f3c850889d83af552d4dfee108bf", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:491e3601ab22672d49d3eb4467c9de4dacda5f47bd4a00dc92a41100fae8f0fb", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d2816d418a3e993794fe3943d33e7a12b39b24d196464c6d655f2b3fbf54e03" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4bcb3beadeeb16217fd5993997b464c171240f752da7553db740da8cea5d6bf", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:771fafcd2aeedc032ed66bcc73a3a5fd15301760bea18d4e806b050ca4ee2cef", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b62a6440d0229a6ef8ada1ca9e3f243631fd41c7f2426b2a3ddffb63477db2ad" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index b6d6ad79fe..32cc201e2b 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-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:7e10dd60e39eff72f8fe527df7e61d052f58ea34cf6dd6c5915fc94cee074a5f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a762fd5863a28b818a820868f7005687d507c12585eebc9c4c21ca4df97fad8" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 2534ebd890..42dfb2aa42 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,4 +1,7 @@ -- ovn-kubernetes image-arm64 b0250b9f40c38f707f56ab64d73acd490cb946c1 to 9fa9e577c7ba8a88e5c5856996aff0d794b4167d +- openshift-controller-manager embedded-component f0536caff57932e0b5fb88987477f4978463574a to 0d4f33493548b80c314f09895070ca4d1013a3fd + - facef38 2024-07-24T16:05:20+00:00 do not re-create a deleted service account + +- ovn-kubernetes image-amd64 b0250b9f40c38f707f56ab64d73acd490cb946c1 to 9fa9e577c7ba8a88e5c5856996aff0d794b4167d - 9a445ef2 2024-08-22T11:19:12+01:00 default net bootstrap: ignore localnet patch ports - f1751098 2024-08-22T11:19:12+01:00 node: When bootstrapping OVS flows check for the default net patch port. - 93ab06a7 2024-08-22T11:19:06+01:00 EIP hosted by secondary host inf: add vrf support diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 3ba4eb7b9a..f03fb8f70a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -12,7 +12,7 @@ https://github.com/openshift/etcd embedded-component 16202ec4ecea353650b3681979b https://github.com/openshift/kubernetes embedded-component 4510e9c7511370d04fbade5700d765c3ef5212c8 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51 https://github.com/openshift/machine-config-operator embedded-component 2c70c1155007d5aaadd70025f48e4d61158c9bd1 -https://github.com/openshift/openshift-controller-manager embedded-component f0536caff57932e0b5fb88987477f4978463574a +https://github.com/openshift/openshift-controller-manager embedded-component 0d4f33493548b80c314f09895070ca4d1013a3fd https://github.com/openshift/operator-framework-olm embedded-component f9c08816690d4a23cc08406c3adce151b38a908c https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6 https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415 https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-amd64 b0250b9f40c38f707f56ab64d73acd490cb946c1 +https://github.com/openshift/ovn-kubernetes image-amd64 9fa9e577c7ba8a88e5c5856996aff0d794b4167d https://github.com/openshift/kubernetes image-amd64 4510e9c7511370d04fbade5700d765c3ef5212c8 https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-arm64 e8fb3c0574da9189b61a87a53956aa820cbfcd2c diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 1023b90a3d..d76bd3671a 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.16.0-0.nightly-2024-08-21-192930" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-08-28-194707" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-08-29-132014" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-08-29-174154"