Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-08-12-150342_amd64-2024-08-12_arm64-2024-08-12 #3758

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-bot merged 4 commits into from
Aug 13, 2024
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-08-12-150342_amd64-2024-08-12_arm64-2024-08-12 #3758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ec0126
update last_rebase.sh
Aug 13, 2024
91b90f4
update changelog
Aug 13, 2024
7b121e2
update manifests
Aug 13, 2024
7374fbc
update buildfiles
Aug 13, 2024
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.16.0-0.nightly-arm64-2024-08-11-201614
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-08-12-205807
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.16.0-0.nightly-2024-08-11-182254
OCP_VERSION := 4.16.0-0.nightly-2024-08-12-150342
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-08-11-201614"
"base": "4.16.0-0.nightly-arm64-2024-08-12-205807"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa3fe885463e7be32e3b37f90a2d34106db626ed8c168b949e7bfa9d2bee154c",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-08-11-182254"
"base": "4.16.0-0.nightly-2024-08-12-150342"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68c805e016aba048f303e3c5ce930bebd7e7ac21fe66a5ea913fa67e8dd4168e",
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e13a45950990aee7a351728458b38321f12d8825e272c02b2c5146571f4c51b6
digest: sha256:56a015ee5fe68102d6c7aaa234316b6c4db32b1c7859fc97c6ff109ff3a8c7ef
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b6414a250df111a79a43e2c16d964e344e12a7d6576350036d9671d86263d3a6
digest: sha256:fb422f92b4a266ca3b136d3c8a526baff421709e2c625e57a246d56091cccbfa
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:1fcccde5748c8f313152cef635670796c8e83fed8d93a4c37e3626485fb8c28a
Expand All @@ -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:b6414a250df111a79a43e2c16d964e344e12a7d6576350036d9671d86263d3a6
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb422f92b4a266ca3b136d3c8a526baff421709e2c625e57a246d56091cccbfa
- 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:e13a45950990aee7a351728458b38321f12d8825e272c02b2c5146571f4c51b6
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56a015ee5fe68102d6c7aaa234316b6c4db32b1c7859fc97c6ff109ff3a8c7ef
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6329a809b3f3795d0c1444759e3eb2c1bf5e5bece818bd0752059cd29a5bc9ce
digest: sha256:0a965c0b69a64ab53698a1528e64489fe3cc4462d061fdd1d83a8a6e4107cac3
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2693a228d4cafb187655d18e3a23bbe4998f0d63226cb1974099e673c1eae025
digest: sha256:cc7b43bed49d227dc425ca41d9708480c9ca67a01726a95f0c522a3905f2ad31
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:12cc721a3ae6d7ac40f4ca9e0ad4e14f09c137e5b3e9396aeb0955d24aba3864
Expand All @@ -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:2693a228d4cafb187655d18e3a23bbe4998f0d63226cb1974099e673c1eae025
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc7b43bed49d227dc425ca41d9708480c9ca67a01726a95f0c522a3905f2ad31
- 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:6329a809b3f3795d0c1444759e3eb2c1bf5e5bece818bd0752059cd29a5bc9ce
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a965c0b69a64ab53698a1528e64489fe3cc4462d061fdd1d83a8a6e4107cac3
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-08-11-201614"
"base": "4.16.0-0.nightly-arm64-2024-08-12-205807"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13a45950990aee7a351728458b38321f12d8825e272c02b2c5146571f4c51b6",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6414a250df111a79a43e2c16d964e344e12a7d6576350036d9671d86263d3a6",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56a015ee5fe68102d6c7aaa234316b6c4db32b1c7859fc97c6ff109ff3a8c7ef",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb422f92b4a266ca3b136d3c8a526baff421709e2c625e57a246d56091cccbfa",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fcccde5748c8f313152cef635670796c8e83fed8d93a4c37e3626485fb8c28a"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-08-11-182254"
"base": "4.16.0-0.nightly-2024-08-12-150342"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6329a809b3f3795d0c1444759e3eb2c1bf5e5bece818bd0752059cd29a5bc9ce",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2693a228d4cafb187655d18e3a23bbe4998f0d63226cb1974099e673c1eae025",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a965c0b69a64ab53698a1528e64489fe3cc4462d061fdd1d83a8a6e4107cac3",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc7b43bed49d227dc425ca41d9708480c9ca67a01726a95f0c522a3905f2ad31",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12cc721a3ae6d7ac40f4ca9e0ad4e14f09c137e5b3e9396aeb0955d24aba3864"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-08-11-201614"
"base": "4.16.0-0.nightly-arm64-2024-08-12-205807"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:427e96995af8ee804319127ad83743e34e31f8d94f195f81193fe37a213cc8f6",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-08-11-182254"
"base": "4.16.0-0.nightly-2024-08-12-150342"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0be16b555a3a821bca04e7953b4ecefdffa838676199c3f045bfef8b28f0f00",
Expand Down
62 changes: 2 additions & 60 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,3 @@
- cluster-network-operator embedded-component 739536971534310704707375a4903858d7331ad3 to 64bf8adae331c75a21e106f9fb537b2b6a9243a8
- 5c59231 2024-06-13T11:32:39+00:00 Use applyconfigurations for updating network.oprerator status
- ce0fd1a 2024-06-13T11:32:39+00:00 Vendor fake client-go operator client

- etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305 to 16202ec4ecea353650b3681979ba73c5d8664d8c
- c1e70885 2024-05-30T19:23:02+02:00 DOWNSTREAM <carry>: drop go toolchain directive
- eac77f62 2024-05-30T19:13:10+02:00 DOWNSTREAM <carry>: add native binary to installer images
- b5333797 2024-05-30T19:07:38+02:00 CORS-3249: DOWNSTREAM <carry>: installer: make etcd binaries static
- 0f16923e 2024-05-30T19:07:25+02:00 DOWNSTREAM <carry>: add installer Dockerfile for ART builds
- 4622985e 2024-05-30T19:07:14+02:00 DOWNSTREAM <carry>: update Dockerfile golang 1.20 ocp 4.16
- 74926bc7 2024-05-30T19:07:03+02:00 DOWNSTREAM: <carry>: Add Dockerfile to build etcd for openshift-installer
- bf4fdc77 2024-05-30T19:06:57+02:00 Merge pull request #236 from openshift-bot/art-consistency-openshift-4.16-ose-etcd
- 3305cc80 2024-05-30T19:04:56+02:00 DOWNSTREAM <carry>: update Dockerfile golang 1.20 ocp 4.16
- a409563b 2024-05-30T18:27:58+02:00 DOWNSTREAM <carry>: resolve merge conflicts
- bf51a53a 2024-05-30T06:33:09+12:00 version: bump up to 3.5.14
- 8bc3271a 2024-05-23T23:37:11+05:30 config: support AllowedCN and AllowedHostname through config file
- 3c990bc4 2024-05-16T14:45:48+05:30 scripts: default to using .go-version's version for tests and builds
- 47403158 2024-05-16T14:45:42+05:30 .*: sync go toolchain version and add ability to verify versions
- f715ffd7 2024-05-10T18:25:42+05:30 update the go v1.21.10
- 9e1dadd7 2024-05-09T21:41:23-04:00 etcdutl: Fix snapshot restore memory alloc issue
- 6abc349d 2024-05-09T21:41:16-04:00 server: Implement WithMmapSize option for backend config
- 99a64341 2024-05-06T10:31:18-07:00 Add cluster downgrade test.
- a5eec4d7 2024-05-06T12:02:49+02:00 Bump bbolt to 1.3.10 for 3.5
- cee181d1 2024-05-06T10:03:08+02:00 v3rpc: run health notifier to listen on online defrag state change
- 22ca6151 2024-05-01T17:26:02+00:00 build(deps): bump distroless/static-debian11 from `046b92c` to `6d31326`
- 750bc0b1 2024-04-30T15:09:51+02:00 gRPC health server sets serving status to NOT_SERVING on defrag
- daec41c2 2024-04-29T18:55:52+00:00 e2e: add mix version test of adding last ver to current ver.
- 0af22abc 2024-04-24T12:28:20+08:00 server/mvcc: should update currentRev in revMu
- c06b17b9 2024-04-24T12:25:19+08:00 server/storage: update currentRev if scheduledCompact > currentRev
- 7beff571 2024-04-24T12:23:33+08:00 tests/e2e: reproduce #17780
- 6b034466 2024-04-24T12:14:27+08:00 server/mvcc: introduce compactBeforeSetFinishedCompact failpoint
- adf1c3f2 2024-04-21T13:17:07+01:00 Update the compaction log when bootstrap and update compact's signature
- c391d69b 2024-04-18T19:08:05+00:00 test: add checking snapshot be sent in mix_version_test.
- 9331ee32 2024-04-17T13:50:23+02:00 [backport-3.5] server: ignore raft messages if member id mismatch #17078
- 464df4a9 2024-04-15T17:04:44-07:00 add experimental-snapshot-catchup-entries flag.
- c06ec722 2024-04-08T21:37:06+00:00 test: add mix version e2e test.
- 51f31343 2024-04-06T22:58:32+08:00 feat: observe wal write at one time
- b6df59cb 2024-04-06T14:40:05+00:00 Add approvals gh workflows.
- 1404f5aa 2024-04-05T01:08:21+05:30 [3.5]Add trivy scan as a job in release workflow
- 94a1d0c1 2024-04-04T22:33:05+08:00 *: LeaseTimeToLive returns error if leader changed
- b78b2140 2024-04-04T22:33:05+08:00 .github: enable failpoints for integration tests
- 600b6bfe 2024-04-04T10:55:45+02:00 Bump golang.org/x/net to v0.23.0
- 5776e213 2024-04-04T10:55:45+02:00 Bump go-version to 1.21.9 for release-3.5 due to CVE-2023-45288
- 61a85b7a 2024-04-03T08:49:28+02:00 Backport initialization of mu in NewCtxClient to release-3.5
- 953a023b 2024-04-03T10:50:15+13:00 Backport updates to shellcheck ignores for release.sh script.
- 1868848b 2024-04-03T09:51:54+13:00 Backport rename of release script to release.sh.
- 107412fc 2024-04-03T09:28:31+13:00 Backport update for release script to use ssh.
- d1eb35d5 2024-04-01T17:41:43+00:00 build(deps): bump distroless/static-debian11 from `7e5c6a2` to `046b92c`
- 0c2f2083 2024-04-01T09:07:24+00:00 Fix retry requests when receiving ErrGPRCNotSupportedForLearner

- machine-config-operator embedded-component 64434515dba546949bcec20be26f3215a4fc5b53 to d0ce9ec9354040ca3df1f0f46f3e42ccbaf9547c
- 6ad8bd6e 2024-06-25T14:48:01+00:00 fixes canonicalized secret creation and updates

- ovn-kubernetes image-amd64 494993b7702336ed9d527c2c9899b85cdd22c7bf to b0250b9f40c38f707f56ab64d73acd490cb946c1
- 7d620d54 2024-08-02T17:14:34+02:00 Use Transaction timeout for MonitorAll call. It allows to change this value via config.
- 92dcc408 2024-08-02T17:14:27+02:00 Make OVSDBTimeout for transactions a part of config.Global instead of const. A reasonable value for this timeout depends on the size of the cluster and making it configurable may help solve crashloop problems. It also speeds up testing as timeout may be set to lower value for unit tests. Set default value to 100 second, to allow larger transactions, e.g. 50 address set batch updated on address set sync with dbIDs.

- ovn-kubernetes image-arm64 494993b7702336ed9d527c2c9899b85cdd22c7bf to b0250b9f40c38f707f56ab64d73acd490cb946c1
- 7d620d54 2024-08-02T17:14:34+02:00 Use Transaction timeout for MonitorAll call. It allows to change this value via config.
- 92dcc408 2024-08-02T17:14:27+02:00 Make OVSDBTimeout for transactions a part of config.Global instead of const. A reasonable value for this timeout depends on the size of the cluster and making it configurable may help solve crashloop problems. It also speeds up testing as timeout may be set to lower value for unit tests. Set default value to 100 second, to allow larger transactions, e.g. 50 address set batch updated on address set sync with dbIDs.
- operator-framework-olm embedded-component 97a3268a20581bb6b9f3fc9e41aed944fa538842 to 45bf8edfd28026bd821a83f758856bf8e719dd20
- 9d10b697 2024-08-07T16:29:48-03:00 Merge pull request #832 from perdasilva/perdasilva/junittg

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component 6abe8a19439b7c352cd3b
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component d0ce9ec9354040ca3df1f0f46f3e42ccbaf9547c
https://github.com/openshift/openshift-controller-manager embedded-component f0536caff57932e0b5fb88987477f4978463574a
https://github.com/openshift/operator-framework-olm embedded-component 97a3268a20581bb6b9f3fc9e41aed944fa538842
https://github.com/openshift/operator-framework-olm embedded-component 45bf8edfd28026bd821a83f758856bf8e719dd20
https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6
https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-amd64 e8fb3c0574da9189b61a87a53956aa820cbfcd2c
Expand Down
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.16.0-0.nightly-2024-08-11-182254" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-08-11-201614"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-08-12-150342" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-08-12-205807"