Skip to content

Commit

Permalink
NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-06-25-162526_amd64-2024-0…
Browse files Browse the repository at this point in the history
…6-25_arm64-2024-06-27 (#3552)

* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>
  • Loading branch information
microshift-rebase-script[bot] and ci-robot authored Jun 29, 2024
1 parent ba72ed5 commit 2dd42e5
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-25-104321
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-27-123138
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-06-25-104321"
"base": "4.17.0-0.nightly-arm64-2024-06-27-123138"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a65d1c102dbc2110cd2fa4545814a3899aa8a2ec98d602a077dfaf923b60296d",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-06-25-104321"
"base": "4.17.0-0.nightly-arm64-2024-06-27-123138"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:695592ec8720a62ad0a608a166576c2608ce00e0fdfdbdc19a1e6a5ace455389",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-06-25-104321"
"base": "4.17.0-0.nightly-arm64-2024-06-27-123138"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:822d8f3bad3de9d3e0952011a898c14918ce2b999c75041e68cb360e7eb1c108",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f56ab46f4de90aa652b594689070bc3aff4b3a0f5ef2984f38ca406493b319e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d94cd2f26513a3142b0b5bc17b04ce2d40db58a047a4ceb0753f21e7930374c1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ef113223a70ed1ef3d2fe260d07868a37a0a31d96f99e2150cc6675c5e5aadd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0dad79eca25c92d00bf123571267885992f80885a4e47d22112e26cf0d2c8f3e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f78d030ae5d3c81c65d28c4a012da2761884be23fea0ff4a31e6a64f98285aa",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f63045b7607cb1b86c745aa8e799ecf527124a1cc588aa187a0ba5a80630d6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c239885606463c7dc49f0f0b3d144007fbfa0b3ef4a58a58cd920c36d9b32e4a",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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:0dad79eca25c92d00bf123571267885992f80885a4e47d22112e26cf0d2c8f3e"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31f63045b7607cb1b86c745aa8e799ecf527124a1cc588aa187a0ba5a80630d6"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
40 changes: 24 additions & 16 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
- 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
- ovn-kubernetes image-arm64 56c123fe65143eb4005558d9845c89d243c8573c to 1356c9b67dc0f07b71537117f1fce09a34b9b5cf
- 84b72abb 2024-05-25T16:06:38+00:00 Updating ovn-kubernetes-microshift-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ovn-kubernetes-microshift.yml

- 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)
- kubernetes image-arm64 d0324787c86dcd13d4f16745da43b216a6787040 to 733cc9d44d7c449f231313a8f158e265afa4b8c6
- 69330adbe 2024-06-21T13:51:03-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
- efe876d19 2024-06-21T13:50:32-04:00 UPSTREAM: <drop>: manually resolve conflicts
- 39683505b 2024-06-11T20:20:59+00:00 Release commit for Kubernetes v1.30.2
- 47c36d4bb 2024-06-06T18:18:54+02:00 Bump images, dependencies and versions to go 1.22.4 and distroless iptables/setcap/debian-base
- cd73ad187 2024-06-04T23:23:18+00:00 update driver installer
- 654c085cb 2024-06-04T09:04:10+00:00 Don't fill in NodeToStatusMap with UnschedulableAndUnresolvable
- 1ddcf3486 2024-06-04T09:02:07+00:00 Revert "scheduler: preallocation for NodeToStatusMap"
- 0df726772 2024-06-03T08:12:16+03:00 kubeadm: use the actual configured kubelet healthz address:port
- 398ab938e 2024-05-23T12:07:42+03:00 kubectl create cronjobs: Manually set OwnerReferences
- 42b93b35b 2024-05-22T10:41:21+08:00 add an integration test when nodeAffinity specifies a non-existent node.
- f73bb17ef 2024-05-22T10:41:21+08:00 base on allNodes when calculating nextStartNodeIndex
- a26f2c59e 2024-05-16T11:59:44-04:00 Fix printPod panic with spurious container statuses
- 85fc47582 2024-05-14T11:10:45+00:00 Update CHANGELOG/CHANGELOG-1.30.md for v1.30.1
- 3d8967247 2024-05-13T17:34:08+00:00 Adding the feature gates to fix cost for VAP and webhook matchConditions.
- b762a187f 2024-05-13T11:04:47+00:00 cherry pick #124618 to 1.30
- 1c8b0f697 2024-05-13T11:11:59+02:00 fix requests tracker concurrency
- 2956e294c 2024-05-13T11:11:59+02:00 fix conflict race in statefulset rest update
- 7d9b913d1 2024-05-13T11:11:58+02:00 fix stateful set pod recreation and event spam
- a58d4f54c 2024-05-13T11:11:58+02:00 fix pods tracking and internal error checking in statefulset tests
- f20b6672b 2024-05-12T15:30:58+02:00 [go] Bump images, dependencies and versions to go 1.22.3 and distroless iptables
- d8c37e815 2024-05-11T01:18:51+00:00 Updated & added visibility to apiserver x509 test certificates expiring this year

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f05
https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191
https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6
https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216
https://github.com/openshift/ovn-kubernetes image-arm64 56c123fe65143eb4005558d9845c89d243c8573c
https://github.com/openshift/kubernetes image-arm64 d0324787c86dcd13d4f16745da43b216a6787040
https://github.com/openshift/ovn-kubernetes image-arm64 1356c9b67dc0f07b71537117f1fce09a34b9b5cf
https://github.com/openshift/kubernetes image-arm64 733cc9d44d7c449f231313a8f158e265afa4b8c6
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
Original file line number Diff line number Diff line change
@@ -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-25-162526" "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-27-123138"

0 comments on commit 2dd42e5

Please sign in to comment.