Skip to content

Commit 4e43a15

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-05-16-092402_amd64-2024-05-16_arm64-2024-05-16 (#3368)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 9abb697 commit 4e43a15

17 files changed

+78
-205
lines changed

‎Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-14-230421
1+
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-05-16-165921

‎Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.16.0-0.nightly-2024-05-15-001800
1+
OCP_VERSION := 4.16.0-0.nightly-2024-05-16-092402

‎assets/optional/multus/kustomization.aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:3fabf185acdb6d3f512875c0455c02e5d8530a27bdefa078233aff5cb4de5896
5+
digest: sha256:4d8e3c61169434bdc4862bf4c0c823da206937359502781abb87a513c6f756b6
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:751dd014faa4d8014b71739b65b6cf44ca0f9fc2da0f445e68eff4d53dc4bc03
8+
digest: sha256:e15456210e0c71109a6e20312250cc1d0a683104586f9ee58e897be3fd69a335

‎assets/optional/multus/kustomization.x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:3ff01451bfe36832041ca6151051226fbe3fcdab1291f8fe74fa3f3c6913b31f
5+
digest: sha256:45b82222121a68f0b7720292c8a2ba3616f928dad3d282556f843361dc42035e
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d0e4717ab59e84f15892fae3084b120a91beeb82974b4ff559ee347fdfc78139
8+
digest: sha256:7ccd591e0ca36a4e3c53e84f631b6c69216ddd0bd57acd021bde06e67dec149f

‎assets/optional/multus/release-multus-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.16.0-0.nightly-arm64-2024-05-14-230421"
3+
"base": "4.16.0-0.nightly-arm64-2024-05-16-165921"
44
},
55
"images": {
6-
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b83077f402a7c5a58217ba4c412dd06a6377b323ab1cf9af698e56a31081b1cb",
7-
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:baedc7f536905d1321a8b96bcf928b1e472ac9919d3e72c2657a608857a2eb05"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d8e3c61169434bdc4862bf4c0c823da206937359502781abb87a513c6f756b6",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e15456210e0c71109a6e20312250cc1d0a683104586f9ee58e897be3fd69a335"
88
}
99
}

‎assets/optional/multus/release-multus-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.16.0-0.nightly-2024-05-15-001800"
3+
"base": "4.16.0-0.nightly-2024-05-16-092402"
44
},
55
"images": {
6-
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aef929b2ac179ae653327d719ef29f951cf69afcbf85ba705e212e4e9caf7509",
7-
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1078bbf4db0ec84a472c07913902e3f0ebdd95c8c95e9568388761e9bbee55"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45b82222121a68f0b7720292c8a2ba3616f928dad3d282556f843361dc42035e",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ccd591e0ca36a4e3c53e84f631b6c69216ddd0bd57acd021bde06e67dec149f"
88
}
99
}

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:3a99cae3d37dbc5449cacc8f3343863674194a0ca0b1465189fc1acdd97f390f
5+
digest: sha256:27fba749803bfdd541d83bfda3318e9e579e3aeea57e3d9261d5714ca32f152e
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:8e6599c61d7107e95077d60d56b0bee23b1689af4f9452340ffac1515aad8e61
8+
digest: sha256:245e64efb38926201576f1cd41f3d0504ea5193dac0222b1f3f78d44d69f09ee
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:47eb70134226931ac11a76ecc1d877088162a193db425db27921e8ae3254699c
11+
digest: sha256:672d79bb3d99c859021e5114d6ba9a947f18647a167308620512cb2bc30b643b
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e6599c61d7107e95077d60d56b0bee23b1689af4f9452340ffac1515aad8e61
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:245e64efb38926201576f1cd41f3d0504ea5193dac0222b1f3f78d44d69f09ee
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a99cae3d37dbc5449cacc8f3343863674194a0ca0b1465189fc1acdd97f390f
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27fba749803bfdd541d83bfda3318e9e579e3aeea57e3d9261d5714ca32f152e
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:1732ff573cfba6e09673cf1e076e6400c78e6e5cb6e613a241173eb5f3165368
5+
digest: sha256:601c0f14e354723c28645ffc1b7155c34148d2b9a5c180e356cd5a305460a424
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1cf7eb24f985bec30db224587335f55cb8726ff5b4b3ccef2f8c333608ea98b7
8+
digest: sha256:4612c4b902a066257801404a356cb39084237cc41a7b337228c4c3b8dc2830dd
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:0954a53fe830d4c49ffdced2beb2461f92f305d8d72b003f7fd54e990ee42868
11+
digest: sha256:b1db093229ec168b11865ad6bd0b0b4969e11e1850375c0aa0a1088938e83758
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cf7eb24f985bec30db224587335f55cb8726ff5b4b3ccef2f8c333608ea98b7
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4612c4b902a066257801404a356cb39084237cc41a7b337228c4c3b8dc2830dd
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1732ff573cfba6e09673cf1e076e6400c78e6e5cb6e613a241173eb5f3165368
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:601c0f14e354723c28645ffc1b7155c34148d2b9a5c180e356cd5a305460a424
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.16.0-0.nightly-arm64-2024-05-14-230421"
3+
"base": "4.16.0-0.nightly-arm64-2024-05-16-165921"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a99cae3d37dbc5449cacc8f3343863674194a0ca0b1465189fc1acdd97f390f",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e6599c61d7107e95077d60d56b0bee23b1689af4f9452340ffac1515aad8e61",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47eb70134226931ac11a76ecc1d877088162a193db425db27921e8ae3254699c"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27fba749803bfdd541d83bfda3318e9e579e3aeea57e3d9261d5714ca32f152e",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:245e64efb38926201576f1cd41f3d0504ea5193dac0222b1f3f78d44d69f09ee",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:672d79bb3d99c859021e5114d6ba9a947f18647a167308620512cb2bc30b643b"
99
}
1010
}

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.16.0-0.nightly-2024-05-15-001800"
3+
"base": "4.16.0-0.nightly-2024-05-16-092402"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1732ff573cfba6e09673cf1e076e6400c78e6e5cb6e613a241173eb5f3165368",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cf7eb24f985bec30db224587335f55cb8726ff5b4b3ccef2f8c333608ea98b7",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0954a53fe830d4c49ffdced2beb2461f92f305d8d72b003f7fd54e990ee42868"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:601c0f14e354723c28645ffc1b7155c34148d2b9a5c180e356cd5a305460a424",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4612c4b902a066257801404a356cb39084237cc41a7b337228c4c3b8dc2830dd",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1db093229ec168b11865ad6bd0b0b4969e11e1850375c0aa0a1088938e83758"
99
}
1010
}

0 commit comments

Comments
 (0)