Skip to content

Commit 8fb8a71

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.15-4.15.0-0.nightly-2024-06-17-153747_amd64-2024-06-17_arm64-2024-06-17 (#3501)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent eea8f74 commit 8fb8a71

File tree

11 files changed

+30
-23
lines changed

11 files changed

+30
-23
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.15.0-0.nightly-arm64-2024-06-15-023320
1+
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-06-17-222650

‎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.15.0-0.nightly-2024-06-13-204333
1+
OCP_VERSION := 4.15.0-0.nightly-2024-06-17-153747

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:329d9a71cc76e31893137f0102912b4f2b274f296307809ebb6f5d65a3f91a68
5+
digest: sha256:841952ccd7ac46798c1ee8e9bb95a3e0d2930c2a17f92790929796c84a9c1f57
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:646c909c59826980cdac539b2e2d09c2d5321efea7e403bfad433c88634b6c37
8+
digest: sha256:6fff90fda0fc51fdb426c353bcc241043cd57db9610e6123bbbf25c5623512f5
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087
@@ -16,12 +16,12 @@ patches:
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:646c909c59826980cdac539b2e2d09c2d5321efea7e403bfad433c88634b6c37
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fff90fda0fc51fdb426c353bcc241043cd57db9610e6123bbbf25c5623512f5
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:329d9a71cc76e31893137f0102912b4f2b274f296307809ebb6f5d65a3f91a68
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:841952ccd7ac46798c1ee8e9bb95a3e0d2930c2a17f92790929796c84a9c1f57
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.15.0-0.nightly-arm64-2024-06-15-023320"
3+
"base": "4.15.0-0.nightly-arm64-2024-06-17-222650"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc1f3093085d401045129adeddec9a0dc14554d1e48d997c4381ced9c1c8257f",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.15.0-0.nightly-2024-06-13-204333"
3+
"base": "4.15.0-0.nightly-2024-06-17-153747"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:329d9a71cc76e31893137f0102912b4f2b274f296307809ebb6f5d65a3f91a68",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:646c909c59826980cdac539b2e2d09c2d5321efea7e403bfad433c88634b6c37",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:841952ccd7ac46798c1ee8e9bb95a3e0d2930c2a17f92790929796c84a9c1f57",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fff90fda0fc51fdb426c353bcc241043cd57db9610e6123bbbf25c5623512f5",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087"
99
}
1010
}

‎assets/release/release-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.15.0-0.nightly-arm64-2024-06-15-023320"
3+
"base": "4.15.0-0.nightly-arm64-2024-06-17-222650"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4a6cfbf67a0a5b81c6a4d5eb9eec5cd7671faf813df9e04fb3c5b80e5c1ee8b",

‎assets/release/release-x86_64.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"release": {
3-
"base": "4.15.0-0.nightly-2024-06-13-204333"
3+
"base": "4.15.0-0.nightly-2024-06-17-153747"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4fd230c39c0836b2748516532577192ecdaa55e93943caf72bfa62fc26aaaa6",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ee7b6d7807b49e7ff265d3a5b09fac35c9eb59e863e3bf6cd20fbf8a2f41c342",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9508a871e104890826a0c7f08890b57f5dd9d1549e0caee610112aa3a5c90f4e",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57eafed7555133b6e7af1e681d0c9b0968e22ba08cf9628a1ba75f7ac5bcc7ce",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:824678e67933576425598c760040f103341699de6a171f6f6d1048b8d6602087",
1010
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
11-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5139eaae8a09a94ecf42054c05e3cb08344f6ef752cd4753f0c8c994fa8be361",
12-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4409ff68c579001cd565f5625a3be4598740344716e02fcf48f72dad5f5caeff",
13-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef4246255d411e98e2289f4d2f3a2c3966d54031717d3d59368c4f6473880556",
11+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1a8162bd5f2135be8c8b39db4b9a05167643a628e3d91494e30687ad0699059",
12+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2bb5a73a7b6628c79dbbe66a25294d454e55b371b271ded630bb9fc25dbaf38",
13+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3275b5684696b897a1645b9cad17d64fad7cc7eadf26d5adb7cbdbd9b640641e",
1414
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
1515
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
1616
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
1717
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111",
1818
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765",
19-
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ba683ad546770fd8915e26e086acb8291a3ac4b0a999cb5b027b639d2be2c15",
20-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a438c5196a05de97d5ab23a5c253da78dbdb78b063baaa8f710e9b287c722dc7",
21-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a72ccb4a9578ec6fb4e10755ce1e882a0f1e118550b2664a0d957d9aed53a97a"
19+
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a89201171d06ea52fd3a36775125ec714ab416f752f304b866f0916967c152bf",
20+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72a035f23028a0ddac710fce18641760df84a2f4e1c8526024008ce02c9a14a2",
21+
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7157e10e0cecbd6ccb9a0541bee7250934d6bcdf4dd0dd55c5621b68f6b73622"
2222
}
2323
}

‎packaging/crio.conf.d/microshift_amd64.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ plugin_dirs = [
2525
# for community builds on top of OKD, this setting has no effect
2626
[crio.image]
2727
global_auth_file="/etc/crio/openshift-pull-secret"
28-
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4409ff68c579001cd565f5625a3be4598740344716e02fcf48f72dad5f5caeff"
28+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2bb5a73a7b6628c79dbbe66a25294d454e55b371b271ded630bb9fc25dbaf38"
2929
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
3030
pause_command = "/usr/bin/pod"

‎scripts/auto-rebase/changelog.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
- cluster-network-operator embedded-component 071f46acbf9043f9ae9106c56639888e078977a9 to 706b73a7db55d35818a9a0928c2858dfb1180810
2+
- d6ca0c2 2024-05-29T16:30:16+03:00 Improved prometheus rule for ipsec metric
3+
- 19b529e 2024-05-29T16:25:35+03:00 Add ipsec state metric
4+
5+
- operator-framework-olm embedded-component d863e7cd095d747c6e9e43c6371470f78a064c65 to c760189484d42a31b5dcb349d7d950821d844826
6+
- 51c4b56d 2024-06-05T15:33:06-04:00 UPSTREAM: <carry>: update golang.org/x/net for CVE-2023-45288
7+

‎scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component a0ac804
44
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component eae692607f7ef1cfc6ef95bcd57c67f04d2c165c
55
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f
66
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796
7-
https://github.com/openshift/cluster-network-operator embedded-component 071f46acbf9043f9ae9106c56639888e078977a9
7+
https://github.com/openshift/cluster-network-operator embedded-component 706b73a7db55d35818a9a0928c2858dfb1180810
88
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 9c4fb818258a579901343fec3c2c47ec20ad2555
99
https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f
1010
https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342
@@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component a2c84a5418d02fbb0230f
1313
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb
1414
https://github.com/openshift/machine-config-operator embedded-component eac63b92593461d31042085ab5d156bb680006ed
1515
https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813
16-
https://github.com/openshift/operator-framework-olm embedded-component d863e7cd095d747c6e9e43c6371470f78a064c65
16+
https://github.com/openshift/operator-framework-olm embedded-component c760189484d42a31b5dcb349d7d950821d844826
1717
https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4
1818
https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6
1919
https://github.com/openshift/oc image-amd64 44edfb50c55756395abc844fc4f7edb19dfefa50

0 commit comments

Comments
 (0)