diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 5474c95783..bd7e5ceb59 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-06-23-145410 +OCP_VERSION := 4.17.0-0.nightly-2024-06-25-162526 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index c788a68aad..8f9f779a29 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -5,4 +5,4 @@ images: digest: sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b55ebcd26a627b2441eef1bb28601c6c278f6229cdca08a8a71ec4a75157b770 + digest: sha256:84c32dc331f53c5ccfcf4ce14305fe88b4e36e06d5237098747c0f1447691349 diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 317423ab92..7b4876760c 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.17.0-0.nightly-2024-06-23-145410" + "base": "4.17.0-0.nightly-2024-06-25-162526" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b55ebcd26a627b2441eef1bb28601c6c278f6229cdca08a8a71ec4a75157b770" + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84c32dc331f53c5ccfcf4ce14305fe88b4e36e06d5237098747c0f1447691349" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 0a8a838ac5..fe1cb95351 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0 + digest: sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504 + digest: sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c @@ -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:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968 - 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:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2 target: kind: Deployment labelSelector: app=catalog-operator 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 41e16f7741..fc804c6be1 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.17.0-0.nightly-2024-06-23-145410" + "base": "4.17.0-0.nightly-2024-06-25-162526" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 6462c14ed7..cbb8190b60 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.17.0-0.nightly-2024-06-23-145410" + "base": "4.17.0-0.nightly-2024-06-25-162526" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07e8d95d810db091ec0c72f4afb2ee055a9f32eda8979f04a99a11da9cfd7003", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..c2ea0970dd 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,18 @@ +- machine-config-operator embedded-component 612b9cd6a642a560bb48b9e8f1fa9cb4b54622ab to 58aca6909f9d1c319816dc12beedc35150418e40 + - 5236644a 2024-06-24T09:51:06-05:00 disable mglru service + - 521d36a9 2024-06-21T17:45:36-04:00 make logging less verbose and make OCL featuregate more explicit in operator + - 17e99bfd 2024-06-13T14:56:05-04:00 MCD should emit events whenever SIGTERM protection is added, removed, or bumped into + - 023c85cd 2024-06-13T13:10:06-04:00 update events in nodecontroller should include MachineConfig / image + - 47a8befb 2024-06-13T13:03:02-04:00 run validations on all MachineOSConfigs before rendering new MCD DaemonSet + - 97cefda5 2024-06-12T14:21:41-04:00 start MachineOSConfig informers only if the featuregate is enabled + - 82b19302 2024-06-12T14:21:41-04:00 initial commit of MCD-side implementation + - 6dc50086 2024-06-12T14:21:41-04:00 move canonicalizePullSecretBytes and add tests for all DockerConfig helpers + - d8ebdfc7 2024-06-12T14:21:41-04:00 wires up operator-side for currentimagepullsecret syncing + - 2d77dcf4 2024-06-12T14:21:40-04:00 certificatewriter should handle the internal registry pull secret + +- operator-framework-olm embedded-component 06c943a5bd529b7fb6fa278f637747889f4fab73 to 02e3f41f9a9e88fb3852c6c49e9cd6421fe9db61 + - 88c8eca4 2024-06-25T00:03:28+00:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) + - b682d7ee 2024-06-24T18:44:15+02:00 [CARRY] bump e2e timeout by 15 mins + - 56226d58 2024-06-24T18:42:56+02:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) + - 9c4ea260 2024-06-24T18:37:18+02:00 [OCPBUGS-34173]: fix sorting unpack jobs (#3299) + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index fd62ff7d56..ec2eb12b94 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 43de97b https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 https://github.com/openshift/kubernetes embedded-component d0324787c86dcd13d4f16745da43b216a6787040 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 612b9cd6a642a560bb48b9e8f1fa9cb4b54622ab +https://github.com/openshift/machine-config-operator embedded-component 58aca6909f9d1c319816dc12beedc35150418e40 https://github.com/openshift/openshift-controller-manager embedded-component dc54a288f78e85e880ee37da2877629efd65c8c6 -https://github.com/openshift/operator-framework-olm embedded-component 06c943a5bd529b7fb6fa278f637747889f4fab73 +https://github.com/openshift/operator-framework-olm embedded-component 02e3f41f9a9e88fb3852c6c49e9cd6421fe9db61 https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 https://github.com/openshift/oc image-amd64 34c69c72be5a0c71863965a5c6480c236b0f843e diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e434b799f6..3077f4336a 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.17.0-0.nightly-2024-06-23-145410" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-25-104321" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-25-162526" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-25-104321"