Skip to content

rebase-4.13.0-0.nightly-2023-06-20-224158_amd64-2023-06-20_arm64-2023-06-22 #1953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 5 commits into from
Jun 23, 2023
Merged

rebase-4.13.0-0.nightly-2023-06-20-224158_amd64-2023-06-20_arm64-2023-06-22 #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb3f879
update last_rebase.sh
Jun 23, 2023
b9cb520
update changelog
Jun 23, 2023
ab9693e
update component images
Jun 23, 2023
94194f0
update manifests
Jun 23, 2023
70111d6
update buildfiles
Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-20-232426
OCP_VERSION := 4.13.0-0.nightly-arm64-2023-06-22-192213
16 changes: 8 additions & 8 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.13.0-0.nightly-arm64-2023-06-20-232426"
"base": "4.13.0-0.nightly-arm64-2023-06-22-192213"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:538f9e1c5f97ecf850129d6452ab8e0b412501250a60195173eb257d09836612",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:291ab7642f7dc4684015d51791a01ac5c8973d12c7241c3dc5298b037808d4f3",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55be64102a3a376fcb9a4b0f0b78774e6cdeb8bb406086d15d3e82f6d03ca65c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaa62efc0b760d4c214c6ece7f26e961021d70f542e5539d8697f110392a920e",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76e9952ab59c184b4e62eaaa1e130780dff55a4b94f577394aa5f4e4849ca0fc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26a22ff33dc51fce0b9659e32e0dbc88cefe4fddb395c715ed181fced0aa681f",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d7e939814260f4c2b513ceb9aeee6653c202d532706d1cd67288175e010a994",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7920dfd034ad30c825883bb37ca326a1d9305ad7fb302a0886bf1f4dacb11679",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c42149bc1a2bba1b274f56a787dfa6792df779eca3c8bcc00b5e2d9a8c9125c3",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3051bbdee34556c4cdb55a86d239937d0983f573788a0a10828fa772a4449df6",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41aa8b8adfa3b8de797a8767ee7748fd8d9b5bca0936c1704d1541cf5056d2ee",
"ovn-kubernetes-microshift-rhel-9": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178ef33642626c232d322d07c16f811fe82d4bed9f7d5820558d789cf6f2d43e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe88935a72170db480a65443929214b056e20f1a7d1f1db8f8d460347126d074",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df224b892b13ba9c726397f9edb94ac14c2d1b648cd4bf12706ee53dbc79bdb2",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/microshift_arm64.conf
View file
Open in desktop
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:3051bbdee34556c4cdb55a86d239937d0983f573788a0a10828fa772a4449df6"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe88935a72170db480a65443929214b056e20f1a7d1f1db8f8d460347126d074"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
68 changes: 61 additions & 7 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,61 @@
# cluster-network-operator embedded-component 924fd3c589f0dc345807550965ef80099311b82a to cf774f4844621d058b951457a4068aeb3e1e609e
ff5d378a5e8a9af3d20692d11c1b9270549d075e 2023-06-12T19:27:03+00:00 Do not determine if HyperShift is enabled based on the ControlPlaneTopology value
cfdebe8dca3e6b74109a00683480f1c82c956ae9 2023-05-18T19:15:03+00:00 Use `IfNotPresent` instead of `Always` in OVNK upgrades pre-puller
# ovn-kubernetes image-amd64 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f to 723ce848a1a3f1a699409d0c2e5ff52114e5be89
cd99b41e441a917e51f983f69d34578167293395 2023-06-18T17:49:56+02:00 Fix stale SNAT entries for completed pods
# ovn-kubernetes image-arm64 6a2a027e6bd46d43ca05c6259d2ea08147f2f47f to 723ce848a1a3f1a699409d0c2e5ff52114e5be89
cd99b41e441a917e51f983f69d34578167293395 2023-06-18T17:49:56+02:00 Fix stale SNAT entries for completed pods
# oc image-arm64 05d83eff7e17160e679898a2a5cd6019ec252c49 to e4c9a6aeac8e382ad8a5dd6c2031a694ca0b80eb
eff56e48834680503831d230ee9b8e6d5d00dd5e 2023-06-21T19:00:35+00:00 handle the error case of node retrieval while waiting for reboot
0bcbf9a594ad5aaec1d7f3b70315ed7f9b8b84f5 2023-06-16T13:16:06-04:00 update vendor
0ab82d4252c007b5f84c35282dd24d4075fa80c7 2023-06-16T13:15:49-04:00 cleanup naming
27fd33f1d1e2644171b42b8e920f45deb1650787 2023-06-16T13:15:49-04:00 wait for node reboot
ae96b7748be552a9df5b25e8b258dc277a44b7a6 2023-06-16T13:15:49-04:00 better qualify name
b8d0af2d3cce8ee87b3bce58261d0f0ee3106165 2023-06-16T13:15:49-04:00 add reboot-nodes
3328a48ad82aeee0372a7a7e96803432b3bb0f2a 2023-06-16T13:15:49-04:00 tweak output format
4c23f646b3c004373f9d59ebbc5e43b08857cfcb 2023-06-16T13:15:49-04:00 correct the cert matching
eb6ac50db4a39ca520b02653379d8aa427b9bd32 2023-06-16T13:15:49-04:00 trustpurge: scope the observed NSes to "openshift-" prefixed ones
94a60d4ad13ae3a36d2e68a2e7ad4a9d64f02d91 2023-06-16T13:15:49-04:00 trustpurge: extend observing the trust changes to all leaf certs
4b26883c5b808f1c3c6ef6ab36f979658a9c44d3 2023-06-16T13:15:49-04:00 trustpurge: fix docs issues
c94fc5eb135c93a513b804fa4f88edba195fd23e 2023-06-16T13:15:49-04:00 trustpurge: don't proceed if trustbundle changes affect trust
23631889e95694d292d98fc23e71bf1f64423746 2023-06-16T13:15:49-04:00 fix directories for constitency
557e4e767a8a2e7ba9588c2e5c8df4ca96b7c325 2023-06-16T13:15:49-04:00 pernodepod: percent works like this
3e73f43845098c0143df1615e253824e83358214 2023-06-16T13:15:49-04:00 ocpcertificates: complete MCS CA rotation command
e31b56daae6a4b0a7ab966bf111667e9504bd76b 2023-06-16T13:15:49-04:00 ocpcertificates: Add regenerate-mco
c6f32a1a37153d7796631c939e2fbd38ea88abfd 2023-06-16T13:15:49-04:00 ocpcertificates: don't make assumptions on resources not to bring piping from -oname commands
3d552036721143f147f0a009872c0011e93448b6 2023-06-16T13:15:49-04:00 clusteroperator,ocpcertificates: add command descriptions and examples
d6dd0bbdf65c827391adb93e91e774d073d5775e 2023-06-16T13:15:49-04:00 waitforstable: fix typo in minimum-stable-period flag
bd9ef42ba60e55a8c68a824f671135c7a32dc05d 2023-06-16T13:15:49-04:00 ocpcertificates: fix handling resources by names explicitly
bca786a70ca96339ae58e4e94a817d705acc33b6 2023-06-16T13:15:49-04:00 add new kubelet bootstrap command
7fcc1a71d73510dd203f9ed2d0eb9463ad0b385b 2023-06-16T13:15:49-04:00 add directives and fix percentage node calculation
42b88bf2d1e923cb74555ec56c6f373b5cab2703 2023-06-16T13:15:49-04:00 skip unready nodes quickly
d9d99d41428abfa942997863cd7208bc3aa217b6 2023-06-16T13:15:49-04:00 add the option to add a command when restarting kubelets
787060e317c1d3ee5d9319e3af8022bf8feaf939 2023-06-16T13:15:49-04:00 trustpurge: use RetryOnConflict for conflict handling
e7f5b9e85448e50ec46b157469d6c0c6615d6b27 2023-06-16T13:15:49-04:00 add newline between polls to make it easier to read by hu9mans
7626cdaba4c3b2cce2fc16585004d9dd89d1bc73 2023-06-16T13:15:49-04:00 update output to make the wait easier to see and print all proceeding operators
a443a97caf93329d513965ce650c999b9267591c 2023-06-16T13:15:49-04:00 ocpcertificates: hardcode resources to use with given commands
c036aaf55e965ba2c90248a090469b297ff3616f 2023-06-16T13:15:49-04:00 trustpurge: allow excluding ca-bundles
8810b9ea4d04d37d54c3ebfe5e1f1dcd0823e440 2023-06-16T13:15:49-04:00 trustpurge: move to Update, retry on Update() conflicts
3357afef4dcc65becc2a30e516429c8c015a0f36 2023-06-16T13:15:49-04:00 ocpcertificates: add the 'remove-old-trust' subcommand
03af9627a1d3f2a9d671f770a7222ad621f1171e 2023-06-16T13:15:49-04:00 certregen: return error on failed apply to stop from further progressing
1ace080091d8e6681b5a4727824f653dfeea4d06 2023-06-16T13:15:49-04:00 certregen: add unit tests for leaf cert regen
9a86471e3e3094d9b5c18dc02ebd2bcd217db2d3 2023-06-16T13:15:49-04:00 certregen: only generate 2048 bit keys to speed up tests
6d7bce49eeb54352ed4706a368b33629c3063064 2023-06-16T13:15:49-04:00 update wait for stability to handle short durations
ccaf1682636e947ca20ddb69db12748eddf21630 2023-06-16T13:15:49-04:00 update for comments
b999ee20ca600911d3e192b381ca16d17e5bbcab 2023-06-16T13:15:49-04:00 create command to create new adminkubeconfig
aa99b3c2352691ba68faf6e6be3f9755dbad277d 2023-06-16T13:15:48-04:00 add a command to copy content to every node
23457de36895d6875c09044c4dddf007bcfa5f40 2023-06-16T13:15:48-04:00 refactor the restart kubelet to extract PerNodePod commands
9af72525a80a2c6b7e63d089b7ec4cf3429c162a 2023-06-16T13:15:48-04:00 add leaf certs regen, reusing the original logic for toplevel
d866c5b4d44834a70ebc72d000a7b592b33afc6b 2023-06-16T13:15:48-04:00 remove previous testing proposal
ff5316030c6503c7c38949d8ea58eb3baf6c8235 2023-06-16T13:15:48-04:00 add kubelet restart
ea79c9ed4d05de2c2877d5366ccbf7cb52365b1f 2023-06-16T13:15:48-04:00 add command to restart kubelets
469fa2351fe8b26b7d651e6349cc52258abfe7c9 2023-06-16T13:15:48-04:00 refactor to better match kubectl best practice
4f6416008b9d7aaf0ee3b2b92d5dbfdee199003a 2023-06-16T13:15:48-04:00 fix linting problems
ba405cd78838d0fbb56a317a8c2aeeaba5ec5f4f 2023-06-16T13:15:48-04:00 fix node lease namespace
bea06c65383f46f25e2bcd4392791ad6a8a35e55 2023-06-16T13:15:48-04:00 add detection for updated SA trust bundles
16195e81d06685dd89c75df8700d2ce8d6db0ffc 2023-06-16T13:15:48-04:00 add revision printing
e1dbab0fcd35b7fe772a962c645a85816086a08f 2023-06-16T13:15:48-04:00 fix comments on the monitor command
d7eeeb381d0161f43bd1989e6ca894619a95b753 2023-06-16T13:15:48-04:00 add a command to wait for the cluster to become stable
8bd8774350c56818239971413c1e01065d687446 2023-06-16T13:15:48-04:00 add command to produce an updated CA bundle for trusting the kube-apiserver
364342e4999a133562a449fd7829cf87175a8598 2023-06-16T13:15:48-04:00 add certificate monitoring
b2e505d6a959c185b5342e12af17d67b41608086 2023-06-16T13:15:48-04:00 unit test forceRegenerationOnSecret
e1e76e847c4d1b0d58d48b29bc3bef06a380ca17 2023-06-16T13:15:48-04:00 add basic testing
80ae1fe94ae415a3bc075a770f544be5fe0c6ea9 2023-06-16T13:15:48-04:00 rename regenerate-signers to regeneration-top-level
6554d9b8c98af768b7a28db82d3c1ce1823c3621 2023-06-16T13:15:48-04:00 add a filter to only regenerate those certs that were valid before a particular datetime
c52610bcfb4fe8c0923d59269356d543a970d438 2023-06-16T13:15:48-04:00 add command to rotate signing certificates
6c0beafe41e21c3274dc45a17d3372cd6d2f231e 2023-06-16T13:15:48-04:00 copy functions from cluster-debug-tools, they can vendor it back
# ovn-kubernetes image-arm64 723ce848a1a3f1a699409d0c2e5ff52114e5be89 to 855f4a44967fe932f6f067cd338d74d7b8f010c0
edd859d22835c5692728490c529172cffc91096b 2023-06-16T10:24:16-04:00 Validate port before deleting conntrack flow
4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 11b1439d48a47a408ae7e2d
https://github.com/openshift/ovn-kubernetes image-amd64 723ce848a1a3f1a699409d0c2e5ff52114e5be89
https://github.com/openshift/kubernetes image-amd64 7d221229dc97969b79a272b63ad97b84d93cddb2
https://github.com/openshift/service-ca-operator image-amd64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
https://github.com/openshift/oc image-arm64 05d83eff7e17160e679898a2a5cd6019ec252c49
https://github.com/openshift/oc image-arm64 e4c9a6aeac8e382ad8a5dd6c2031a694ca0b80eb
https://github.com/openshift/coredns image-arm64 5560e4ad8c343c211f0b2f9d85ce7331b20b87cb
https://github.com/openshift/router image-arm64 065deab84f342615db2d2f5c78a19ae04bb43912
https://github.com/openshift/kube-rbac-proxy image-arm64 11b1439d48a47a408ae7e2dd851989f7b7b4f595
https://github.com/openshift/ovn-kubernetes image-arm64 723ce848a1a3f1a699409d0c2e5ff52114e5be89
https://github.com/openshift/ovn-kubernetes image-arm64 855f4a44967fe932f6f067cd338d74d7b8f010c0
https://github.com/openshift/kubernetes image-arm64 7d221229dc97969b79a272b63ad97b84d93cddb2
https://github.com/openshift/service-ca-operator image-arm64 1b89fdce3fcccecdc5fdb705fe674cd4bfc58a2a
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
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.13.0-0.nightly-2023-06-20-224158" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-20-232426" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.13.0-0.nightly-2023-06-20-224158" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.13.0-0.nightly-arm64-2023-06-22-192213" "registry.access.redhat.com/lvms4/lvms-operator-bundle:v4.12"