Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-08-13-161657_amd64-2024-08-13_arm64-2024-08-13 #3765

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 14, 2024
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-08-13-161657_amd64-2024-08-13_arm64-2024-08-13 #3765

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
5ae6015
update last_rebase.sh
Aug 14, 2024
cc086f5
update changelog
Aug 14, 2024
3cbe8f3
update manifests
Aug 14, 2024
0184d14
update buildfiles
Aug 14, 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-12-205807
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-08-13-172816
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-12-150342
OCP_VERSION := 4.16.0-0.nightly-2024-08-13-161657
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-12-205807"
"base": "4.16.0-0.nightly-arm64-2024-08-13-172816"
},
"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-12-150342"
"base": "4.16.0-0.nightly-2024-08-13-161657"
},
"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:56a015ee5fe68102d6c7aaa234316b6c4db32b1c7859fc97c6ff109ff3a8c7ef
digest: sha256:b5238544d17c114981234859479b164ee4d03c5465d15a82b0a71f084ac17092
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fb422f92b4a266ca3b136d3c8a526baff421709e2c625e57a246d56091cccbfa
digest: sha256:4196ff7a4b52c7126461acaf8a01d3263922863f8cd4b88e911087be94a3c16d
- 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:fb422f92b4a266ca3b136d3c8a526baff421709e2c625e57a246d56091cccbfa
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4196ff7a4b52c7126461acaf8a01d3263922863f8cd4b88e911087be94a3c16d
- 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:56a015ee5fe68102d6c7aaa234316b6c4db32b1c7859fc97c6ff109ff3a8c7ef
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5238544d17c114981234859479b164ee4d03c5465d15a82b0a71f084ac17092
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:0a965c0b69a64ab53698a1528e64489fe3cc4462d061fdd1d83a8a6e4107cac3
digest: sha256:630b8453429a627b500518bd52caba069e6d3f6e2bde4364cde3af11628f85de
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cc7b43bed49d227dc425ca41d9708480c9ca67a01726a95f0c522a3905f2ad31
digest: sha256:ede227ad2cd2581f910c405dd6863ac007884636fdbbe7e9cb3f6bdcc3ab25d6
- 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:cc7b43bed49d227dc425ca41d9708480c9ca67a01726a95f0c522a3905f2ad31
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ede227ad2cd2581f910c405dd6863ac007884636fdbbe7e9cb3f6bdcc3ab25d6
- 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:0a965c0b69a64ab53698a1528e64489fe3cc4462d061fdd1d83a8a6e4107cac3
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:630b8453429a627b500518bd52caba069e6d3f6e2bde4364cde3af11628f85de
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-12-205807"
"base": "4.16.0-0.nightly-arm64-2024-08-13-172816"
},
"images": {
"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",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5238544d17c114981234859479b164ee4d03c5465d15a82b0a71f084ac17092",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4196ff7a4b52c7126461acaf8a01d3263922863f8cd4b88e911087be94a3c16d",
"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-12-150342"
"base": "4.16.0-0.nightly-2024-08-13-161657"
},
"images": {
"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",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:630b8453429a627b500518bd52caba069e6d3f6e2bde4364cde3af11628f85de",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ede227ad2cd2581f910c405dd6863ac007884636fdbbe7e9cb3f6bdcc3ab25d6",
"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-12-205807"
"base": "4.16.0-0.nightly-arm64-2024-08-13-172816"
},
"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-12-150342"
"base": "4.16.0-0.nightly-2024-08-13-161657"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0be16b555a3a821bca04e7953b4ecefdffa838676199c3f045bfef8b28f0f00",
Expand Down
4 changes: 2 additions & 2 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- operator-framework-olm embedded-component 97a3268a20581bb6b9f3fc9e41aed944fa538842 to 45bf8edfd28026bd821a83f758856bf8e719dd20
- 9d10b697 2024-08-07T16:29:48-03:00 Merge pull request #832 from perdasilva/perdasilva/junittg
- operator-framework-olm embedded-component 45bf8edfd28026bd821a83f758856bf8e719dd20 to f9c08816690d4a23cc08406c3adce151b38a908c
- 9abf1024 2024-08-09T15:03:09-04:00 (fix) Resolver: list CatSrc using client, instead of referring to registry-server cache (#3349)

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 45bf8edfd28026bd821a83f758856bf8e719dd20
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
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-12-150342" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-08-12-205807"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-08-13-161657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-08-13-172816"