Skip to content
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

Jump to bottom

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-08-08-013133_amd64-2024-08-08_arm64-2024-08-09 #3741

Merged
merged 4 commits into from
Aug 9, 2024
Merged

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-08-08-013133_amd64-2024-08-08_arm64-2024-08-09 #3741

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
190aca7
update last_rebase.sh
Aug 9, 2024
de685cd
update changelog
Aug 9, 2024
aee81af
update manifests
Aug 9, 2024
6938d26
update buildfiles
Aug 9, 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.17.0-0.nightly-arm64-2024-08-07-234000
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-09-003150
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.17.0-0.nightly-2024-08-07-211009
OCP_VERSION := 4.17.0-0.nightly-2024-08-08-013133
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.17.0-0.nightly-arm64-2024-08-07-234000"
"base": "4.17.0-0.nightly-arm64-2024-08-09-003150"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6d51d2275cd9649c7f7c1a44ff50e6bfc02aa5eee391419320fb6460e5d662c",
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.17.0-0.nightly-2024-08-07-211009"
"base": "4.17.0-0.nightly-2024-08-08-013133"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02259cfe48802196291cbbb55232ee514388eed26bfe2bd88d099f83eb23f776",
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:b1bf2d8b2c158e0d4feae3eaaefcd521fe2924e41c1588d06fccdf5be80d2946
digest: sha256:3b855ba9ba47dac0d2357ff5bf5c9e8f80244c26f0cb9b75053f2bdfc3db1d21
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:99475cc9cc07e9d0546a0f1d137252b207b8827316e8928d4f268ac80df4e341
digest: sha256:3f9d31442e1fd3199d95015c919dd93f5da35f0a0a880a207bc2ef950e2ef5d6
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec
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:99475cc9cc07e9d0546a0f1d137252b207b8827316e8928d4f268ac80df4e341
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f9d31442e1fd3199d95015c919dd93f5da35f0a0a880a207bc2ef950e2ef5d6
- 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:b1bf2d8b2c158e0d4feae3eaaefcd521fe2924e41c1588d06fccdf5be80d2946
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b855ba9ba47dac0d2357ff5bf5c9e8f80244c26f0cb9b75053f2bdfc3db1d21
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.17.0-0.nightly-arm64-2024-08-07-234000"
"base": "4.17.0-0.nightly-arm64-2024-08-09-003150"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1bf2d8b2c158e0d4feae3eaaefcd521fe2924e41c1588d06fccdf5be80d2946",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99475cc9cc07e9d0546a0f1d137252b207b8827316e8928d4f268ac80df4e341",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b855ba9ba47dac0d2357ff5bf5c9e8f80244c26f0cb9b75053f2bdfc3db1d21",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f9d31442e1fd3199d95015c919dd93f5da35f0a0a880a207bc2ef950e2ef5d6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec"
}
}
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-08-07-211009"
"base": "4.17.0-0.nightly-2024-08-08-013133"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df7ed04a549d96a65ac60a695510df406ea879992bbb706ecb8f1c872bdb8f64",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-08-07-234000"
"base": "4.17.0-0.nightly-arm64-2024-08-09-003150"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fd752995f53074d4c76d7eebf5c45c6fd8f3a3a1065479c7bd571f2669bb082",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:264c08c3597e082462bf0056dcd893a7543136ada9898a9775da4ec605535e8e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7ac1f05360374948723b6d485d2d060576cce5f76cb02165ac534bd6e74c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7579bf3d6ccbe63615ad7286d39655844de37be42c91ad44f14512acfd488208",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec",
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.17.0-0.nightly-2024-08-07-211009"
"base": "4.17.0-0.nightly-2024-08-08-013133"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d64b46692c53d389eb31ae7bd6a1b4768ecef85ae2e88c044f85b57accc950b",
Expand Down
Loading